儲存庫 vbox 的更動 18576

時間撮記:

2009-3-31 下午02:16:38 (16 年 以前)

作者:

vboxsync

訊息:

Additions/SolarisDRM: some fixes.

檔案:

• trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c (修改) (11 筆差異)

trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c

@@ -33 +33 @@
 #include <VBox/version.h>
 
+#ifdef DEBUG_ramshankar
+# undef LogFlow
+# undef Log
+# define LogFlow LogRel
+# define Log     LogRel
+#endif
 
 /*******************************************************************************
@@ -69 +75 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-/**
- * cb_ops: for drivers that support char/block entry points
- */
-static struct cb_ops g_VBoxVideoSolarisCbOps =
-{
-    nodev,                  /* c open */
-    nodev,                  /* c close */
-    nodev,                  /* b strategy */
-    nodev,                  /* b dump */
-    nodev,                  /* b print */
-    nodev,                  /* c read */
-    nodev,                  /* c write*/
-    nodev,                  /* ioctl */
-    nodev,                  /* c devmap */
-    nodev,                  /* c mmap */
-    nodev,                  /* c segmap */
-    nochpoll,               /* c poll */
-    ddi_prop_op,            /* property ops */
-    NULL,                   /* streamtab  */
-    D_NEW | D_MP,           /* compat. flag */
-    CB_REV                  /* revision */
-};
+extern struct cb_ops drm_cb_ops;
 
 /**
@@ -105 +90 @@
     VBoxVideoSolarisDetach,
     nodev,                  /* reset */
-    &g_VBoxVideoSolarisCbOps,
-    (struct bus_ops *)0,
-    nodev                   /* power */
+    &drm_cb_ops,
+    NULL,                   /* dev bus ops*/
+    NULL                    /* power */
 };
 
@@ -149 +134 @@
 static void *g_pVBoxVideoSolarisState;
 
-/** GCC C++ hack. */
-unsigned __gxx_personality_v0 = 0xdecea5ed;
-
 
 /**
@@ -158 +140 @@
 int _init(void)
 {
-    LogFlow((DEVICE_NAME ":_init\n"));
+    LogFlow((DEVICE_NAME ":_init flow\n"));
+    cmn_err(CE_NOTE, DEVICE_NAME ":_init\n");
+
+    vboxVideoSolarisConfigure(&g_VBoxVideoSolarisDRMDriver);
     int rc = ddi_soft_state_init(&g_pVBoxVideoSolarisState, sizeof(drm_device_t), DRM_MAX_INSTANCES);
     if (!rc)
@@ -169 +154 @@
 int _fini(void)
 {
-    LogFlow((DEVICE_NAME ":_fini\n"));
+    LogFlow((DEVICE_NAME ":_fini flow\n"));
+    cmn_err(CE_NOTE, DEVICE_NAME ":_fini\n");
     int rc = mod_remove(&g_VBoxVideoSolarisModLinkage);
     ddi_soft_state_fini(&g_pVBoxVideoSolarisState);
@@ -178 +164 @@
 int _info(struct modinfo *pModInfo)
 {
-    LogFlow((DEVICE_NAME ":_info\n"));
+    LogFlow((DEVICE_NAME ":_info flow\n"));
+    cmn_err(CE_NOTE, DEVICE_NAME ":_info\n");
     return mod_info(&g_VBoxVideoSolarisModLinkage, pModInfo);
 }
@@ -194 +181 @@
 {
     LogFlow((DEVICE_NAME ":VBoxVideoSolarisAttach pDip=%p enmCmd=%d\n", pDip, enmCmd));
+    cmn_err(CE_NOTE, DEVICE_NAME ":attach\n");
 
     int rc = -1;
@@ -208 +196 @@
                 pState->dip = pDip;
                 pState->driver = &g_VBoxVideoSolarisDRMDriver;
-                
+
                 /*
                  * Register using the DRM module which will create the minor nodes
@@ -216 +204 @@
                 {
                     pState->drm_handle = pDRMHandle;
-                    
+
                     /*
                      * Probe with our pci-id.
@@ -333 +321 @@
             }
             else
-            {            
+            {
                 LogRel((DEVICE_NAME ":VBoxGuestSolarisGetInfo state or state's devinfo invalid.\n"));
                 rc = DDI_FAILURE;