Changeset 39684 in vbox for trunk/include/VBox

Timestamp:

Dec 29, 2011 5:50:00 PM (13 years ago)

Author:

vboxsync

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

75521

Message:

Parallel: Some love for the long abandoned parallel port emulation. General cleanup and implemented passthrough of EPP transfers

File:

• trunk/include/VBox/vmm/pdmifs.h (modified) (6 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -1768 +1768 @@
 typedef enum PDMPARALLELPORTMODE
 {
-    PDM_PARALLEL_PORT_MODE_COMPAT,
-    PDM_PARALLEL_PORT_MODE_EPP,
-    PDM_PARALLEL_PORT_MODE_ECP
+    /** First invalid mode. */
+    PDM_PARALLEL_PORT_MODE_INVALID = 0,
+    /** SPP (Compatibility mode). */
+    PDM_PARALLEL_PORT_MODE_SPP,
+    /** EPP Data mode. */
+    PDM_PARALLEL_PORT_MODE_EPP_DATA,
+    /** EPP Address mode. */
+    PDM_PARALLEL_PORT_MODE_EPP_ADDR,
+    /** ECP mode (not implemented yet). */
+    PDM_PARALLEL_PORT_MODE_ECP,
+    /** 32bit hack. */
+    PDM_PARALLEL_PORT_MODE_32BIT_HACK = 0x7fffffff
 } PDMPARALLELPORTMODE;
 
@@ -1781 +1790 @@
 typedef struct PDMIHOSTPARALLELPORT
 {
-    /**
-     * Deliver data read to the device/driver.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   pvBuf           Where the read bits are stored.
-     * @param   pcbRead         Number of bytes available for reading/having been read.
-     * @thread  Any thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnNotifyRead,(PPDMIHOSTPARALLELPORT pInterface, const void *pvBuf, size_t *pcbRead));
-
     /**
      * Notify device/driver that an interrupt has occurred.
@@ -1802 +1800 @@
 } PDMIHOSTPARALLELPORT;
 /** PDMIHOSTPARALLELPORT interface ID. */
-#define PDMIHOSTPARALLELPORT_IID                "ac13e437-cd30-47ac-a271-6120571f3a22"
+#define PDMIHOSTPARALLELPORT_IID                "f24b8668-e7f6-4eaa-a14c-4aa2a5f7048e"
 
 
@@ -1820 +1818 @@
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
      * @param   pvBuf           Where to store the write bits.
-     * @param   pcbWrite        Number of bytes to write/bytes actually written.
-     * @thread  Any thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMIHOSTPARALLELCONNECTOR pInterface, const void *pvBuf, size_t *pcbWrite));
+     * @param   cbWrite         Number of bytes to write.
+     * @param   enmMode         Mode to write the data.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMIHOSTPARALLELCONNECTOR pInterface, const void *pvBuf,
+                                        size_t cbWrite, PDMPARALLELPORTMODE enmMode));
 
     /**
@@ -1831 +1831 @@
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
      * @param   pvBuf           Where to store the read bits.
-     * @param   pcbRead         Number of bytes to read/bytes actually read.
-     * @thread  Any thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnRead,(PPDMIHOSTPARALLELCONNECTOR pInterface, void *pvBuf, size_t *pcbRead));
+     * @param   cbRead          Number of bytes to read.
+     * @param   enmMode         Mode to read the data.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnRead,(PPDMIHOSTPARALLELCONNECTOR pInterface, void *pvBuf,
+                                       size_t cbRead, PDMPARALLELPORTMODE enmMode));
+
+    /**
+     * Set data direction of the port (forward/reverse).
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   fForward        Flag whether to indicate whether the port is operated in forward or reverse mode.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetPortDirection,(PPDMIHOSTPARALLELCONNECTOR pInterface, bool fForward));
 
     /**
@@ -1866 +1878 @@
     DECLR3CALLBACKMEMBER(int, pfnReadStatus,(PPDMIHOSTPARALLELCONNECTOR pInterface, uint8_t *pfReg));
 
-    /**
-     * Set mode of the host parallel port.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   enmMode         The mode of the host parallel port.
-     * @thread  Any thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnSetMode,(PPDMIHOSTPARALLELCONNECTOR pInterface, PDMPARALLELPORTMODE enmMode));
 } PDMIHOSTPARALLELCONNECTOR;
 /** PDMIHOSTPARALLELCONNECTOR interface ID. */
-#define PDMIHOSTPARALLELCONNECTOR_IID           "a03567ca-b29e-4a1b-b2f3-a12435fa2982"
+#define PDMIHOSTPARALLELCONNECTOR_IID           "7c532602-7438-4fbc-9265-349d9f0415f9"