Changeset 43410 in vbox

Timestamp:

Sep 22, 2012 6:31:50 PM (12 years ago)

Author:

vboxsync

Message:

Additions/haiku: cleanup.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c (modified) (18 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c

@@ -45 +45 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #define IN_VBOXGUEST
-#define LOG_GROUP LOG_GROUP_SUP_DRV
-//#undef LOG_DISABLED
-//#define LOG_ENABLED
-//#define LOG_ENABLE_FLOW
-//#define DO_LOG
 #include <sys/param.h>
 #include <sys/types.h>
@@ -265 +263 @@
 #endif
 
+
 static status_t VBoxGuestHaikuDetach(void)
 {
@@ -275 +274 @@
      * Reverse what we did in VBoxGuestHaikuAttach.
      */
-
     VBoxGuestHaikuRemoveIRQ(pState);
 
@@ -293 +291 @@
 
     RTR0Term();
-
     return B_OK;
 }
@@ -309 +306 @@
 
     bool fOurIRQ = VBoxGuestCommonISR(&g_DevExt);
-
-    return fOurIRQ ? B_HANDLED_INTERRUPT : B_UNHANDLED_INTERRUPT;
+    if (fOurIRQ)
+        return B_HANDLED_INTERRUPT;
+    return B_UNHANDLED_INTERRUPT;
 }
 
@@ -351 +349 @@
 static int VBoxGuestHaikuAddIRQ(void *pvState)
 {
-    status_t status;
+    status_t err;
     struct VBoxGuestDeviceState *pState = (struct VBoxGuestDeviceState *)pvState;
 
-    status = install_io_interrupt_handler(pState->iIrqResId, VBoxGuestHaikuISR, pState,  0);
-
-    if (status != B_OK)
-    {
-        return VERR_DEV_IO_ERROR;
-    }
-
-    return VINF_SUCCESS;
+    AssertReturn(pState, VERR_INVALID_PARAMETER);
+
+    err = install_io_interrupt_handler(pState->iIrqResId, VBoxGuestHaikuISR, pState,  0);
+    if (err == B_OK)
+        return VINF_SUCCESS;
+    return VERR_DEV_IO_ERROR;
 }
 
@@ -373 +369 @@
 {
     struct VBoxGuestDeviceState *pState = (struct VBoxGuestDeviceState *)pvState;
+    AssertPtr(pState);
 
     remove_io_interrupt_handler(pState->iIrqResId, VBoxGuestHaikuISR, pState);
@@ -384 +381 @@
     int iResId = 0;
     struct VBoxGuestDeviceState *pState = &sState;
-    static const char *const   s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-    PRTLOGGER                   pRelLogger;
+    static const char *const     s_apszGroups[] = VBOX_LOGGROUP_NAMES;
+    PRTLOGGER                    pRelLogger;
+
+    AssertReturn(pDevice, B_BAD_VALUE);
 
     cUsers = 0;
@@ -395 +394 @@
     if (RT_FAILURE(rc))
     {
-        /** @todo r=ramshankar: use dprintf here */
+        /** @todo r=ramshankar: use dprintf here & the error code looks wrong too. */
         LogFunc(("RTR0Init failed.\n"));
         return ENXIO;
@@ -426 +425 @@
     }
 #endif
-    Log((MODULE_NAME ": plip!\n"));
-    LogAlways((MODULE_NAME ": plop!\n"));
-
 
     /*
@@ -434 +430 @@
      */
     pState->uIOPortBase = pDevice->u.h0.base_registers[0];
-    //XXX check flags for IO ?
+    /* @todo check flags for IO? */
     if (pState->uIOPortBase)
     {
@@ -441 +437 @@
          */
         uint32 phys = pDevice->u.h0.base_registers[1];
-        //XXX check flags for mem ?
+        /* @todo Check flags for mem? */
         pState->VMMDevMemSize    = pDevice->u.h0.base_register_sizes[1];
-        pState->iVMMDevMemAreaId = map_physical_memory("VirtualBox Guest MMIO",
-                                                       phys, pState->VMMDevMemSize, B_ANY_KERNEL_BLOCK_ADDRESS,
-                                                       B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA, &pState->pMMIOBase);
-
+        pState->iVMMDevMemAreaId = map_physical_memory("VirtualBox Guest MMIO", phys, pState->VMMDevMemSize,
+                                                       B_ANY_KERNEL_BLOCK_ADDRESS, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA,
+                                                       &pState->pMMIOBase);
         if (pState->iVMMDevMemAreaId > 0 && pState->pMMIOBase)
         {
@@ -452 +447 @@
              * Call the common device extension initializer.
              */
-            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase,
-                                     pState->pMMIOBase, pState->VMMDevMemSize,
+            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase, pState->VMMDevMemSize,
 #if ARCH_BITS == 64
                                      VBOXOSTYPE_Haiku_x64,
@@ -469 +463 @@
                 if (RT_SUCCESS(rc))
                 {
-                    dprintf(MODULE_NAME ": loaded successfully\n");
-                    return 0;
+                    LogRel((MODULE_NAME ": loaded successfully\n"));
+                    return B_OK;
                 }
-                else
-                    dprintf((MODULE_NAME ":VBoxGuestInitDevExt failed.\n"));
+
+                LogRel((MODULE_NAME ":VBoxGuestInitDevExt failed.\n"));
                 VBoxGuestDeleteDevExt(&g_DevExt);
             }
             else
-                dprintf((MODULE_NAME ":VBoxGuestHaikuAddIRQ failed.\n"));
+                LogRel((MODULE_NAME ":VBoxGuestHaikuAddIRQ failed.\n"));
         }
         else
-            dprintf((MODULE_NAME ":MMIO region setup failed.\n"));
+            LogRel((MODULE_NAME ":MMIO region setup failed.\n"));
     }
     else
-        dprintf((MODULE_NAME ":IOport setup failed.\n"));
+        LogRel((MODULE_NAME ":IOport setup failed.\n"));
 
     RTR0Term();
@@ -493 +487 @@
 {
     if ((pDevice->vendor_id == VMMDEV_VENDORID) && (pDevice->device_id == VMMDEV_DEVICEID))
-        return 0;
+        return B_OK;
 
     return ENXIO;
@@ -501 +495 @@
 status_t init_module(void)
 {
-    status_t status = B_ENTRY_NOT_FOUND;
+    status_t err = B_ENTRY_NOT_FOUND;
     pci_info info;
     int ix = 0;
@@ -512 +506 @@
         if (VBoxGuestHaikuProbe(&info) == 0)
         {
-            // we found it
-            status = VBoxGuestHaikuAttach(&info);
+            /* we found it */
+            err = VBoxGuestHaikuAttach(&info);
             break;
         }
     }
 
-    return status;
+    return err;
 }
 
@@ -525 +519 @@
 {
     VBoxGuestHaikuDetach();
-
     put_module(B_PCI_MODULE_NAME);
 }