VirtualBox

Changeset 73766 in vbox


Ignore:
Timestamp:
Aug 19, 2018 4:55:11 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
124449
Message:

Serial: Remove the old serial code and switch over to the new one by default now that it is mostly stable (Any remaining bugs will get fixed)

Location:
trunk
Files:
5 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/pdmifs.h

    r72352 r73766  
    11441144
    11451145
    1146 /** Pointer to a char port interface. */
    1147 typedef struct PDMICHARPORT *PPDMICHARPORT;
    1148 /**
    1149  * Char port interface (down).
    1150  * Pair with PDMICHARCONNECTOR.
    1151  */
    1152 typedef struct PDMICHARPORT
    1153 {
    1154     /**
    1155      * Deliver data read to the device/driver.
    1156      *
    1157      * @returns VBox status code.
    1158      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1159      * @param   pvBuf           Where the read bits are stored.
    1160      * @param   pcbRead         Number of bytes available for reading/having been read.
    1161      * @thread  Any thread.
    1162      */
    1163     DECLR3CALLBACKMEMBER(int, pfnNotifyRead,(PPDMICHARPORT pInterface, const void *pvBuf, size_t *pcbRead));
    1164 
    1165     /**
    1166      * Notify the device/driver when the status lines changed.
    1167      *
    1168      * @returns VBox status code.
    1169      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1170      * @param   fNewStatusLine  New state of the status line pins.
    1171      * @thread  Any thread.
    1172      */
    1173     DECLR3CALLBACKMEMBER(int, pfnNotifyStatusLinesChanged,(PPDMICHARPORT pInterface, uint32_t fNewStatusLines));
    1174 
    1175     /**
    1176      * Notify the device when the driver buffer is full.
    1177      *
    1178      * @returns VBox status code.
    1179      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1180      * @param   fFull           Buffer full.
    1181      * @thread  Any thread.
    1182      */
    1183     DECLR3CALLBACKMEMBER(int, pfnNotifyBufferFull,(PPDMICHARPORT pInterface, bool fFull));
    1184 
    1185     /**
    1186      * Notify the device/driver that a break occurred.
    1187      *
    1188      * @returns VBox statsus code.
    1189      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1190      * @thread  Any thread.
    1191      */
    1192     DECLR3CALLBACKMEMBER(int, pfnNotifyBreak,(PPDMICHARPORT pInterface));
    1193 } PDMICHARPORT;
    1194 /** PDMICHARPORT interface ID. */
    1195 #define PDMICHARPORT_IID                        "22769834-ea8b-4a6d-ade1-213dcdbd1228"
    1196 
    1197 /** @name Bit mask definitions for status line type.
    1198  * @{ */
    1199 #define PDMICHARPORT_STATUS_LINES_DCD   RT_BIT(0)
    1200 #define PDMICHARPORT_STATUS_LINES_RI    RT_BIT(1)
    1201 #define PDMICHARPORT_STATUS_LINES_DSR   RT_BIT(2)
    1202 #define PDMICHARPORT_STATUS_LINES_CTS   RT_BIT(3)
    1203 /** @} */
    1204 
    1205 
    1206 /** Pointer to a char interface. */
    1207 typedef struct PDMICHARCONNECTOR *PPDMICHARCONNECTOR;
    1208 /**
    1209  * Char connector interface (up).
    1210  * Pair with PDMICHARPORT.
    1211  */
    1212 typedef struct PDMICHARCONNECTOR
    1213 {
    1214     /**
    1215      * Write bits.
    1216      *
    1217      * @returns VBox status code.
    1218      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1219      * @param   pvBuf           Where to store the write bits.
    1220      * @param   cbWrite         Number of bytes to write.
    1221      * @thread  Any thread.
    1222      */
    1223     DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMICHARCONNECTOR pInterface, const void *pvBuf, size_t cbWrite));
    1224 
    1225     /**
    1226      * Set device parameters.
    1227      *
    1228      * @returns VBox status code.
    1229      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    1230      * @param   Bps             Speed of the serial connection. (bits per second)
    1231      * @param   chParity        Parity method: 'E' - even, 'O' - odd, 'N' - none.
    1232      * @param   cDataBits       Number of data bits.
    1233      * @param   cStopBits       Number of stop bits.
    1234      * @thread  Any thread.
    1235      */
    1236     DECLR3CALLBACKMEMBER(int, pfnSetParameters,(PPDMICHARCONNECTOR pInterface, unsigned Bps, char chParity,
    1237                                                 unsigned cDataBits, unsigned cStopBits));
    1238 
    1239     /**
    1240      * Set the state of the modem lines.
    1241      *
    1242      * @returns VBox status code.
    1243      * @param   pInterface          Pointer to the interface structure containing the called function pointer.
    1244      * @param   fRequestToSend      Set to true to make the Request to Send line active otherwise to 0.
    1245      * @param   fDataTerminalReady  Set to true to make the Data Terminal Ready line active otherwise 0.
    1246      * @thread  Any thread.
    1247      */
    1248     DECLR3CALLBACKMEMBER(int, pfnSetModemLines,(PPDMICHARCONNECTOR pInterface, bool fRequestToSend, bool fDataTerminalReady));
    1249 
    1250     /**
    1251      * Sets the TD line into break condition.
    1252      *
    1253      * @returns VBox status code.
    1254      * @param   pInterface  Pointer to the interface structure containing the called function pointer.
    1255      * @param   fBreak      Set to true to let the device send a break false to put into normal operation.
    1256      * @thread  Any thread.
    1257      */
    1258     DECLR3CALLBACKMEMBER(int, pfnSetBreak,(PPDMICHARCONNECTOR pInterface, bool fBreak));
    1259 } PDMICHARCONNECTOR;
    1260 /** PDMICHARCONNECTOR interface ID. */
    1261 #define PDMICHARCONNECTOR_IID                   "4ad5c190-b408-4cef-926f-fbffce0dc5cc"
    1262 
    1263 
    12641146/** Pointer to a stream interface. */
    12651147typedef struct PDMISTREAM *PPDMISTREAM;

  • trunk/src/VBox/Devices/Makefile.kmk

    r73135 r73766  
    129129        VBOX_WITH_DMI_CHASSIS \
    130130        VBOX_WITH_DMI_OEMSTRINGS \
    131         $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,) \
    132         $(if $(VBOX_WITH_NEW_SERIAL),VBOX_WITH_NEW_SERIAL,)
     131        $(if $(VBOX_WITH_NEW_LPC_DEVICE),VBOX_WITH_NEW_LPC_DEVICE,)
    133132 VBoxDD_DEFS.win         = _WIN32_WINNT=0x0510
    134133 ifeq ($(KBUILD_TARGET_ARCH),x86)
    … …  
    178177        PC/DrvACPI.cpp \
    179178        PC/DrvAcpiCpu.cpp \
     179        Serial/DevSerial.cpp \
     180        Serial/DevOxPcie958.cpp \
     181        Serial/UartCore.cpp \
     182        Serial/DrvChar.cpp \
     183        Serial/DrvHostSerial.cpp \
    180184        Serial/DrvNamedPipe.cpp \
    181185        Serial/DrvTCP.cpp \
    … …  
    197201 endif
    198202
    199  if defined(VBOX_WITH_NEW_SERIAL)
    200   VBoxDD_SOURCES += \
    201         Serial/DevSerialNew.cpp \
    202         Serial/DevOxPcie958.cpp \
    203         Serial/UartCore.cpp \
    204         Serial/DrvCharNew.cpp \
    205         Serial/DrvHostSerialNew.cpp
    206  else
    207   VBoxDD_SOURCES += \
    208         Serial/DevSerial.cpp \
    209         Serial/DrvChar.cpp
    210    ifn1of ($(KBUILD_TARGET), os2)
    211    VBoxDD_SOURCES += \
    212         Serial/DrvHostSerial.cpp
    213    endif
    214  endif
    215203
    216204 ifn1of ($(KBUILD_TARGET), darwin)
    … …  
    919907        Network/DevPCNet.cpp \
    920908        Serial/DevSerial.cpp \
     909        Serial/DevOxPcie958.cpp \
     910        Serial/UartCore.cpp \
    921911        Parallel/DevParallel.cpp \
    922912        VMMDev/VMMDevTesting.cpp
    … …  
    10201010   VBoxDDGC_SOURCES    += \
    10211011        Storage/DevNVMe.cpp
    1022   endif
    1023 
    1024   if defined(VBOX_WITH_NEW_SERIAL)
    1025    VBoxDDRC_SOURCES := \
    1026         $(filter-out Serial/DevSerial.cpp, $(VBoxDDRC_SOURCES)) \
    1027         Serial/DevSerialNew.cpp \
    1028         Serial/DevOxPcie958.cpp \
    1029         Serial/UartCore.cpp
    10301012  endif
    10311013
    … …  
    10981080        Network/DevPCNet.cpp \
    10991081        Serial/DevSerial.cpp \
     1082        Serial/DevOxPcie958.cpp \
     1083        Serial/UartCore.cpp \
    11001084        Parallel/DevParallel.cpp \
    11011085        VMMDev/VMMDevTesting.cpp \
    … …  
    11971181  VBoxDDR0_SOURCES    += \
    11981182        Storage/DevNVMe.cpp
    1199  endif
    1200 
    1201  if defined(VBOX_WITH_NEW_SERIAL)
    1202   VBoxDDR0_SOURCES := \
    1203         $(filter-out Serial/DevSerial.cpp, $(VBoxDDR0_SOURCES)) \
    1204         Serial/DevSerialNew.cpp \
    1205         Serial/DevOxPcie958.cpp \
    1206         Serial/UartCore.cpp
    12071183 endif
    12081184

  • trunk/src/VBox/Devices/testcase/Makefile.kmk

    r72119 r73766  
    4949        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
    5050        $(if $(VBOX_WITH_XHCI_IMPL),VBOX_WITH_XHCI_IMPL,) \
    51         $(if $(VBOX_WITH_NEW_SERIAL),VBOX_WITH_NEW_SERIAL,) \
    5251       $(VBOX_AUDIO_DEFS)
    5352

  • trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

    r73135 r73766  
    110110#include "../Parallel/DevParallel.cpp"
    111111#undef LOG_GROUP
    112 #ifndef VBOX_WITH_NEW_SERIAL
    113 # include "../Serial/DevSerial.cpp"
    114 #else
    115 # include "../Serial/DevSerialNew.cpp"
    116 # include "../Serial/DevOxPcie958.cpp"
    117 #endif
     112#include "../Serial/DevSerial.cpp"
     113#undef LOG_GROUP
     114#include "../Serial/DevOxPcie958.cpp"
    118115#ifdef VBOX_WITH_AHCI
    119116# undef LOG_GROUP
    … …  
    398395#endif
    399396    CHECK_MEMBER_ALIGNMENT(PITSTATE, StatPITIrq, 8);
    400 #ifndef VBOX_WITH_NEW_SERIAL
    401     CHECK_MEMBER_ALIGNMENT(SerialState, CritSect, 8);
    402 #else
    403397    CHECK_MEMBER_ALIGNMENT(DEVSERIAL, UartCore, 8);
    404398    CHECK_MEMBER_ALIGNMENT(UARTCORE, CritSect, 8);
    405 #endif
    406399#ifdef VBOX_WITH_VMSVGA
    407400    CHECK_SIZE(VMSVGAState, RT_ALIGN_Z(sizeof(VMSVGAState), 8));

  • trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

    r73636 r73766  
    109109#include "../Parallel/DevParallel.cpp"
    110110#undef LOG_GROUP
    111 #ifndef VBOX_WITH_NEW_SERIAL
    112 # include "../Serial/DevSerial.cpp"
    113 #else
    114 # include "../Serial/DevSerialNew.cpp"
    115 # include "../Serial/DevOxPcie958.cpp"
    116 # include "../Serial/UartCore.h"
    117 #endif
     111#include "../Serial/DevSerial.cpp"
     112#undef LOG_GROUP
     113#include "../Serial/DevOxPcie958.cpp"
     114#undef LOG_GROUP
     115#include "../Serial/UartCore.h"
    118116#ifdef VBOX_WITH_AHCI
    119117# undef LOG_GROUP
    … …  
    12801278#endif
    12811279
    1282 #ifndef VBOX_WITH_NEW_SERIAL
    1283     /* Serial/DevSerial.cpp */
    1284     GEN_CHECK_SIZE(SerialState);
    1285     GEN_CHECK_OFF(SerialState, CritSect);
    1286     GEN_CHECK_OFF(SerialState, pDevInsR3);
    1287     GEN_CHECK_OFF(SerialState, pDevInsR0);
    1288     GEN_CHECK_OFF(SerialState, pDevInsRC);
    1289     GEN_CHECK_OFF(SerialState, IBase);
    1290     GEN_CHECK_OFF(SerialState, ICharPort);
    1291     GEN_CHECK_OFF(SerialState, pDrvBase);
    1292     GEN_CHECK_OFF(SerialState, pDrvChar);
    1293     GEN_CHECK_OFF(SerialState, ReceiveSem);
    1294     GEN_CHECK_OFF(SerialState, base);
    1295     GEN_CHECK_OFF(SerialState, divider);
    1296     GEN_CHECK_OFF(SerialState, recv_fifo);
    1297     GEN_CHECK_OFF(SerialState, xmit_fifo);
    1298     GEN_CHECK_OFF(SerialState, rbr);
    1299     GEN_CHECK_OFF(SerialState, thr);
    1300     GEN_CHECK_OFF(SerialState, tsr);
    1301     GEN_CHECK_OFF(SerialState, ier);
    1302     GEN_CHECK_OFF(SerialState, iir);
    1303     GEN_CHECK_OFF(SerialState, lcr);
    1304     GEN_CHECK_OFF(SerialState, mcr);
    1305     GEN_CHECK_OFF(SerialState, lsr);
    1306     GEN_CHECK_OFF(SerialState, msr);
    1307     GEN_CHECK_OFF(SerialState, scr);
    1308     GEN_CHECK_OFF(SerialState, fcr);
    1309     GEN_CHECK_OFF(SerialState, fcr_vmstate);
    1310     GEN_CHECK_OFF(SerialState, thr_ipending);
    1311     GEN_CHECK_OFF(SerialState, timeout_ipending);
    1312     GEN_CHECK_OFF(SerialState, irq);
    1313     GEN_CHECK_OFF(SerialState, last_break_enable);
    1314     GEN_CHECK_OFF(SerialState, tsr_retry);
    1315     GEN_CHECK_OFF(SerialState, msr_changed);
    1316     GEN_CHECK_OFF(SerialState, fGCEnabled);
    1317     GEN_CHECK_OFF(SerialState, fR0Enabled);
    1318     GEN_CHECK_OFF(SerialState, fYieldOnLSRRead);
    1319     GEN_CHECK_OFF(SerialState, char_transmit_time);
    1320 #else
    13211280    /* Serial/UartCore.cpp */
    13221281    GEN_CHECK_SIZE(UARTCORE);
    … …  
    13561315    GEN_CHECK_OFF(UARTCORE, cbAvailRdr);
    13571316
    1358     /* Serial/DevSerialNew.cpp */
     1317    /* Serial/DevSerial.cpp */
    13591318    GEN_CHECK_SIZE(DEVSERIAL);
    13601319    GEN_CHECK_OFF(DEVSERIAL, pDevInsR3);
    … …  
    13821341    GEN_CHECK_OFF(DEVOX958, aUarts);
    13831342    GEN_CHECK_OFF(DEVOX958, aUarts[OX958_UARTS_MAX - 1]);
    1384 #endif
    13851343
    13861344#ifdef VBOX_WITH_AHCI
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette