Changeset 10680 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 15, 2008 7:46:44 PM (16 years ago)

Author:

vboxsync

Message:

Increase minor version, needed some timestamp functions.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (5 diffs)
• SUPDrvIOC.h (modified) (1 diff)
• SUPLib.cpp (modified) (6 diffs)
• SUPR0.def (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -192 +192 @@
     { "RTSpinlockAcquireNoInts",                (void *)RTSpinlockAcquireNoInts },
     { "RTSpinlockReleaseNoInts",                (void *)RTSpinlockReleaseNoInts },
+    { "RTTimeNanoTS",                           (void *)RTTimeNanoTS },
+    { "RTTimeMillieTS",                         (void *)RTTimeMilliTS },
+    { "RTTimeSystemNanoTS",                     (void *)RTTimeSystemNanoTS },
+    { "RTTimeSystemMillieTS",                   (void *)RTTimeSystemMilliTS },
     { "RTThreadNativeSelf",                     (void *)RTThreadNativeSelf },
     { "RTThreadSleep",                          (void *)RTThreadSleep },
@@ -888 +892 @@
                 pReq->u.Out.u32SessionCookie  = 0xffffffff;
                 pReq->u.Out.u32SessionVersion = 0xffffffff;
-                pReq->u.Out.u32DriverVersion  = SUPDRVIOC_VERSION;
+                pReq->u.Out.u32DriverVersion  = SUPDRV_IOC_VERSION;
                 pReq->u.Out.pSession          = NULL;
                 pReq->u.Out.cFunctions        = 0;
@@ -900 +904 @@
              * The current logic is very simple, match the major interface version.
              */
-            if (    pReq->u.In.u32MinVersion > SUPDRVIOC_VERSION
-                ||  (pReq->u.In.u32MinVersion & 0xffff0000) != (SUPDRVIOC_VERSION & 0xffff0000))
+            if (    pReq->u.In.u32MinVersion > SUPDRV_IOC_VERSION
+                ||  (pReq->u.In.u32MinVersion & 0xffff0000) != (SUPDRV_IOC_VERSION & 0xffff0000))
             {
                 OSDBGPRINT(("SUP_IOCTL_COOKIE: Version mismatch. Requested: %#x  Min: %#x  Current: %#x\n",
-                            pReq->u.In.u32ReqVersion, pReq->u.In.u32MinVersion, SUPDRVIOC_VERSION));
+                            pReq->u.In.u32ReqVersion, pReq->u.In.u32MinVersion, SUPDRV_IOC_VERSION));
                 pReq->u.Out.u32Cookie         = 0xffffffff;
                 pReq->u.Out.u32SessionCookie  = 0xffffffff;
                 pReq->u.Out.u32SessionVersion = 0xffffffff;
-                pReq->u.Out.u32DriverVersion  = SUPDRVIOC_VERSION;
+                pReq->u.Out.u32DriverVersion  = SUPDRV_IOC_VERSION;
                 pReq->u.Out.pSession          = NULL;
                 pReq->u.Out.cFunctions        = 0;
@@ -917 +921 @@
             /*
              * Fill in return data and be gone.
-             * N.B. The first one to change SUPDRVIOC_VERSION shall makes sure that
+             * N.B. The first one to change SUPDRV_IOC_VERSION shall makes sure that
              *      u32SessionVersion <= u32ReqVersion!
              */
@@ -923 +927 @@
             pReq->u.Out.u32Cookie         = pDevExt->u32Cookie;
             pReq->u.Out.u32SessionCookie  = pSession->u32Cookie;
-            pReq->u.Out.u32SessionVersion = SUPDRVIOC_VERSION;
-            pReq->u.Out.u32DriverVersion  = SUPDRVIOC_VERSION;
+            pReq->u.Out.u32SessionVersion = SUPDRV_IOC_VERSION;
+            pReq->u.Out.u32DriverVersion  = SUPDRV_IOC_VERSION;
             pReq->u.Out.pSession          = pSession;
             pReq->u.Out.cFunctions        = sizeof(g_aFunctions) / sizeof(g_aFunctions[0]);

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -182 +182 @@
  * The upper 16-bit is the major version, the the lower the minor version.
  * When incompatible changes are made, the upper major number has to be changed. */
-#define SUPDRVIOC_VERSION                               0x00070004
+#define SUPDRV_IOC_VERSION                              0x00070005
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -211 +211 @@
         CookieReq.Hdr.rc = VERR_INTERNAL_ERROR;
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
-        CookieReq.u.In.u32ReqVersion = SUPDRVIOC_VERSION;
-        const uint32_t MinVersion = (SUPDRVIOC_VERSION & 0xffff0000) == 0x00070000
-                                  ? 0x00070004 /* need new exports */
-                                  : SUPDRVIOC_VERSION & 0xffff0000;
+        CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
+        const uint32_t MinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00070000
+                                  ? 0x00070005 /* need new exports */
+                                  : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = MinVersion;
         rc = suplibOsIOCtl(SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);
@@ -220 +220 @@
             &&  RT_SUCCESS(CookieReq.Hdr.rc))
         {
-            if (    (CookieReq.u.Out.u32SessionVersion & 0xffff0000) == (SUPDRVIOC_VERSION & 0xffff0000)
+            if (    (CookieReq.u.Out.u32SessionVersion & 0xffff0000) == (SUPDRV_IOC_VERSION & 0xffff0000)
                 &&  CookieReq.u.Out.u32SessionVersion >= MinVersion)
             {
@@ -287 +287 @@
             {
                 LogRel(("Support driver version mismatch: SessionVersion=%#x DriverVersion=%#x ClientVersion=%#x MinVersion=%#x\n",
-                        CookieReq.u.Out.u32SessionVersion, CookieReq.u.Out.u32DriverVersion, SUPDRVIOC_VERSION, MinVersion));
+                        CookieReq.u.Out.u32SessionVersion, CookieReq.u.Out.u32DriverVersion, SUPDRV_IOC_VERSION, MinVersion));
                 rc = VERR_VM_DRIVER_VERSION_MISMATCH;
             }
@@ -297 +297 @@
                 rc = CookieReq.Hdr.rc;
                 LogRel(("Support driver version mismatch: DriverVersion=%#x ClientVersion=%#x rc=%Rrc\n",
-                        CookieReq.u.Out.u32DriverVersion, SUPDRVIOC_VERSION, rc));
+                        CookieReq.u.Out.u32DriverVersion, SUPDRV_IOC_VERSION, rc));
                 if (rc != VERR_VM_DRIVER_VERSION_MISMATCH)
                     rc = VERR_VM_DRIVER_VERSION_MISMATCH;
@@ -304 +304 @@
             {
                 /* for pre 0x00060000 drivers */
-                LogRel(("Support driver version mismatch: DriverVersion=too-old ClientVersion=%#x\n", SUPDRVIOC_VERSION));
+                LogRel(("Support driver version mismatch: DriverVersion=too-old ClientVersion=%#x\n", SUPDRV_IOC_VERSION));
                 rc = VERR_VM_DRIVER_VERSION_MISMATCH;
             }
@@ -376 +376 @@
         { "RTSpinlockAcquireNoInts",                0xefef002b },
         { "RTSpinlockReleaseNoInts",                0xefef002c },
-        { "RTThreadNativeSelf",                     0xefef002d },
-        { "RTThreadSleep",                          0xefef002e },
-        { "RTThreadYield",                          0xefef002f },
-        { "RTLogDefaultInstance",                   0xefef0030 },
-        { "RTLogRelDefaultInstance",                0xefef0031 },
-        { "RTLogSetDefaultInstanceThread",          0xefef0032 },
-        { "RTLogLogger",                            0xefef0033 },
-        { "RTLogLoggerEx",                          0xefef0034 },
-        { "RTLogLoggerExV",                         0xefef0035 },
-        { "AssertMsg1",                             0xefef0036 },
-        { "AssertMsg2",                             0xefef0037 },
+        { "RTTimeNanoTS",                           0xefef002d },
+        { "RTTimeMillieTS",                         0xefef002e },
+        { "RTTimeSystemNanoTS",                     0xefef002f },
+        { "RTTimeSystemMillieTS",                   0xefef0030 },
+        { "RTThreadNativeSelf",                     0xefef0031 },
+        { "RTThreadSleep",                          0xefef0032 },
+        { "RTThreadYield",                          0xefef0033 },
+        { "RTLogDefaultInstance",                   0xefef0034 },
+        { "RTLogRelDefaultInstance",                0xefef0035 },
+        { "RTLogSetDefaultInstanceThread",          0xefef0036 },
+        { "RTLogLogger",                            0xefef0037 },
+        { "RTLogLoggerEx",                          0xefef0038 },
+        { "RTLogLoggerExV",                         0xefef0039 },
+        { "AssertMsg1",                             0xefef003a },
+        { "AssertMsg2",                             0xefef003b },
     };
 

trunk/src/VBox/HostDrivers/Support/SUPR0.def

@@ -93 +93 @@
     RTSpinlockAcquireNoInts
     RTSpinlockReleaseNoInts
+    RTTimeNanoTS
+    RTTimeMillieTS
+    RTTimeSystemNanoTS
+    RTTimeSystemMillieTS
     RTThreadSelf
     RTThreadNativeSelf

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -257 +257 @@
                     {
                         LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
-                                VBOX_SVN_REV, SUPDRVIOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
+                                VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
                         return KMOD_RETURN_SUCCESS;
                     }

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -600 +600 @@
                 LogFlow(("VBoxDrv::ModuleInit returning %#x\n", rc));
                 printk(KERN_DEBUG DEVICE_NAME ": Successfully loaded version "
-                       VBOX_VERSION_STRING " (interface " xstr(SUPDRVIOC_VERSION) ").\n");
+                       VBOX_VERSION_STRING " (interface " xstr(SUPDRV_IOC_VERSION) ").\n");
                 return rc;
             }
@@ -1009 +1009 @@
 MODULE_LICENSE("GPL");
 #ifdef MODULE_VERSION
-MODULE_VERSION(VBOX_VERSION_STRING " (" xstr(SUPDRVIOC_VERSION) ")");
+MODULE_VERSION(VBOX_VERSION_STRING " (" xstr(SUPDRV_IOC_VERSION) ")");
 #endif