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] / include / linux / isicom.h

diff --git a/include/linux/isicom.h b/include/linux/isicom.h
index 7c6eae7..45b3d48 100644 (file)
--- a/include/linux/isicom.h
+++ b/include/linux/isicom.h
@@ -4,47 +4,12 @@
 /*#define              ISICOM_DEBUG*/
 /*#define              ISICOM_DEBUG_DTR_RTS*/
 
-
-/*
- *     Firmware Loader definitions ...
- */
- 
-#define                __MultiTech             ('M'<<8)
-#define                MIOCTL_LOAD_FIRMWARE    (__MultiTech | 0x01)
-#define         MIOCTL_READ_FIRMWARE    (__MultiTech | 0x02)
-#define         MIOCTL_XFER_CTRL       (__MultiTech | 0x03)
-#define         MIOCTL_RESET_CARD      (__MultiTech | 0x04)
-
-#define                DATA_SIZE       16
-
-typedef        struct  {
-               unsigned short  exec_segment;
-               unsigned short  exec_addr;
-}      exec_record;
-
-typedef        struct  {
-               int             board;          /* Board to load */
-               unsigned short  addr;
-               unsigned short  count;
-}      bin_header;
-
-typedef        struct  {
-               int             board;          /* Board to load */
-               unsigned short  addr;
-               unsigned short  count;
-               unsigned short  segment;
-               unsigned char   bin_data[DATA_SIZE];
-}      bin_frame;
-
 #ifdef __KERNEL__
 
 #define                YES     1
 #define                NO      0
 
-#define                ISILOAD_MISC_MINOR      155     /* /dev/isctl */
-#define                ISILOAD_NAME            "ISILoad"
-
-/*     
+/*
  *  ISICOM Driver definitions ...
  *
  */
@@ -55,8 +20,8 @@ typedef       struct  {
  *      PCI definitions
  */
 
- #define        DEVID_COUNT     9
- #define        VENDOR_ID       0x10b5
+#define                DEVID_COUNT     9
+#define                VENDOR_ID       0x10b5
 
 /*
  *     These are now officially allocated numbers
@@ -66,9 +31,9 @@ typedef       struct  {
 #define                ISICOM_CMAJOR   113     /* callout */
 #define                ISICOM_MAGIC    (('M' << 8) | 'T')
 
-#define                WAKEUP_CHARS    256     /* hard coded for now   */ 
-#define                TX_SIZE         254 
- 
+#define                WAKEUP_CHARS    256     /* hard coded for now   */
+#define                TX_SIZE         254
+
 #define                BOARD_COUNT     4
 #define                PORT_COUNT      (BOARD_COUNT*16)
 
@@ -98,18 +63,15 @@ typedef     struct  {
 #define                ISICOM_INITIATE_XONXOFF 0x04
 #define                ISICOM_RESPOND_XONXOFF  0x08
 
-#define InterruptTheCard(base) (outw(0,(base)+0xc)) 
-#define ClearInterrupt(base) (inw((base)+0x0a))        
-
 #define        BOARD(line)  (((line) >> 4) & 0x3)
 
        /*      isi kill queue bitmap   */
-       
+
 #define                ISICOM_KILLTX           0x01
 #define                ISICOM_KILLRX           0x02
 
        /* isi_board status bitmap */
-       
+
 #define                FIRMWARE_LOADED         0x0001
 #define                BOARD_ACTIVE            0x0002
 
@@ -123,9 +85,8 @@ typedef      struct  {
 #define                ISI_RTS                 0x0200
 
 
-#define                ISI_TXOK                0x0001 
- 
+#define                ISI_TXOK                0x0001
+
 #endif /*      __KERNEL__      */
 
 #endif /*      ISICOM_H        */
-