Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[safe/jmp/linux-2.6] / drivers / char / moxa.h

diff --git a/drivers/char/moxa.h b/drivers/char/moxa.h
index 2a38d17..87d16ce 100644 (file)
--- a/drivers/char/moxa.h
+++ b/drivers/char/moxa.h
@@ -1,6 +1,14 @@
 #ifndef MOXA_H_FILE
 #define MOXA_H_FILE
 
+#define        MOXA            0x400
+#define MOXA_GET_IQUEUE        (MOXA + 1)      /* get input buffered count */
+#define MOXA_GET_OQUEUE        (MOXA + 2)      /* get output buffered count */
+#define MOXA_GETDATACOUNT       (MOXA + 23)
+#define MOXA_GET_IOQUEUE       (MOXA + 27)
+#define MOXA_FLUSH_QUEUE       (MOXA + 28)
+#define MOXA_GETMSTATUS         (MOXA + 65)
+
 /*
  *    System Configuration
  */
@@ -157,11 +165,11 @@
 #define HostStat       0x08    /* IRQ flag and general flag      */
 #define FlagStat       0x0A
 #define FlowControl    0x0C    /* B7 B6 B5 B4 B3 B2 B1 B0              */
-                                       /*  x  x  x  x  |  |  |  |            */
-                                       /*              |  |  |  + CTS flow   */
-                                       /*              |  |  +--- RTS flow   */
-                                       /*              |  +------ TX Xon/Xoff */
-                                       /*              +--------- RX Xon/Xoff */
+                               /*  x  x  x  x  |  |  |  |            */
+                               /*              |  |  |  + CTS flow   */
+                               /*              |  |  +--- RTS flow   */
+                               /*              |  +------ TX Xon/Xoff */
+                               /*              +--------- RX Xon/Xoff */
 #define Break_cnt      0x0E    /* received break count   */
 #define CD180TXirq     0x10    /* if non-0: enable TX irq        */
 #define RX_mask        0x12
@@ -209,7 +217,7 @@
 #define C320p32rx_mask (C320p32rx_size - 1)
 #define C320p32tx_mask (C320p32tx_size - 1)
 
-#define Page_size      0x2000
+#define Page_size      0x2000U
 #define Page_mask      (Page_size - 1)
 #define C218rx_spage   3
 #define C218tx_spage   4