From b0c2056a216f9350806db8c2a53e6dac5b78dde8 Mon Sep 17 00:00:00 2001
From: jmcmullan <jmcmullan@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Thu, 18 Jul 2013 03:32:42 +0000
Subject: [PATCH] poseidon: Fix a number of BPTR issues

Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com>

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@47715 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 rom/usb/classes/asixeth/dev.c                   | 6 +++---
 rom/usb/classes/audio/usbaudio.class.c          | 6 +++---
 rom/usb/classes/bluetooth/dev.c                 | 6 +++---
 rom/usb/classes/cdcacm/dev.c                    | 6 +++---
 rom/usb/classes/davicometh/dev.c                | 6 +++---
 rom/usb/classes/ethwrap/dev.c                   | 6 +++---
 rom/usb/classes/massstorage/dev.c               | 6 +++---
 rom/usb/classes/massstorage/massstorage.class.c | 6 +++---
 rom/usb/classes/massstorage/partitions.c        | 2 +-
 rom/usb/classes/moschipeth/dev.c                | 6 +++---
 rom/usb/classes/palmpda/dev.c                   | 6 +++---
 rom/usb/classes/pegasuseth/dev.c                | 6 +++---
 rom/usb/classes/printer/dev.c                   | 6 +++---
 rom/usb/classes/rawwrap/dev.c                   | 6 +++---
 rom/usb/classes/rndis/dev.c                     | 6 +++---
 rom/usb/classes/serialcp210x/dev.c              | 6 +++---
 rom/usb/classes/serialpl2303/dev.c              | 6 +++---
 rom/usb/classes/stir4200/dev.c                  | 6 +++---
 18 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/rom/usb/classes/asixeth/dev.c b/rom/usb/classes/asixeth/dev.c
index 5e34518e07..2e72db359d 100644
--- a/rom/usb/classes/asixeth/dev.c
+++ b/rom/usb/classes/asixeth/dev.c
@@ -168,7 +168,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -221,7 +221,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -249,7 +249,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/audio/usbaudio.class.c b/rom/usb/classes/audio/usbaudio.class.c
index 7349f0eb3f..1fc9906ff7 100644
--- a/rom/usb/classes/audio/usbaudio.class.c
+++ b/rom/usb/classes/audio/usbaudio.class.c
@@ -2459,7 +2459,7 @@ AROS_LH0(BPTR, subLibClose,
 
     KPRINTF(10, ("subLibClose base: 0x%08lx\n", nas));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(--nas->nas_Library.lib_OpenCnt == 0)
     {
@@ -2489,7 +2489,7 @@ AROS_LH1(BPTR, subLibExpunge,
 
     KPRINTF(10, ("subLibExpunge base: 0x%08lx\n", nas));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(nas->nas_Library.lib_OpenCnt == 0)
     {
@@ -2517,7 +2517,7 @@ AROS_LH1(BPTR, subLibExpunge,
         nas->nas_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/bluetooth/dev.c b/rom/usb/classes/bluetooth/dev.c
index 269d8aad2d..b364212eeb 100644
--- a/rom/usb/classes/bluetooth/dev.c
+++ b/rom/usb/classes/bluetooth/dev.c
@@ -126,7 +126,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Try to flush the last buffer */
     Forbid();
     if(ncp->ncp_Unit.unit_MsgPort.mp_SigTask)
@@ -171,7 +171,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -199,7 +199,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/cdcacm/dev.c b/rom/usb/classes/cdcacm/dev.c
index 9dd2432b4d..cfd5ae326a 100644
--- a/rom/usb/classes/cdcacm/dev.c
+++ b/rom/usb/classes/cdcacm/dev.c
@@ -150,7 +150,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
 
     /* Don't allow queuing */
     ncp->ncp_DenyRequests = TRUE;
@@ -188,7 +188,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -216,7 +216,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/davicometh/dev.c b/rom/usb/classes/davicometh/dev.c
index 21e81a145c..d1e372c798 100644
--- a/rom/usb/classes/davicometh/dev.c
+++ b/rom/usb/classes/davicometh/dev.c
@@ -167,7 +167,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -221,7 +221,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -249,7 +249,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/ethwrap/dev.c b/rom/usb/classes/ethwrap/dev.c
index 09b63b7ad5..2583b30314 100644
--- a/rom/usb/classes/ethwrap/dev.c
+++ b/rom/usb/classes/ethwrap/dev.c
@@ -167,7 +167,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -221,7 +221,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -249,7 +249,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/massstorage/dev.c b/rom/usb/classes/massstorage/dev.c
index f87e1b7c75..b81b75c3ca 100644
--- a/rom/usb/classes/massstorage/dev.c
+++ b/rom/usb/classes/massstorage/dev.c
@@ -119,7 +119,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     unit->ncm_Unit.unit_OpenCnt--;
     ioreq->io_Unit   = (APTR) -1;
     ioreq->io_Device = (APTR) -1;
@@ -153,7 +153,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -181,7 +181,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/massstorage/massstorage.class.c b/rom/usb/classes/massstorage/massstorage.class.c
index 68f5c9d0c1..dc468caac5 100644
--- a/rom/usb/classes/massstorage/massstorage.class.c
+++ b/rom/usb/classes/massstorage/massstorage.class.c
@@ -5297,7 +5297,7 @@ BPTR LoadFileSystem(struct NepClassMS *ncm, ULONG dosType, struct FileSysEntry *
     struct NepMSBase *nh = ncm->ncm_ClsBase;
     struct RigidDisk *rdsk = &nh->nh_RDsk;
     ULONG nextFSHD;
-    BPTR fh, seg = NULL;
+    BPTR fh, seg = BNULL;
     ULONG fsLength;
     UBYTE *fsBuffer;
     UBYTE fsFile[32];
@@ -5546,7 +5546,7 @@ BOOL MountPartition(struct NepClassMS *ncm, STRPTR dosDevice)
     struct DeviceNode *node;
     struct FileSysEntry *fse;
     struct FileSysEntry patch;
-    BPTR segList = NULL;
+    BPTR segList = BNULL;
     BOOL fsFound = FALSE;
     BOOL result = FALSE;
     STRPTR devname = DEVNAME;
@@ -5575,7 +5575,7 @@ BOOL MountPartition(struct NepClassMS *ncm, STRPTR dosDevice)
                 // Stack, SegList, Pri und GlobVec eintragen
                 patch.fse_PatchFlags |= 0x0020|0x0100;
                 patch.fse_Priority = 10;
-                patch.fse_GlobalVec = (APTR) 0xffffffff;
+                patch.fse_GlobalVec = (BPTR) 0xffffffff;
             }
 
             fsFound = TRUE;
diff --git a/rom/usb/classes/massstorage/partitions.c b/rom/usb/classes/massstorage/partitions.c
index 2b5307d757..a014181ba1 100644
--- a/rom/usb/classes/massstorage/partitions.c
+++ b/rom/usb/classes/massstorage/partitions.c
@@ -315,7 +315,7 @@ BOOL CheckPartitions(struct NepClassMS *ncm)
     pt = OpenRootPartition(DEVNAME, ncm->ncm_UnitNo);
     if(pt)
     {
-        fssm.fssm_Device = DEVNAME;
+        fssm.fssm_Device = AROS_CONST_BSTR(DEVNAME);
         fssm.fssm_Unit = ncm->ncm_UnitNo;
         fssm.fssm_Flags = 0;
 
diff --git a/rom/usb/classes/moschipeth/dev.c b/rom/usb/classes/moschipeth/dev.c
index f3f120367d..d987d48131 100644
--- a/rom/usb/classes/moschipeth/dev.c
+++ b/rom/usb/classes/moschipeth/dev.c
@@ -167,7 +167,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -221,7 +221,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -249,7 +249,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/palmpda/dev.c b/rom/usb/classes/palmpda/dev.c
index e02c14f2ec..e3b99203fc 100644
--- a/rom/usb/classes/palmpda/dev.c
+++ b/rom/usb/classes/palmpda/dev.c
@@ -170,7 +170,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(ncp)//(struct Unit *) ncp != &base->np_ClsBase->nh_DummyUnit)
     {
@@ -218,7 +218,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -246,7 +246,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/pegasuseth/dev.c b/rom/usb/classes/pegasuseth/dev.c
index a516430999..5b0657787a 100644
--- a/rom/usb/classes/pegasuseth/dev.c
+++ b/rom/usb/classes/pegasuseth/dev.c
@@ -167,7 +167,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -221,7 +221,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -249,7 +249,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/printer/dev.c b/rom/usb/classes/printer/dev.c
index d27188e178..2b891dff9f 100644
--- a/rom/usb/classes/printer/dev.c
+++ b/rom/usb/classes/printer/dev.c
@@ -127,7 +127,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Try to flush the last buffer */
     Forbid();
     ncp->ncp_FlushBuffer = TRUE;
@@ -173,7 +173,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -201,7 +201,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/rawwrap/dev.c b/rom/usb/classes/rawwrap/dev.c
index c4f1015baa..8db9bf427e 100644
--- a/rom/usb/classes/rawwrap/dev.c
+++ b/rom/usb/classes/rawwrap/dev.c
@@ -126,7 +126,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Try to flush the last buffer */
     Forbid();
     if(ncp->ncp_Unit.unit_MsgPort.mp_SigTask)
@@ -171,7 +171,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -199,7 +199,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/rndis/dev.c b/rom/usb/classes/rndis/dev.c
index d160d11844..bb6a5ca9c8 100644
--- a/rom/usb/classes/rndis/dev.c
+++ b/rom/usb/classes/rndis/dev.c
@@ -168,7 +168,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Allow queuing */
     //ncp->ncp_DenyRequests = TRUE;
 
@@ -222,7 +222,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -250,7 +250,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/serialcp210x/dev.c b/rom/usb/classes/serialcp210x/dev.c
index 73e3c1d71e..edfe6faf1e 100644
--- a/rom/usb/classes/serialcp210x/dev.c
+++ b/rom/usb/classes/serialcp210x/dev.c
@@ -151,7 +151,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
 
     /* Don't allow queuing */
     ncp->ncp_DenyRequests = TRUE;
@@ -189,7 +189,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -217,7 +217,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/serialpl2303/dev.c b/rom/usb/classes/serialpl2303/dev.c
index 8f5c2a4a82..7ea502fa72 100644
--- a/rom/usb/classes/serialpl2303/dev.c
+++ b/rom/usb/classes/serialpl2303/dev.c
@@ -150,7 +150,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
 
     /* Don't allow queuing */
     ncp->ncp_DenyRequests = TRUE;
@@ -188,7 +188,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -216,7 +216,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
diff --git a/rom/usb/classes/stir4200/dev.c b/rom/usb/classes/stir4200/dev.c
index 46685adf9e..2d7c515c30 100644
--- a/rom/usb/classes/stir4200/dev.c
+++ b/rom/usb/classes/stir4200/dev.c
@@ -126,7 +126,7 @@ AROS_LH1(BPTR, devClose,
 
     KPRINTF(10, ("devClose ioreq: 0x%08lx base: 0x%08lx\n", ioreq, base));
 
-    ret = NULL;
+    ret = BNULL;
     /* Try to flush the last buffer */
     Forbid();
     if(ncp->ncp_Unit.unit_MsgPort.mp_SigTask)
@@ -171,7 +171,7 @@ AROS_LH1(BPTR, devExpunge,
 
     KPRINTF(10, ("devExpunge base: 0x%08lx\n", base));
 
-    ret = NULL;
+    ret = BNULL;
 
     if(base->np_Library.lib_OpenCnt == 0)
     {
@@ -199,7 +199,7 @@ AROS_LH1(BPTR, devExpunge,
         base->np_Library.lib_Flags |= LIBF_DELEXP;
     }
 
-    return(NULL);
+    return(BNULL);
     
     AROS_LIBFUNC_EXIT
 }
-- 
2.11.4.GIT