[Dxr2-devel] devfs support for dxr2

[Benedikt S. <be...@he...>]

Hi,
I miss the devfs support.
Please apply the following patch:

--- dxr2/module.c.orig  Sat Jun 22 22:47:46 2002
+++ dxr2/module.c       Sat Jun 22 14:48:02 2002
@@ -63,6 +63,9 @@
 #include <linux/cdrom.h>
 #include <linux/videodev.h>
 #include <linux/types.h>
+#ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
+#endif
 #include <asm/byteorder.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
@@ -136,8 +139,9 @@
 };
 #endif
 
-
-
+#ifdef CONFIG_DEVFS_FS
+devfs_handle_t dxr2_handle;
+#endif
 
 /**
  *
@@ -710,12 +714,28 @@
 #ifdef MODULE
 int init_module (void)
 {
+#ifdef CONFIG_DEVFS_FS
+   int rc;
+   rc = devfs_register_chrdev(DXR2_MAJOR, DXR2_LOGNAME, &dxr2_fops);
+   if (rc < 0) return rc;
+   dxr2_handle = devfs_register (NULL, DXR2_DEVNAME, DEVFS_FL_DEFAULT, 
+                                DXR2_MAJOR, 0, 
+                                S_IFCHR | S_IRUGO | S_IWUGO, &dxr2_fops, 
+                                NULL);
+   return 0;
+#else
   return(register_chrdev(DXR2_MAJOR, DXR2_LOGNAME, &dxr2_fops));
+#endif
 }
 
 void cleanup_module (void)
 {
+#ifdef CONFIG_DEVFS_FS
+  devfs_unregister (dxr2_handle);
+  devfs_unregister_chrdev(DXR2_MAJOR, DXR2_LOGNAME);
+#else
   unregister_chrdev(DXR2_MAJOR, DXR2_LOGNAME);
+#endif
 }
 #endif
 
--- sysinclude/dxr2.h.orig      Sat Jun 22 22:47:46 2002
+++ sysinclude/dxr2.h   Sat Jun 22 14:47:01 2002
@@ -71,6 +71,9 @@
 // log name of the driver
 #define DXR2_LOGNAME                   "DXR2"
 
+// devfs Device Name
+#define DXR2_DEVNAME                   "dxr2"
+
 // these control entry to code modifying deferred_queue stuff
 #define
DXR2_ENTER_CRITICAL(DXR2INST) while(!atomic_dec_and_test(&((DXR2INST)->
semaphore))) { atomic_inc(&((DXR2INST)->semaphore)); schedule(); }
 #define DXR2_EXIT_CRITICAL(DXR2INST) atomic_inc(&((DXR2INST)->semaphore))
--- zivaDS/highlevel.c.orig     Sat Jun 22 22:47:46 2002
+++ zivaDS/highlevel.c  Sat Jun 22 14:02:18 2002
@@ -44,7 +44,7 @@
 #include <dxr2modver.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <zivaDS.h>

--
Thank you

Benedikt Spranger

--
Chaos [griech., ka-] das, 1) Gegenbegriff zum wohlgeordneten ->Kosmos. 2) ich.