Changeset 35986 in vbox

Timestamp:

Feb 15, 2011 5:50:34 PM (14 years ago)

Author:

vboxsync

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

70057

Message:

raw PCI: device open/close

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (4 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (4 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h (modified) (1 diff)

trunk/include/VBox/rawpci.h

@@ -32 +32 @@
 RT_C_DECLS_BEGIN
 
+/**
+ * Handle for the raw PCI device.
+ */
+typedef RTR0PTR PCIRAWDEVHANDLE;
+
+
+/** Parameters buffer for PCIRAWR0_DO_OPEN_DEVICE call */
+typedef struct
+{
+    /* in */
+    uint32_t PciAddress;
+    uint32_t fFlags;
+    /* out */
+    PCIRAWDEVHANDLE Device;
+} PCIRAWREQOPENDEVICE;
+
+/** Parameters buffer for PCIRAWR0_DO_CLOSE_DEVICE call */
+typedef struct
+{
+    /* in */
+    uint32_t fFlags;
+} PCIRAWREQCLOSEDEVICE;
+
+
 /** Parameters buffer for PCIRAWR0_DO_GET_REGION_INFO call */
 typedef struct
@@ -130 +154 @@
 } PCIRAWREQPCICFGREAD;
 
-
-/**
- * Handle for the raw PCI device.
- */
-typedef RTR0PTR PCIRAWDEVHANDLE;
-
 /**
  * Request buffer use for communication with the driver.
@@ -154 +172 @@
     union
     {
+        PCIRAWREQOPENDEVICE    aOpenDevice;
+        PCIRAWREQCLOSEDEVICE   aCloseDevice;
         PCIRAWREQGETREGIONINFO aGetRegionInfo;
         PCIRAWREQMAPREGION     aMapRegion;
@@ -172 +192 @@
 typedef enum PCIRAWR0OPERATION
 {
+    /* Open device. */
+    PCIRAWR0_DO_OPEN_DEVICE,
+    /* Close device. */
+    PCIRAWR0_DO_CLOSE_DEVICE,
     /* Get PCI region info. */
     PCIRAWR0_DO_GET_REGION_INFO,

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -39 +39 @@
 
 
+#define DEVPORT_2_VBOXRAWPCIINS(pPort) \
+    ( (PVBOXRAWPCIINS)((uint8_t *)pPort - RT_OFFSETOF(VBOXRAWPCIINS, DevPort)) )
+
+
 /**
  * Implements the SUPDRV component factor interface query method.
@@ -74 +78 @@
  * @copydoc RAWPCIDEVPORT:: pfnRetain
  */
-DECLHIDDEN(void) vboxPciDevRetain(PRAWPCIDEVPORT pThis)
+DECLHIDDEN(void) vboxPciDevRetain(PRAWPCIDEVPORT pPort)
 {
 }
@@ -81 +85 @@
  * @copydoc RAWPCIDEVPORT:: pfnRelease
  */
-DECLHIDDEN(void) vboxPciDevRelease(PRAWPCIDEVPORT pThis)
-{
-}
-
-/**
- * @copydoc RAWPCIDEVPORT:: pfnRelease
- */
-DECLHIDDEN(int) vboxPciDevInit(PRAWPCIDEVPORT pThis, uint32_t fFlags)
-{
-    return VINF_SUCCESS;
+DECLHIDDEN(void) vboxPciDevRelease(PRAWPCIDEVPORT pPort)
+{
+}
+
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnInit
+ */
+DECLHIDDEN(int) vboxPciDevInit(PRAWPCIDEVPORT pPort, uint32_t fFlags)
+{
+    PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
+
+    int rc = vboxPciOsDevInit(pThis, fFlags);
+
+    return rc;
 }
 
@@ -144 +152 @@
 }
 
-
 /**
  * @copydoc RAWPCIFACTORY::pfnCreateAndConnect

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -88 +88 @@
 DECLHIDDEN(void) vboxPciShutdown(PVBOXRAWPCIGLOBALS pGlobals);
 
+DECLHIDDEN(int)  vboxPciOsDevInit  (PVBOXRAWPCIINS pIns, uint32_t fFlags);
+DECLHIDDEN(int)  vboxPciOsDevDeinit(PVBOXRAWPCIINS pIns, uint32_t fFlags);
+
 RT_C_DECLS_END