Changeset 4142 in vbox

Timestamp:

Aug 14, 2007 8:33:05 AM (17 years ago)

Author:

vboxsync

Message:

Host serial port support for Linux by Alexander Eichner.

Location:

trunk

Files:

trunk/include/VBox/pdmifs.h

-              r4071
+              r4142
      */
     DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMICHAR pInterface, const void *pvBuf, size_t cbWrite));
+    /**
+     * Set device parameters.
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+     * @param   speed           Speed of the serial connection.
+     * @param   parity          Enable parity
+     * @param   data_bits       Number of data bits
+     * @param   stop_bits       Number of stop bits
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetParameters,(PPDMICHAR pInterface, int speed, int parity, int data_bits, int stop_bits));
 } PDMICHAR;

-              r4071
+              r4142
 __END_DECLS
+#ifdef IN_RING3
 static void serial_update_irq(SerialState *s)
+{
 …
     speed = 115200 / s->divider;
     Log(("speed=%d parity=%c data=%d stop=%d\n", speed, parity, data_bits, stop_bits));
+}
+    s->pDrvChar->pfnSetParameters(s->pDrvChar, speed, parity, data_bits, stop_bits);
+}
+#endif
 static int serial_ioport_write(void *opaque, uint32_t addr, uint32_t val)
 …
     addr &= 7;
     LogFlow(("serial: write addr=0x%02x val=0x%02x\n", addr, val));
+#ifndef IN_RING3
+    NOREF(ch);
+    NOREF(s);
+    return VINF_IOM_HC_IOPORT_WRITE;
+#else
     switch(addr) {
     default:
 …
             serial_update_parameters(s);
         } else {
-#ifndef IN_RING3
-            NOREF(ch);
-            return VINF_IOM_HC_IOPORT_WRITE;
-#else
             s->thr_ipending = 0;
             s->lsr &= ~UART_LSR_THRE;
 …
             s->lsr |= UART_LSR_TEMT;
             serial_update_irq(s);
-#endif
+        }
         break;
 …
+    }
     return VINF_SUCCESS;
+#endif
+}
 …
         break;
     case 2:
+#ifndef IN_RING3
+        *pRC = VINF_IOM_HC_IOPORT_READ;
+#else
         ret = s->iir;
         /* reset THR pending bit */
 …
             s->thr_ipending = 0;
         serial_update_irq(s);
+#endif
         break;
     case 3:

-              r4071
+              r4142
+    }
     RTSemEventSignal(pData->SendSem);
+    return VINF_SUCCESS;
+}
+/** @copydoc PDMICHAR::pfnSetParameters */
+static DECLCALLBACK(int) drvCharSetParameters(PPDMICHAR pInterface, int speed, int parity, int data_bits, int stop_bits)
+{
+    PDRVCHAR pData = PDMICHAR_2_DRVCHAR(pInterface);
+    LogFlow(("%s: speed=%d parity=%c data_bits=%d stop_bits=%d\n", __FUNCTION__, speed, parity, data_bits, stop_bits));
     return VINF_SUCCESS;
+}
 …
+}
 /* -=-=-=-=- receive thread -=-=-=-=- */
 …
     /* IChar. */
     pData->IChar.pfnWrite                   = drvCharWrite;
+    pData->IChar.pfnSetParameters           = drvCharSetParameters;
     /*

Note: See TracChangeset for help on using the changeset viewer.