Changeset 6397 in vbox

Timestamp:

Jan 21, 2008 7:26:27 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

27346

Message:

vboxadd and clipboard cleanups.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (7 diffs)

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

@@ -140 +140 @@
 typedef struct
 {
-    /** PCI handle of VMMDev. */
-    ddi_acc_handle_t        PciHandle;
     /** IO port handle. */
     ddi_acc_handle_t        PciIOHandle;
@@ -281 +279 @@
                  * Enable resources for PCI access.
                  */
-                rc = pci_config_setup(pDip, &pState->PciHandle);
+                ddi_acc_handle_t PciHandle;
+                rc = pci_config_setup(pDip, &PciHandle);
                 if (rc == DDI_SUCCESS)
                 {
@@ -287 +286 @@
                      * Check vendor and device ID.
                      */
-                    uint16_t uVendorID = pci_config_get16(pState->PciHandle, PCI_CONF_VENID);
-                    uint16_t uDeviceID = pci_config_get16(pState->PciHandle, PCI_CONF_DEVID);
+                    uint16_t uVendorID = pci_config_get16(PciHandle, PCI_CONF_VENID);
+                    uint16_t uDeviceID = pci_config_get16(PciHandle, PCI_CONF_DEVID);
                     if (   uVendorID == VMMDEV_VENDORID
                         && uDeviceID == VMMDEV_DEVICEID)
@@ -295 +294 @@
                          * Verify PCI class of the device (a bit paranoid).
                          */
-                        uint8_t uClass = pci_config_get8(pState->PciHandle, PCI_CONF_BASCLASS);
-                        uint8_t uSubClass = pci_config_get8(pState->PciHandle, PCI_CONF_SUBCLASS);
+                        uint8_t uClass = pci_config_get8(PciHandle, PCI_CONF_BASCLASS);
+                        uint8_t uSubClass = pci_config_get8(PciHandle, PCI_CONF_SUBCLASS);
                         if (   uClass == PCI_CLASS_PERIPH
                             && uSubClass == PCI_PERIPH_OTHER)
@@ -341 +340 @@
                                                     g_pDip = pDip;
                                                     ddi_set_driver_private(pDip, pState);
-                                                    pci_config_teardown(&pState->PciHandle);
+                                                    pci_config_teardown(&PciHandle);
                                                     ddi_report_dev(pDip);
                                                     return DDI_SUCCESS;
@@ -371 +370 @@
                     else
                         Log((DEVICE_NAME ":PCI vendorID, deviceID does not match.\n"));
-                    pci_config_teardown(&pState->PciHandle);
+                    pci_config_teardown(&PciHandle);
                 }
                 else
@@ -663 +662 @@
 }
 
-/** @def IOCPARM_LEN
- * Gets the length from the ioctl number.
- * This is normally defined by sys/ioccom.h on BSD systems...
- */
-#ifndef IOCPARM_LEN
-# define IOCPARM_LEN(x)     ( ((x) >> 16) & IOCPARM_MASK )
-#endif
 
 /**