Changeset 15836 in vbox for trunk/src/VBox

Timestamp:

Jan 7, 2009 3:45:20 PM (16 years ago)

Author:

vboxsync

Message:

Devices/Serial: Enabled Host serial support for Solaris.

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• Serial/DrvHostSerial.cpp (modified) (16 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -244 +244 @@
 #endif
 
-#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSerial);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Makefile.kmk

@@ -688 +688 @@
         $(if $(VBOX_SOLARIS_10),,Network/DrvTAP.cpp) \
         Storage/DrvHostBase.cpp \
-        Storage/DrvHostDVD.cpp
+        Storage/DrvHostDVD.cpp \
+        Serial/DrvHostSerial.cpp
  ifdef VBOX_WITH_CROSSBOW
   Drivers_SOURCES += Network/solaris/vbox-libdlpi.cpp

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -38 +38 @@
 #include <iprt/alloc.h>
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 # include <errno.h>
-# include <termios.h>
+# ifdef RT_OS_SOLARIS
+#  include <sys/termios.h>
+# else
+#  include <termios.h>
+# endif
 # include <sys/types.h>
 # include <fcntl.h>
@@ -110 +114 @@
     char                        *pszDevicePath;
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     /** the device handle */
     RTFILE                      DeviceFile;
@@ -241 +245 @@
 {
     PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     struct termios *termiosSetup;
     int baud_rate;
@@ -250 +254 @@
     LogFlow(("%s: Bps=%u chParity=%c cDataBits=%u cStopBits=%u\n", __FUNCTION__, Bps, chParity, cDataBits, cStopBits));
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     termiosSetup = (struct termios *)RTMemTmpAllocZ(sizeof(struct termios));
 
@@ -514 +518 @@
             uint64_t volatile u64Now = RTTimeNanoTS(); NOREF(u64Now);
 #endif
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 
             size_t cbWritten;
@@ -595 +599 @@
             abBuf[0] = pThis->aSendQueue[iTail];
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 
             rc = RTFileWrite(pThis->DeviceFile, abBuf, cbProcessed, NULL);
@@ -760 +764 @@
             cbRemaining = cbRead;
 
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
 
             size_t cbRead;
@@ -916 +920 @@
 {
     PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     return RTFileWrite(pThis->WakeupPipeW, "", 1, NULL);
 #elif defined(RT_OS_WINDOWS)
@@ -927 +931 @@
 }
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 /* -=-=-=-=- Monitor thread -=-=-=-=- */
 
@@ -1118 +1122 @@
     return VINF_SUCCESS;
 }
-#endif /* RT_OS_LINUX || RT_OS_DARWIN */
+#endif /* RT_OS_LINUX || RT_OS_DARWIN || RT_OS_SOLARIS */
 
 /**
@@ -1132 +1136 @@
     PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     int modemStateSet = 0;
     int modemStateClear = 0;
@@ -1188 +1192 @@
      * Init basic data members and interfaces.
      */
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     pThis->DeviceFile  = NIL_RTFILE;
 # ifdef RT_OS_DARWIN
@@ -1269 +1273 @@
             case VERR_ACCESS_DENIED:
                 return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
                                            N_("Cannot open host device '%s' for read/write access. Check the permissions "
                                               "of that device ('/bin/ls -l %s'): Most probably you need to be member "
@@ -1287 +1291 @@
 
     /* Set to non blocking I/O */
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 
     fcntl(pThis->DeviceFile, F_SETFL, O_NONBLOCK);
@@ -1339 +1343 @@
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create send thread"), pDrvIns->iInstance);
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
     /* Linux & darwin needs a separate thread which monitors the status lines. */
 # ifndef RT_OS_LINUX
@@ -1382 +1386 @@
     pThis->SendSem = NIL_RTSEMEVENT;
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 
     if (pThis->WakeupPipeW != NIL_RTFILE)