Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / rio / linux_compat.h

diff --git a/drivers/char/rio/linux_compat.h b/drivers/char/rio/linux_compat.h
index d53843a..34c0d28 100644 (file)
--- a/drivers/char/rio/linux_compat.h
+++ b/drivers/char/rio/linux_compat.h
@@ -19,56 +19,12 @@
 #include <linux/interrupt.h>
 
 
-#define disable(oldspl) save_flags (oldspl)
-#define restore(oldspl) restore_flags (oldspl)
-
-#define sysbrk(x) kmalloc ((x),in_interrupt()? GFP_ATOMIC : GFP_KERNEL)
-#define sysfree(p,size) kfree ((p))
-
-#define WBYTE(p,v) writeb(v, &p)
-#define RBYTE(p)   readb (&p)
-#define WWORD(p,v) writew(v, &p)
-#define RWORD(p)   readw(&p)
-#define WINDW(p,v) writew(v, p)
-#define RINDW(p)   readw(p)
-
 #define DEBUG_ALL
 
-#define cprintf printk
-
-#ifdef __KERNEL__
-#define INKERNEL
-#endif
-
 struct ttystatics {
-  struct termios tm;
+       struct termios tm;
 };
 
-#define bzero(d, n)         memset((d), 0, (n))
-#define bcopy(src, dest, n) memcpy ((dest), (src), (n))
-
-#define SEM_SIGIGNORE 0x1234
-
-#ifdef DEBUG_SEM
-#define swait(a,b)      printk ("waiting:    " __FILE__ " line %d\n", __LINE__)
-#define ssignal(sem)    printk ("signalling: " __FILE__ " line %d\n", __LINE__)
-
-#define sreset(sem)     printk ("sreset:     " __FILE__ "\n")
-#define sem_init(sem,v) printk ("sreset:     " __FILE__ "\n")
-#endif
-
-
-#define getpid()    (current->pid)
-
-#define QSIZE SERIAL_XMIT_SIZE
-
-#define pseterr(errno) return (- errno)
-
-#define V_CBAUD CBAUD
-
-/* For one reason or another rioboot.c uses delay instead of RIODelay. */
-#define delay(x,y) RIODelay(NULL, y)
-
 extern int rio_debug;
 
 #define RIO_DEBUG_INIT         0x000001
@@ -91,32 +47,31 @@ extern int rio_debug;
 #define RIO_DEBUG_DELAY        0x020000
 #define RIO_DEBUG_MOD_COUNT    0x040000
 
+
 /* Copied over from riowinif.h . This is ugly. The winif file declares
 also much other stuff which is incompatible with the headers from
 the older driver. The older driver includes "brates.h" which shadows
 the definitions from Linux, and is incompatible... */
 
 /* RxBaud and TxBaud definitions... */
-#define        RIO_B0                  0x00                    /* RTS / DTR signals dropped */
-#define        RIO_B50                 0x01                    /* 50 baud */
-#define        RIO_B75                 0x02                    /* 75 baud */
-#define        RIO_B110                0x03                    /* 110 baud */
-#define        RIO_B134                0x04                    /* 134.5 baud */
-#define        RIO_B150                0x05                    /* 150 baud */
-#define        RIO_B200                0x06                    /* 200 baud */
-#define        RIO_B300                0x07                    /* 300 baud */
-#define        RIO_B600                0x08                    /* 600 baud */
-#define        RIO_B1200               0x09                    /* 1200 baud */
-#define        RIO_B1800               0x0A                    /* 1800 baud */
-#define        RIO_B2400               0x0B                    /* 2400 baud */
-#define        RIO_B4800               0x0C                    /* 4800 baud */
-#define        RIO_B9600               0x0D                    /* 9600 baud */
-#define        RIO_B19200              0x0E                    /* 19200 baud */
-#define        RIO_B38400              0x0F                    /* 38400 baud */
-#define        RIO_B56000              0x10                    /* 56000 baud */
-#define        RIO_B57600              0x11                    /* 57600 baud */
-#define        RIO_B64000              0x12                    /* 64000 baud */
-#define        RIO_B115200             0x13                    /* 115200 baud */
-#define        RIO_B2000               0x14                    /* 2000 baud */
-
-
+#define        RIO_B0                  0x00    /* RTS / DTR signals dropped */
+#define        RIO_B50                 0x01    /* 50 baud */
+#define        RIO_B75                 0x02    /* 75 baud */
+#define        RIO_B110                0x03    /* 110 baud */
+#define        RIO_B134                0x04    /* 134.5 baud */
+#define        RIO_B150                0x05    /* 150 baud */
+#define        RIO_B200                0x06    /* 200 baud */
+#define        RIO_B300                0x07    /* 300 baud */
+#define        RIO_B600                0x08    /* 600 baud */
+#define        RIO_B1200               0x09    /* 1200 baud */
+#define        RIO_B1800               0x0A    /* 1800 baud */
+#define        RIO_B2400               0x0B    /* 2400 baud */
+#define        RIO_B4800               0x0C    /* 4800 baud */
+#define        RIO_B9600               0x0D    /* 9600 baud */
+#define        RIO_B19200              0x0E    /* 19200 baud */
+#define        RIO_B38400              0x0F    /* 38400 baud */
+#define        RIO_B56000              0x10    /* 56000 baud */
+#define        RIO_B57600              0x11    /* 57600 baud */
+#define        RIO_B64000              0x12    /* 64000 baud */
+#define        RIO_B115200             0x13    /* 115200 baud */
+#define        RIO_B2000               0x14    /* 2000 baud */