1 files changed, 76 insertions, 76 deletions
diff --git a/drivers/char/rio/link.h b/drivers/char/rio/link.h
index 972250348f4a..bfba5b0c033e 100644
--- a/drivers/char/rio/link.h
+++ b/drivers/char/rio/link.h
@@ -70,27 +70,27 @@
 #define  DIE_NOW                (ushort) 0x0200
 /* Boot request stuff */
-#define BOOT_REQUEST       ((ushort) 0)    /* Request for a boot */
+#define BOOT_REQUEST       ((ushort) 0) /* Request for a boot */
-#define BOOT_ABORT         ((ushort) 1)    /* Abort a boot */
+#define BOOT_ABORT         ((ushort) 1) /* Abort a boot */
-#define BOOT_SEQUENCE      ((ushort) 2)    /* Packet with the number of packets
+#define BOOT_SEQUENCE      ((ushort) 2) /* Packet with the number of packets
-                                              and load address */
+                                           and load address */
-#define BOOT_COMPLETED     ((ushort) 3)    /* Boot completed */
+#define BOOT_COMPLETED     ((ushort) 3) /* Boot completed */
 /* States that a link can be in */
-#define LINK_DISCONNECTED  ((ushort) 0)    /* Disconnected */
+#define LINK_DISCONNECTED  ((ushort) 0) /* Disconnected */
-#define LINK_BOOT1         ((ushort) 1)    /* Trying to send 1st stage boot */
+#define LINK_BOOT1         ((ushort) 1) /* Trying to send 1st stage boot */
-#define LINK_BOOT2         ((ushort) 2)    /* Trying to send 2nd stage boot */
+#define LINK_BOOT2         ((ushort) 2) /* Trying to send 2nd stage boot */
-#define LINK_BOOT2WAIT     ((ushort) 3)    /* Waiting for selftest results */
+#define LINK_BOOT2WAIT     ((ushort) 3) /* Waiting for selftest results */
-#define LINK_BOOT3         ((ushort) 4)    /* Trying to send 3rd stage boots */
+#define LINK_BOOT3         ((ushort) 4) /* Trying to send 3rd stage boots */
-#define LINK_SYNC          ((ushort) 5)    /* Syncing */
+#define LINK_SYNC          ((ushort) 5) /* Syncing */
-#define LINK_INTRO         ((ushort) 10)    /* Introductory packet */
+#define LINK_INTRO         ((ushort) 10)        /* Introductory packet */
-#define LINK_SUPPLYID      ((ushort) 11)    /* Trying to supply an ID */
+#define LINK_SUPPLYID      ((ushort) 11)        /* Trying to supply an ID */
-#define LINK_TOPOLOGY      ((ushort) 12)    /* Send a topology update */
+#define LINK_TOPOLOGY      ((ushort) 12)        /* Send a topology update */
-#define LINK_REQUESTID     ((ushort) 13)    /* Waiting for an ID */
+#define LINK_REQUESTID     ((ushort) 13)        /* Waiting for an ID */
-#define LINK_CONNECTED     ((ushort) 14)    /* Connected */
+#define LINK_CONNECTED     ((ushort) 14)        /* Connected */
-#define LINK_INTERCONNECT  ((ushort) 20)   /* Subnets interconnected */
+#define LINK_INTERCONNECT  ((ushort) 20)        /* Subnets interconnected */
 #define LINK_SPARE         ((ushort) 40)
@@ -103,12 +103,12 @@
 ** LED stuff
 */
 #if defined(RTA)
-#define LED_OFF            ((ushort) 0)    /* LED off */
+#define LED_OFF            ((ushort) 0) /* LED off */
-#define LED_RED            ((ushort) 1)    /* LED Red */
+#define LED_RED            ((ushort) 1) /* LED Red */
-#define LED_GREEN          ((ushort) 2)    /* LED Green */
+#define LED_GREEN          ((ushort) 2) /* LED Green */
-#define LED_ORANGE         ((ushort) 4)    /* LED Orange */
+#define LED_ORANGE         ((ushort) 4) /* LED Orange */
-#define LED_1TO8_OPEN      ((ushort) 1)    /* Port 1->8 LED on */
+#define LED_1TO8_OPEN      ((ushort) 1) /* Port 1->8 LED on */
-#define LED_9TO16_OPEN     ((ushort) 2)    /* Port 9->16 LED on */
+#define LED_9TO16_OPEN     ((ushort) 2) /* Port 9->16 LED on */
 #define LED_SET_COLOUR(colour)  (link->led = (colour))
 #define LED_OR_COLOUR(colour)   (link->led |= (colour))
 #define LED_TIMEOUT(time)    (link->led_timeout = RioTimePlus(RioTime(),(time)))
@@ -116,72 +116,72 @@
 #define LED_SET_COLOUR(colour)
 #define LED_OR_COLOUR(colour)
 #define LED_TIMEOUT(time)
-#endif /* RTA */
+#endif                          /* RTA */
 struct LPB {
-               WORD          link_number ;       /* Link Number */
+        WORD link_number;       /* Link Number */
-               Channel_ptr   in_ch ;             /* Link In Channel */
+        Channel_ptr in_ch;      /* Link In Channel */
-               Channel_ptr   out_ch ;            /* Link Out Channel */
+        Channel_ptr out_ch;     /* Link Out Channel */
 #ifdef RTA
-               uchar        stat_led ;          /* Port open leds */
+        uchar stat_led;         /* Port open leds */
-               uchar        led ;               /* True, light led! */
+        uchar led;              /* True, light led! */
 #endif
-               BYTE attached_serial[4]; /* Attached serial number */
+        BYTE attached_serial[4];        /* Attached serial number */
-               BYTE attached_host_serial[4];
+        BYTE attached_host_serial[4];
-                                                 /* Serial number of Host who
+        /* Serial number of Host who
-                                                    booted the other end */
+           booted the other end */
-               WORD          descheduled ;       /* Currently Descheduled */
+        WORD descheduled;       /* Currently Descheduled */
-               WORD          state;              /* Current state */
+        WORD state;             /* Current state */
-               WORD          send_poll ;         /* Send a Poll Packet */
+        WORD send_poll;         /* Send a Poll Packet */
-               Process_ptr   ltt_p ;             /* Process Descriptor */
+        Process_ptr ltt_p;      /* Process Descriptor */
-               Process_ptr   lrt_p ;             /* Process Descriptor */
+        Process_ptr lrt_p;      /* Process Descriptor */
-               WORD          lrt_status ;        /* Current lrt status */
+        WORD lrt_status;        /* Current lrt status */
-               WORD          ltt_status ;        /* Current ltt status */
+        WORD ltt_status;        /* Current ltt status */
-               WORD          timeout ;           /* Timeout value */
+        WORD timeout;           /* Timeout value */
-               WORD          topology;           /* Topology bits */
+        WORD topology;          /* Topology bits */
-               WORD          mon_ltt ;
+        WORD mon_ltt;
-               WORD          mon_lrt ;
+        WORD mon_lrt;
-               WORD          WaitNoBoot ;        /* Secs to hold off booting */
+        WORD WaitNoBoot;        /* Secs to hold off booting */
-               PKT_ptr       add_packet_list;    /* Add packets to here */
+        PKT_ptr add_packet_list;        /* Add packets to here */
-               PKT_ptr       remove_packet_list; /* Send packets from here */
+        PKT_ptr remove_packet_list;     /* Send packets from here */
 #ifdef RTA
 #ifdef DCIRRUS
-#define    QBUFS_PER_REDIRECT (4 / PKTS_PER_BUFFER + 1) 
+#define    QBUFS_PER_REDIRECT (4 / PKTS_PER_BUFFER + 1)
 #else
-#define    QBUFS_PER_REDIRECT (8 / PKTS_PER_BUFFER + 1) 
+#define    QBUFS_PER_REDIRECT (8 / PKTS_PER_BUFFER + 1)
 #endif
-               PKT_ptr_ptr   rd_add ;            /* Add a new Packet here */
+        PKT_ptr_ptr rd_add;     /* Add a new Packet here */
-               Q_BUF_ptr     rd_add_qb;          /* Pointer to the add Q buf */
+        Q_BUF_ptr rd_add_qb;    /* Pointer to the add Q buf */
-               PKT_ptr_ptr   rd_add_st_qbb ;     /* Pointer to start of the Q's buf */
+        PKT_ptr_ptr rd_add_st_qbb;      /* Pointer to start of the Q's buf */
-               PKT_ptr_ptr   rd_add_end_qbb ;    /* Pointer to the end of the Q's buf */
+        PKT_ptr_ptr rd_add_end_qbb;     /* Pointer to the end of the Q's buf */
-               PKT_ptr_ptr   rd_remove ;         /* Remove a Packet here */
+        PKT_ptr_ptr rd_remove;  /* Remove a Packet here */
-               Q_BUF_ptr     rd_remove_qb ;      /* Pointer to the remove Q buf */
+        Q_BUF_ptr rd_remove_qb; /* Pointer to the remove Q buf */
-               PKT_ptr_ptr   rd_remove_st_qbb ;  /* Pointer to the start of the Q buf */
+        PKT_ptr_ptr rd_remove_st_qbb;   /* Pointer to the start of the Q buf */
-               PKT_ptr_ptr   rd_remove_end_qbb ; /* Pointer to the end of the Q buf */
+        PKT_ptr_ptr rd_remove_end_qbb;  /* Pointer to the end of the Q buf */
-               ushort        pkts_in_q ;         /* Packets in queue */
+        ushort pkts_in_q;       /* Packets in queue */
 #endif
-               Channel_ptr   lrt_fail_chan ;     /* Lrt's failure channel */
+        Channel_ptr lrt_fail_chan;      /* Lrt's failure channel */
-               Channel_ptr   ltt_fail_chan ;     /* Ltt's failure channel */
+        Channel_ptr ltt_fail_chan;      /* Ltt's failure channel */
 #if defined (HOST) || defined (INKERNEL)
- /* RUP structure for HOST to driver communications */
+        /* RUP structure for HOST to driver communications */
-               struct RUP           rup ;              
+        struct RUP rup;
 #endif
-               struct RUP           link_rup;           /* RUP for the link (POLL,
+        struct RUP link_rup;    /* RUP for the link (POLL,
-                                                    topology etc.) */
+                                   topology etc.) */
-               WORD          attached_link ;     /* Number of attached link */
+        WORD attached_link;     /* Number of attached link */
-               WORD          csum_errors ;       /* csum errors */
+        WORD csum_errors;       /* csum errors */
-               WORD          num_disconnects ;   /* number of disconnects */
+        WORD num_disconnects;   /* number of disconnects */
-               WORD          num_sync_rcvd ;     /* # sync's received */
+        WORD num_sync_rcvd;     /* # sync's received */
-               WORD          num_sync_rqst ;     /* # sync requests */
+        WORD num_sync_rqst;     /* # sync requests */
-               WORD          num_tx ;            /* Num pkts sent */
+        WORD num_tx;            /* Num pkts sent */
-               WORD          num_rx ;            /* Num pkts received */
+        WORD num_rx;            /* Num pkts received */
-               WORD          module_attached;    /* Module tpyes of attached */
+        WORD module_attached;   /* Module tpyes of attached */
-               WORD          led_timeout;        /* LED timeout */
+        WORD led_timeout;       /* LED timeout */
-               WORD          first_port;         /* First port to service */
+        WORD first_port;        /* First port to service */
-               WORD          last_port;          /* Last port to service */
+        WORD last_port;         /* Last port to service */
-           } ;
+};
 #endif

diff --git a/drivers/char/rio/link.h b/drivers/char/rio/link.h index 972250348f4a..bfba5b0c033e 100644 --- a/drivers/char/rio/link.h +++ b/drivers/char/rio/link.h
@@ -70,27 +70,27 @@
70	#define DIE_NOW (ushort) 0x0200	70	#define DIE_NOW (ushort) 0x0200
71		71
72	/* Boot request stuff */	72	/* Boot request stuff */
73	#define BOOT_REQUEST ((ushort) 0) /* Request for a boot */	73	#define BOOT_REQUEST ((ushort) 0) /* Request for a boot */
74	#define BOOT_ABORT ((ushort) 1) /* Abort a boot */	74	#define BOOT_ABORT ((ushort) 1) /* Abort a boot */
75	#define BOOT_SEQUENCE ((ushort) 2) /* Packet with the number of packets	75	#define BOOT_SEQUENCE ((ushort) 2) /* Packet with the number of packets
76	and load address */	76	and load address */
77	#define BOOT_COMPLETED ((ushort) 3) /* Boot completed */	77	#define BOOT_COMPLETED ((ushort) 3) /* Boot completed */
78		78
79	/* States that a link can be in */	79	/* States that a link can be in */
80	#define LINK_DISCONNECTED ((ushort) 0) /* Disconnected */	80	#define LINK_DISCONNECTED ((ushort) 0) /* Disconnected */
81	#define LINK_BOOT1 ((ushort) 1) /* Trying to send 1st stage boot */	81	#define LINK_BOOT1 ((ushort) 1) /* Trying to send 1st stage boot */
82	#define LINK_BOOT2 ((ushort) 2) /* Trying to send 2nd stage boot */	82	#define LINK_BOOT2 ((ushort) 2) /* Trying to send 2nd stage boot */
83	#define LINK_BOOT2WAIT ((ushort) 3) /* Waiting for selftest results */	83	#define LINK_BOOT2WAIT ((ushort) 3) /* Waiting for selftest results */
84	#define LINK_BOOT3 ((ushort) 4) /* Trying to send 3rd stage boots */	84	#define LINK_BOOT3 ((ushort) 4) /* Trying to send 3rd stage boots */
85	#define LINK_SYNC ((ushort) 5) /* Syncing */	85	#define LINK_SYNC ((ushort) 5) /* Syncing */
86		86
87	#define LINK_INTRO ((ushort) 10) /* Introductory packet */	87	#define LINK_INTRO ((ushort) 10) /* Introductory packet */
88	#define LINK_SUPPLYID ((ushort) 11) /* Trying to supply an ID */	88	#define LINK_SUPPLYID ((ushort) 11) /* Trying to supply an ID */
89	#define LINK_TOPOLOGY ((ushort) 12) /* Send a topology update */	89	#define LINK_TOPOLOGY ((ushort) 12) /* Send a topology update */
90	#define LINK_REQUESTID ((ushort) 13) /* Waiting for an ID */	90	#define LINK_REQUESTID ((ushort) 13) /* Waiting for an ID */
91	#define LINK_CONNECTED ((ushort) 14) /* Connected */	91	#define LINK_CONNECTED ((ushort) 14) /* Connected */
92		92
93	#define LINK_INTERCONNECT ((ushort) 20) /* Subnets interconnected */	93	#define LINK_INTERCONNECT ((ushort) 20) /* Subnets interconnected */
94		94
95	#define LINK_SPARE ((ushort) 40)	95	#define LINK_SPARE ((ushort) 40)
96		96
@@ -103,12 +103,12 @@
103	** LED stuff	103	** LED stuff
104	*/	104	*/
105	#if defined(RTA)	105	#if defined(RTA)
106	#define LED_OFF ((ushort) 0) /* LED off */	106	#define LED_OFF ((ushort) 0) /* LED off */
107	#define LED_RED ((ushort) 1) /* LED Red */	107	#define LED_RED ((ushort) 1) /* LED Red */
108	#define LED_GREEN ((ushort) 2) /* LED Green */	108	#define LED_GREEN ((ushort) 2) /* LED Green */
109	#define LED_ORANGE ((ushort) 4) /* LED Orange */	109	#define LED_ORANGE ((ushort) 4) /* LED Orange */
110	#define LED_1TO8_OPEN ((ushort) 1) /* Port 1->8 LED on */	110	#define LED_1TO8_OPEN ((ushort) 1) /* Port 1->8 LED on */
111	#define LED_9TO16_OPEN ((ushort) 2) /* Port 9->16 LED on */	111	#define LED_9TO16_OPEN ((ushort) 2) /* Port 9->16 LED on */
112	#define LED_SET_COLOUR(colour) (link->led = (colour))	112	#define LED_SET_COLOUR(colour) (link->led = (colour))
113	#define LED_OR_COLOUR(colour) (link->led \|= (colour))	113	#define LED_OR_COLOUR(colour) (link->led \|= (colour))
114	#define LED_TIMEOUT(time) (link->led_timeout = RioTimePlus(RioTime(),(time)))	114	#define LED_TIMEOUT(time) (link->led_timeout = RioTimePlus(RioTime(),(time)))
@@ -116,72 +116,72 @@
116	#define LED_SET_COLOUR(colour)	116	#define LED_SET_COLOUR(colour)
117	#define LED_OR_COLOUR(colour)	117	#define LED_OR_COLOUR(colour)
118	#define LED_TIMEOUT(time)	118	#define LED_TIMEOUT(time)
119	#endif /* RTA */	119	#endif /* RTA */
120		120
121	struct LPB {	121	struct LPB {
122	WORD link_number ; /* Link Number */	122	WORD link_number; /* Link Number */
123	Channel_ptr in_ch ; /* Link In Channel */	123	Channel_ptr in_ch; /* Link In Channel */
124	Channel_ptr out_ch ; /* Link Out Channel */	124	Channel_ptr out_ch; /* Link Out Channel */
125	#ifdef RTA	125	#ifdef RTA
126	uchar stat_led ; /* Port open leds */	126	uchar stat_led; /* Port open leds */
127	uchar led ; /* True, light led! */	127	uchar led; /* True, light led! */
128	#endif	128	#endif
129	BYTE attached_serial[4]; /* Attached serial number */	129	BYTE attached_serial[4]; /* Attached serial number */
130	BYTE attached_host_serial[4];	130	BYTE attached_host_serial[4];
131	/* Serial number of Host who	131	/* Serial number of Host who
132	booted the other end */	132	booted the other end */
133	WORD descheduled ; /* Currently Descheduled */	133	WORD descheduled; /* Currently Descheduled */
134	WORD state; /* Current state */	134	WORD state; /* Current state */
135	WORD send_poll ; /* Send a Poll Packet */	135	WORD send_poll; /* Send a Poll Packet */
136	Process_ptr ltt_p ; /* Process Descriptor */	136	Process_ptr ltt_p; /* Process Descriptor */
137	Process_ptr lrt_p ; /* Process Descriptor */	137	Process_ptr lrt_p; /* Process Descriptor */
138	WORD lrt_status ; /* Current lrt status */	138	WORD lrt_status; /* Current lrt status */
139	WORD ltt_status ; /* Current ltt status */	139	WORD ltt_status; /* Current ltt status */
140	WORD timeout ; /* Timeout value */	140	WORD timeout; /* Timeout value */
141	WORD topology; /* Topology bits */	141	WORD topology; /* Topology bits */
142	WORD mon_ltt ;	142	WORD mon_ltt;
143	WORD mon_lrt ;	143	WORD mon_lrt;
144	WORD WaitNoBoot ; /* Secs to hold off booting */	144	WORD WaitNoBoot; /* Secs to hold off booting */
145	PKT_ptr add_packet_list; /* Add packets to here */	145	PKT_ptr add_packet_list; /* Add packets to here */
146	PKT_ptr remove_packet_list; /* Send packets from here */	146	PKT_ptr remove_packet_list; /* Send packets from here */
147	#ifdef RTA	147	#ifdef RTA
148	#ifdef DCIRRUS	148	#ifdef DCIRRUS
149	#define QBUFS_PER_REDIRECT (4 / PKTS_PER_BUFFER + 1)	149	#define QBUFS_PER_REDIRECT (4 / PKTS_PER_BUFFER + 1)
150	#else	150	#else
151	#define QBUFS_PER_REDIRECT (8 / PKTS_PER_BUFFER + 1)	151	#define QBUFS_PER_REDIRECT (8 / PKTS_PER_BUFFER + 1)
152	#endif	152	#endif
153	PKT_ptr_ptr rd_add ; /* Add a new Packet here */	153	PKT_ptr_ptr rd_add; /* Add a new Packet here */
154	Q_BUF_ptr rd_add_qb; /* Pointer to the add Q buf */	154	Q_BUF_ptr rd_add_qb; /* Pointer to the add Q buf */
155	PKT_ptr_ptr rd_add_st_qbb ; /* Pointer to start of the Q's buf */	155	PKT_ptr_ptr rd_add_st_qbb; /* Pointer to start of the Q's buf */
156	PKT_ptr_ptr rd_add_end_qbb ; /* Pointer to the end of the Q's buf */	156	PKT_ptr_ptr rd_add_end_qbb; /* Pointer to the end of the Q's buf */
157	PKT_ptr_ptr rd_remove ; /* Remove a Packet here */	157	PKT_ptr_ptr rd_remove; /* Remove a Packet here */
158	Q_BUF_ptr rd_remove_qb ; /* Pointer to the remove Q buf */	158	Q_BUF_ptr rd_remove_qb; /* Pointer to the remove Q buf */
159	PKT_ptr_ptr rd_remove_st_qbb ; /* Pointer to the start of the Q buf */	159	PKT_ptr_ptr rd_remove_st_qbb; /* Pointer to the start of the Q buf */
160	PKT_ptr_ptr rd_remove_end_qbb ; /* Pointer to the end of the Q buf */	160	PKT_ptr_ptr rd_remove_end_qbb; /* Pointer to the end of the Q buf */
161	ushort pkts_in_q ; /* Packets in queue */	161	ushort pkts_in_q; /* Packets in queue */
162	#endif	162	#endif
163		163
164	Channel_ptr lrt_fail_chan ; /* Lrt's failure channel */	164	Channel_ptr lrt_fail_chan; /* Lrt's failure channel */
165	Channel_ptr ltt_fail_chan ; /* Ltt's failure channel */	165	Channel_ptr ltt_fail_chan; /* Ltt's failure channel */
166		166
167	#if defined (HOST) \|\| defined (INKERNEL)	167	#if defined (HOST) \|\| defined (INKERNEL)
168	/* RUP structure for HOST to driver communications */	168	/* RUP structure for HOST to driver communications */
169	struct RUP rup ;	169	struct RUP rup;
170	#endif	170	#endif
171	struct RUP link_rup; /* RUP for the link (POLL,	171	struct RUP link_rup; /* RUP for the link (POLL,
172	topology etc.) */	172	topology etc.) */
173	WORD attached_link ; /* Number of attached link */	173	WORD attached_link; /* Number of attached link */
174	WORD csum_errors ; /* csum errors */	174	WORD csum_errors; /* csum errors */
175	WORD num_disconnects ; /* number of disconnects */	175	WORD num_disconnects; /* number of disconnects */
176	WORD num_sync_rcvd ; /* # sync's received */	176	WORD num_sync_rcvd; /* # sync's received */
177	WORD num_sync_rqst ; /* # sync requests */	177	WORD num_sync_rqst; /* # sync requests */
178	WORD num_tx ; /* Num pkts sent */	178	WORD num_tx; /* Num pkts sent */
179	WORD num_rx ; /* Num pkts received */	179	WORD num_rx; /* Num pkts received */
180	WORD module_attached; /* Module tpyes of attached */	180	WORD module_attached; /* Module tpyes of attached */
181	WORD led_timeout; /* LED timeout */	181	WORD led_timeout; /* LED timeout */
182	WORD first_port; /* First port to service */	182	WORD first_port; /* First port to service */
183	WORD last_port; /* Last port to service */	183	WORD last_port; /* Last port to service */
184	} ;	184	};
185		185
186	#endif	186	#endif
187		187