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 / parmmap.h

diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
index 46f99df..9764ef8 100644 (file)
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/char/rio/parmmap.h
@@ -44,53 +44,45 @@
 #endif
 #endif
 
-typedef struct PARM_MAP PARM_MAP ;
+typedef struct PARM_MAP PARM_MAP;
 
-struct PARM_MAP
-{
-PHB_ptr           phb_ptr ;              /* Pointer to the PHB array */
-WORD_ptr          phb_num_ptr ;          /* Ptr to Number of PHB's */
-FREE_LIST_ptr     free_list;             /* Free List pointer */
-FREE_LIST_ptr     free_list_end;         /* Free List End pointer */
-Q_BUF_ptr_ptr     q_free_list_ptr ;      /* Ptr to Q_BUF variable */
-BYTE_ptr          unit_id_ptr ;          /* Unit Id */
-LPB_ptr           link_str_ptr ;         /* Link Structure Array */
-BYTE_ptr          bootloader_1 ;         /* 1st Stage Boot Loader */
-BYTE_ptr          bootloader_2 ;         /* 2nd Stage Boot Loader */
-WORD_ptr          port_route_map_ptr ;   /* Port Route Map */
-ROUTE_STR_ptr     route_ptr ;            /* Unit Route Map */
-NUMBER_ptr        map_present ;          /* Route Map present */
-NUMBER            pkt_num ;               /* Total number of packets */
-NUMBER            q_num ;                 /* Total number of Q packets */
-WORD              buffers_per_port ;      /* Number of buffers per port */
-WORD              heap_size ;             /* Initial size of heap */
-WORD              heap_left ;             /* Current Heap left */
-WORD              error ;                 /* Error code */
-WORD              tx_max;                 /* Max number of tx pkts per phb */
-WORD              rx_max;                 /* Max number of rx pkts per phb */
-WORD              rx_limit;               /* For high / low watermarks */
-NUMBER            links ;                 /* Links to use */
-NUMBER            timer ;                 /* Interrupts per second */
-RUP_ptr           rups ;                 /* Pointer to the RUPs */
-WORD              max_phb ;              /* Mostly for debugging */
-WORD              living ;               /* Just increments!! */
-WORD              init_done ;            /* Initialisation over */
-WORD              booting_link ;
-WORD              idle_count ;           /* Idle time counter */
-WORD              busy_count ;           /* Busy counter */
-WORD              idle_control ;         /* Control Idle Process */
-#if defined(HOST) || defined(INKERNEL)
-WORD              tx_intr;               /* TX interrupt pending */
-WORD              rx_intr;               /* RX interrupt pending */
-WORD              rup_intr;              /* RUP interrupt pending */
-#endif
-#if defined(RTA)
-WORD             dying_count;          /* Count of processes dead */
-#endif
-} ;
+struct PARM_MAP {
+       u16 phb_ptr;    /* Pointer to the PHB array */
+       u16 phb_num_ptr;        /* Ptr to Number of PHB's */
+       u16 free_list;  /* Free List pointer */
+       u16 free_list_end;      /* Free List End pointer */
+       u16 q_free_list_ptr;    /* Ptr to Q_BUF variable */
+       u16 unit_id_ptr;        /* Unit Id */
+       u16 link_str_ptr;       /* Link Structure Array */
+       u16 bootloader_1;       /* 1st Stage Boot Loader */
+       u16 bootloader_2;       /* 2nd Stage Boot Loader */
+       u16 port_route_map_ptr; /* Port Route Map */
+       u16 route_ptr;          /* Unit Route Map */
+       u16 map_present;        /* Route Map present */
+       s16 pkt_num;            /* Total number of packets */
+       s16 q_num;              /* Total number of Q packets */
+       u16 buffers_per_port;   /* Number of buffers per port */
+       u16 heap_size;          /* Initial size of heap */
+       u16 heap_left;          /* Current Heap left */
+       u16 error;              /* Error code */
+       u16 tx_max;             /* Max number of tx pkts per phb */
+       u16 rx_max;             /* Max number of rx pkts per phb */
+       u16 rx_limit;           /* For high / low watermarks */
+       s16 links;              /* Links to use */
+       s16 timer;              /* Interrupts per second */
+       u16 rups;               /* Pointer to the RUPs */
+       u16 max_phb;            /* Mostly for debugging */
+       u16 living;             /* Just increments!! */
+       u16 init_done;          /* Initialisation over */
+       u16 booting_link;
+       u16 idle_count;         /* Idle time counter */
+       u16 busy_count;         /* Busy counter */
+       u16 idle_control;       /* Control Idle Process */
+       u16 tx_intr;            /* TX interrupt pending */
+       u16 rx_intr;            /* RX interrupt pending */
+       u16 rup_intr;           /* RUP interrupt pending */
+};
 
 #endif
 
 /*********** end of file ***********/
-
-