Changeset 17064 in vbox for trunk

Timestamp:

Feb 24, 2009 1:00:29 PM (16 years ago)

Author:

vboxsync

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

43287

Message:

Linux hostdrivers: removed Linux 2.4.x compatibility

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrvInternal.h (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (13 diffs)

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

@@ -185 +185 @@
 
 /* check kernel version */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 # error Unsupported kernel version!
 #endif

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

@@ -64 +64 @@
 #ifdef CONFIG_X86_LOCAL_APIC
 # include <asm/apic.h>
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-#  include <asm/nmi.h>
-# endif
+# include <asm/nmi.h>
 #endif
 #ifdef VBOX_WITH_SUSPEND_NOTIFICATION
 # include <linux/platform_device.h>
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-# include <asm/pgtable.h>
-# define global_flush_tlb __flush_tlb_global
 #endif
 
@@ -87 +80 @@
 #  define VBOX_DEV_FMASK     (S_IRUGO | S_IWUGO)
 # endif
-
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
-#  define VBOX_REGISTER_DEVFS()                         \
-({                                                      \
-    void *rc = NULL;                                    \
-    if (devfs_mk_cdev(MKDEV(DEVICE_MAJOR, 0),           \
-                  S_IFCHR | VBOX_DEV_FMASK,             \
-                  DEVICE_NAME) == 0)                    \
-        rc = (void *)' '; /* return not NULL */         \
-    rc;                                                 \
- })
-
-#  define VBOX_UNREGISTER_DEVFS(handle)                 \
-    devfs_remove(DEVICE_NAME);
-
-# else /* < 2.6.0 */
-
-#  define VBOX_REGISTER_DEVFS()                         \
-    devfs_register(NULL, DEVICE_NAME, DEVFS_FL_DEFAULT, \
-                   DEVICE_MAJOR, 0,                     \
-                   S_IFCHR | VBOX_DEV_FMASK,            \
-                   &gFileOpsVBoxDrv, NULL)
-
-#  define VBOX_UNREGISTER_DEVFS(handle)                 \
-    if (handle != NULL)                                 \
-        devfs_unregister(handle)
-
-# endif /* < 2.6.0 */
 #endif /* CONFIG_DEV_FS && !CONFIG_VBOXDEV_AS_MISC */
-
-#ifndef CONFIG_VBOXDRV_AS_MISC
-# if defined(CONFIG_DEVFS_FS) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 0)
-#  define VBOX_REGISTER_DEVICE(a,b,c)     devfs_register_chrdev(a,b,c)
-#  define VBOX_UNREGISTER_DEVICE(a,b)     devfs_unregister_chrdev(a,b)
-# else
-#  define VBOX_REGISTER_DEVICE(a,b,c)     register_chrdev(a,b,c)
-#  define VBOX_UNREGISTER_DEVICE(a,b)     unregister_chrdev(a,b)
-# endif
-#endif /* !CONFIG_VBOXDRV_AS_MISC */
-
 
 #ifdef CONFIG_X86_HIGH_ENTRY
@@ -184 +137 @@
  */
 static SUPDRVDEVEXT         g_DevExt;
-
-/** Registered devfs device handle. */
-#if defined(CONFIG_DEVFS_FS) && !defined(CONFIG_VBOXDRV_AS_MISC)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-static void                *g_hDevFsVBoxDrv = NULL;
-# else
-static devfs_handle_t       g_hDevFsVBoxDrv = NULL;
-# endif
-#endif
 
 #ifndef CONFIG_VBOXDRV_AS_MISC
@@ -265 +209 @@
     name:       DEVICE_NAME,
     fops:       &gFileOpsVBoxDrv,
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
-     LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
+# if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17)
     devfs_name: DEVICE_NAME,
 # endif
@@ -447 +390 @@
      * we don't allow to setup an NMI watchdog.
      */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && !defined(VBOX_REDHAT_KABI)
+# if !defined(VBOX_REDHAT_KABI)
     /*
      * First test: NMI actiated? Works only works with Linux 2.6 -- 2.4 does not export
      *             the nmi_watchdog variable.
      */
-#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || \
-      (defined CONFIG_X86_64 && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || defined CONFIG_X86_64
 #   ifdef DO_DISABLE_NMI
     if (nmi_atomic_read(&nmi_active) > 0)
@@ -531 +473 @@
             if ((GET_APIC_DELIVERY_MODE(v) == APIC_MODE_NMI) && !(v & APIC_LVT_MASKED))
             {
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || \
-     (defined CONFIG_X86_64 && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0))
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || defined CONFIG_X86_64
                 printk(KERN_ERR DEVICE_NAME
                 ": NMI watchdog either active or at least initialized. Please disable the NMI\n"
@@ -539 +480 @@
                 return -EINVAL;
 # else /* < 2.6.19 */
-#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && !defined(VBOX_REDHAT_KABI)
+#  if !defined(VBOX_REDHAT_KABI)
 nmi_activated:
 #  endif
@@ -572 +513 @@
      */
     g_iModuleMajor = DEVICE_MAJOR;
-    rc = VBOX_REGISTER_DEVICE((dev_t)g_iModuleMajor, DEVICE_NAME, &gFileOpsVBoxDrv);
+    rc = register_chrdev((dev_t)g_iModuleMajor, DEVICE_NAME, &gFileOpsVBoxDrv);
     if (rc < 0)
     {
-        dprintf(("VBOX_REGISTER_DEVICE failed with rc=%#x!\n", rc));
+        dprintf(("register_chrdev() failed with rc=%#x!\n", rc));
         return rc;
     }
@@ -588 +529 @@
     rc = 0;
 
-#ifdef CONFIG_DEVFS_FS
+# ifdef CONFIG_DEVFS_FS
     /*
      * Register a device entry
      */
-    g_hDevFsVBoxDrv = VBOX_REGISTER_DEVFS();
-    if (g_hDevFsVBoxDrv == NULL)
+    if (devfs_mk_cdev(MKDEV(DEVICE_MAJOR, 0), S_IFCHR | VBOX_DEV_FMASK, DEVICE_NAME) != 0)
     {
         dprintf(("devfs_register failed!\n"));
         rc = -EINVAL;
     }
-#endif
+# endif
 #endif /* !CONFIG_VBOXDRV_AS_MISC */
     if (!rc)
@@ -658 +598 @@
          */
 #if defined(CONFIG_DEVFS_FS) && !defined(CONFIG_VBOXDRV_AS_MISC)
-        VBOX_UNREGISTER_DEVFS(g_hDevFsVBoxDrv);
+        devfs_remove(DEVICE_NAME);
 #endif
     }
@@ -665 +605 @@
     dprintf(("VBoxDrv::ModuleInit returning %#x (minor:%d)\n", rc, gMiscDevice.minor));
 #else
-    VBOX_UNREGISTER_DEVICE(g_iModuleMajor, DEVICE_NAME);
+    unregister_chrdev(g_iModuleMajor, DEVICE_NAME);
     dprintf(("VBoxDrv::ModuleInit returning %#x (major:%d)\n", rc, g_iModuleMajor));
 #endif
@@ -701 +641 @@
      * Unregister a device entry
      */
-    VBOX_UNREGISTER_DEVFS(g_hDevFsVBoxDrv);
+    devfs_remove(DEVICE_NAME);
 # endif /* devfs */
-    VBOX_UNREGISTER_DEVICE(g_iModuleMajor, DEVICE_NAME);
+    unregister_chrdev(g_iModuleMajor, DEVICE_NAME);
 #endif /* !CONFIG_VBOXDRV_AS_MISC */
 
@@ -1081 +1021 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 module_param(force_async_tsc, int, 0444);
-#else
-MODULE_PARM(force_async_tsc, "i");
-#endif
 MODULE_PARM_DESC(force_async_tsc, "force the asynchronous TSC mode");