Changeset 4717 in vbox for trunk/src/VBox/HostDrivers/Support/solaris

Timestamp:

Sep 12, 2007 6:44:18 AM (17 years ago)

Author:

vboxsync

Message:

Solaris changes.

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (13 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -47 +47 @@
 /** The module name. */
 #define DEVICE_NAME              "vboxdrv"
+/** The module description as seen in 'modinfo'. */
 #define DEVICE_DESC              "VirtualBox Driver"
+/** Maximum number of driver instances. */
 #define DEVICE_MAXINSTANCES      16
 
@@ -54 +56 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int VBoxDrvSolarisOpen(dev_t* pDev, int fFlag, int fType, cred_t* pCred);
-static int VBoxDrvSolarisClose(dev_t Dev, int fFlag, int fType, cred_t* pCred);
-static int VBoxDrvSolarisRead(dev_t Dev, struct uio* pUio, cred_t* pCred);
-static int VBoxDrvSolarisWrite(dev_t Dev, struct uio* pUio, cred_t* pCred);
-static int VBoxDrvSolarisIOCtl (dev_t Dev, int Cmd, intptr_t pArgs, int mode, cred_t* pCred, int* pVal);
-
-static int VBoxDrvSolarisAttach(dev_info_t* pDip, ddi_attach_cmd_t Cmd);
-static int VBoxDrvSolarisDetach(dev_info_t* pDip, ddi_detach_cmd_t Cmd);
+static int VBoxDrvSolarisOpen(dev_t *pDev, int fFlag, int fType, cred_t *pCred);
+static int VBoxDrvSolarisClose(dev_t Dev, int fFlag, int fType, cred_t *pCred);
+static int VBoxDrvSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred);
+static int VBoxDrvSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred);
+static int VBoxDrvSolarisIOCtl (dev_t Dev, int Cmd, intptr_t pArgs, int mode, cred_t *pCred, int *pVal);
+
+static int VBoxDrvSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t Cmd);
+static int VBoxDrvSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t Cmd);
 
 static int VBoxSupDrvErr2SolarisErr(int rc);
@@ -131 +133 @@
 };
 
-/** State info. each our kernel module instances */
+/** State info. for each driver instance. */
 typedef struct
 {
-    dev_info_t*     pDip;   /* Device handle */
+    dev_info_t     *pDip;   /* Device handle */
 } vbox_devstate_t;
 
 /** Opaque pointer to state */
-static void* g_pVBoxDrvSolarisState;
+static void *g_pVBoxDrvSolarisState;
 
 /** Device extention & session data association structure */
@@ -207 +209 @@
     if (RT_SUCCESS(rc))
     {
-        cmn_err(CE_NOTE,"supdrvCreateSession success");
         RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
         unsigned        iHash;
@@ -237 +238 @@
     if (instance >= DEVICE_MAXINSTANCES)
     {
-        cmn_err(CE_NOTE, "All instances exhausted\n");
+        cmn_err(CE_NOTE, "VBoxDrvSolarisOpen: All instances exhausted\n");
         return ENXIO;
     }
@@ -301 +302 @@
 }
 
-static int VBoxDrvSolarisRead(dev_t dev, struct uio* pUio, cred_t* credp)
+static int VBoxDrvSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred)
 {
     cmn_err(CE_CONT, "VBoxDrvSolarisRead");
@@ -307 +308 @@
 }
 
-static int VBoxDrvSolarisWrite(dev_t dev, struct uio* pUio, cred_t* credp)
+static int VBoxDrvSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred)
 {
     cmn_err(CE_CONT, "VBoxDrvSolarisWrite");
@@ -321 +322 @@
  * @return  corresponding solaris error code.
  */
-static int VBoxDrvSolarisAttach(dev_info_t* pDip, ddi_attach_cmd_t enmCmd)
+static int VBoxDrvSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd)
 {
     cmn_err(CE_CONT, "VBoxDrvSolarisAttach");
     int rc = VINF_SUCCESS;
     int instance = 0;
-    vbox_devstate_t* pState;
+    vbox_devstate_t *pState;
     
     switch (enmCmd)
@@ -412 +413 @@
     int rc = VINF_SUCCESS;
     int instance;
-    register vbox_devstate_t* pState;
+    register vbox_devstate_t *pState;
 
     cmn_err(CE_CONT, "VBoxDrvSolarisDetach");
@@ -557 +558 @@
             {
                 OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: ddi_copyout(,%p,%d) failed.\n", pArgData->pvOut, cbBuf));
-
-                /** @todo r=bird: why this extra return? setting rc = EFAULT; should do the trick, shouldn't it? */
-                RTMemTmpFree(pvBuf);
-                return EFAULT;
+                rc = EFAULT;
             }
         }
@@ -573 +571 @@
         RTMemTmpFree(pvBuf);
     
-    OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: returns %d cbOut=%d\n", rc, cbOut));
     return rc;
 }
@@ -633 +630 @@
 }
 
+
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {
@@ -643 +641 @@
 
     szMsg[sizeof(szMsg) - 1] = '\0';
-    printf("%s", szMsg);
+    uprintf("%s", szMsg);
     return 0;
 }