tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] Yet more rio cleaning (1 of 2)

- Remove more unused headers
- Remove various typedefs
- Correct type of PaddrP (physical addresses should be ulong)
- Kill use of bcopy
- More printk cleanups
- Kill true/false
- Clean up direct access to pci BARs

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Alan Cox and committed by
Linus Torvalds 57c2d60e db318524

+36 -524
-61
drivers/char/rio/bootpkt.h
··· 1 - 2 - 3 - /**************************************************************************** 4 - ******* ******* 5 - ******* B O O T P A C K E T H E A D E R F I L E 6 - ******* ******* 7 - **************************************************************************** 8 - 9 - Author : Ian Nandhra 10 - Date : 11 - 12 - * 13 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 14 - * 15 - * This program is free software; you can redistribute it and/or modify 16 - * it under the terms of the GNU General Public License as published by 17 - * the Free Software Foundation; either version 2 of the License, or 18 - * (at your option) any later version. 19 - * 20 - * This program is distributed in the hope that it will be useful, 21 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 22 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 23 - * GNU General Public License for more details. 24 - * 25 - * You should have received a copy of the GNU General Public License 26 - * along with this program; if not, write to the Free Software 27 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 28 - 29 - Version : 0.01 30 - 31 - 32 - Mods 33 - ---------------------------------------------------------------------------- 34 - Date By Description 35 - ---------------------------------------------------------------------------- 36 - 37 - ***************************************************************************/ 38 - 39 - #ifndef _pkt_h 40 - #define _pkt_h 1 41 - 42 - #ifndef lint 43 - #ifdef SCCS 44 - static char *_rio_bootpkt_h_sccs = "@(#)bootpkt.h 1.1"; 45 - #endif 46 - #endif 47 - 48 - /************************************************* 49 - * Overlayed onto the Data fields of a regular 50 - * Packet 51 - ************************************************/ 52 - typedef struct BOOT_PKT BOOT_PKT; 53 - struct BOOT_PKT { 54 - short seq_num; 55 - char data[10]; 56 - }; 57 - 58 - 59 - #endif 60 - 61 - /*********** end of file ***********/
+1 -109
drivers/char/rio/cirrus.h
··· 40 40 #endif 41 41 #define _cirrus_h 1 42 42 43 - 44 - 45 - /* Bit fields for particular registers */ 46 - 47 - /* GCR */ 48 - #define GCR_SERIAL 0x00 /* Configure as serial channel */ 49 - #define GCR_PARALLEL 0x80 /* Configure as parallel channel */ 50 - 51 - /* RDSR - when status read from FIFO */ 52 - #define RDSR_BREAK 0x08 /* Break received */ 53 - #define RDSR_TIMEOUT 0x80 /* No new data timeout */ 54 - #define RDSR_SC1 0x10 /* Special char 1 (tx XON) matched */ 55 - #define RDSR_SC2 0x20 /* Special char 2 (tx XOFF) matched */ 56 - #define RDSR_SC12_MASK 0x30 /* Mask for special chars 1 and 2 */ 57 - 58 - /* PPR */ 59 - #define PPR_DEFAULT 0x31 /* Default value - for a 25Mhz clock gives 60 - a timeout period of 1ms */ 61 - 62 - /* LIVR */ 63 - #define LIVR_EXCEPTION 0x07 /* Receive exception interrupt */ 64 - 65 - /* CCR */ 66 - #define CCR_RESET 0x80 /* Reset channel */ 67 - #define CCR_CHANGE 0x4e /* COR's have changed - NB always change all 68 - COR's */ 69 - #define CCR_WFLUSH 0x82 /* Flush transmit FIFO and TSR / THR */ 70 - 71 - #define CCR_SENDSC1 0x21 /* Send special character one */ 72 - #define CCR_SENDSC2 0x22 /* Send special character two */ 73 - #define CCR_SENDSC3 0x23 /* Send special character three */ 74 - #define CCR_SENDSC4 0x24 /* Send special character four */ 75 - 76 - #define CCR_TENABLE 0x18 /* Enable transmitter */ 77 - #define CCR_TDISABLE 0x14 /* Disable transmitter */ 78 - #define CCR_RENABLE 0x12 /* Enable receiver */ 79 - #define CCR_RDISABLE 0x11 /* Disable receiver */ 80 - 81 - #define CCR_READY 0x00 /* CCR is ready for another command */ 82 - 83 - /* CCSR */ 84 - #define CCSR_TXENABLE 0x08 /* Transmitter enable */ 85 - #define CCSR_RXENABLE 0x80 /* Receiver enable */ 86 - #define CCSR_TXFLOWOFF 0x04 /* Transmit flow off */ 87 - #define CCSR_TXFLOWON 0x02 /* Transmit flow on */ 88 - 89 - /* SVRR */ 90 - #define SVRR_RECEIVE 0x01 /* Receive interrupt pending */ 91 - #define SVRR_TRANSMIT 0x02 /* Transmit interrupt pending */ 92 - #define SVRR_MODEM 0x04 /* Modem interrupt pending */ 93 - 94 - /* CAR */ 95 - #define CAR_PORTS 0x03 /* Bit fields for ports */ 96 - 97 - /* IER */ 98 - #define IER_MODEM 0x80 /* Change in modem status */ 99 - #define IER_RECEIVE 0x10 /* Good data / data exception */ 100 - #define IER_TRANSMITR 0x04 /* Transmit ready (FIFO empty) */ 101 - #define IER_TRANSMITE 0x02 /* Transmit empty */ 102 - #define IER_TIMEOUT 0x01 /* Timeout on no data */ 103 - 104 - #define IER_DEFAULT 0x94 /* Default values */ 105 - #define IER_PARALLEL 0x84 /* Default for Parallel */ 106 - #define IER_EMPTY 0x92 /* Transmitter empty rather than ready */ 107 - 108 - /* COR1 - Driver only */ 109 - #define COR1_INPCK 0x10 /* Check parity of received characters */ 43 + /* Bit fields for particular registers shared with driver */ 110 44 111 45 /* COR1 - driver and RTA */ 112 46 #define COR1_ODD 0x80 /* Odd parity */ ··· 156 222 157 223 #define MSVR1_HOST 0xf3 /* The bits the host wants */ 158 224 159 - /* MSVR2 */ 160 - #define MSVR2_DSR 0x02 /* DSR output pin (DTR on Cirrus) */ 161 - 162 - /* MCOR */ 163 - #define MCOR_CD 0x80 /* CD (DSR on Cirrus) */ 164 - #define MCOR_RTS 0x40 /* RTS (CTS on Cirrus) */ 165 - #define MCOR_RI 0x20 /* RI */ 166 - #define MCOR_DTR 0x10 /* DTR (CD on Cirrus) */ 167 - 168 - #define MCOR_DEFAULT (MCOR_CD | MCOR_RTS | MCOR_RI | MCOR_DTR) 169 - #define MCOR_FULLMODEM MCOR_DEFAULT 170 - #define MCOR_RJ45 (MCOR_CD | MCOR_RTS | MCOR_DTR) 171 - #define MCOR_RESTRICTED (MCOR_CD | MCOR_RTS) 172 - 173 - /* More MCOR - H/W Handshake (flowcontrol) stuff */ 174 - #define MCOR_THRESH8 0x08 /* eight characters then we stop */ 175 - #define MCOR_THRESH9 0x09 /* nine characters then we stop */ 176 - #define MCOR_THRESH10 0x0A /* ten characters then we stop */ 177 - #define MCOR_THRESH11 0x0B /* eleven characters then we stop */ 178 - 179 - #define MCOR_THRESHBITS 0x0F /* mask for ANDing out the above */ 180 - 181 - #define MCOR_THRESHOLD MCOR_THRESH9 /* MUST BE GREATER THAN COR3_THRESHOLD */ 182 - 183 - 184 - /* RTPR */ 185 - #define RTPR_DEFAULT 0x02 /* Default */ 186 - 187 - 188 225 /* Defines for the subscripts of a CONFIG packet */ 189 226 #define CONFIG_COR1 1 /* Option register 1 */ 190 227 #define CONFIG_COR2 2 /* Option register 2 */ ··· 168 263 #define CONFIG_LNEXT 9 /* LNEXT character */ 169 264 #define CONFIG_TXBAUD 10 /* Tx baud rate */ 170 265 #define CONFIG_RXBAUD 11 /* Rx baud rate */ 171 - 172 - /* Port status stuff */ 173 - #define IDLE_CLOSED 0 /* Closed */ 174 - #define IDLE_OPEN 1 /* Idle open */ 175 - #define IDLE_BREAK 2 /* Idle on break */ 176 - 177 - /* Subscript of MODEM STATUS packet */ 178 - #define MODEM_VALUE 3 /* Current values of handshake pins */ 179 - /* Subscript of SBREAK packet */ 180 - #define BREAK_LENGTH 1 /* Length of a break in slices of 0.01 seconds 181 - 0 = stay on break until an EBREAK command 182 - is sent */ 183 - 184 266 185 267 #define PRE_EMPTIVE 0x80 /* Pre-emptive bit in command field */ 186 268
-61
drivers/char/rio/control.h
··· 1 - 2 - 3 - /**************************************************************************** 4 - ******* ******* 5 - ******* C O N T R O L P A C K E T H E A D E R S 6 - ******* ******* 7 - **************************************************************************** 8 - 9 - Author : Jon Brawn 10 - Date : 11 - 12 - * 13 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 14 - * 15 - * This program is free software; you can redistribute it and/or modify 16 - * it under the terms of the GNU General Public License as published by 17 - * the Free Software Foundation; either version 2 of the License, or 18 - * (at your option) any later version. 19 - * 20 - * This program is distributed in the hope that it will be useful, 21 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 22 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 23 - * GNU General Public License for more details. 24 - * 25 - * You should have received a copy of the GNU General Public License 26 - * along with this program; if not, write to the Free Software 27 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 28 - 29 - Version : 0.01 30 - 31 - 32 - Mods 33 - ---------------------------------------------------------------------------- 34 - Date By Description 35 - ---------------------------------------------------------------------------- 36 - 37 - ***************************************************************************/ 38 - 39 - 40 - #ifndef _control_h 41 - #define _control_h 42 - 43 - #ifndef lint 44 - /* static char *_rio_control_h_sccs = "@(#)control.h 1.4"; */ 45 - #endif 46 - 47 - #define CONTROL '^' 48 - #define IFOAD ( CONTROL + 1 ) 49 - #define IDENTIFY ( CONTROL + 2 ) 50 - #define ZOMBIE ( CONTROL + 3 ) 51 - #define UFOAD ( CONTROL + 4 ) 52 - #define IWAIT ( CONTROL + 5 ) 53 - 54 - #define IFOAD_MAGIC 0xF0AD /* of course */ 55 - #define ZOMBIE_MAGIC (~0xDEAD) /* not dead -> zombie */ 56 - #define UFOAD_MAGIC 0xD1E /* kill-your-neighbour */ 57 - #define IWAIT_MAGIC 0xB1DE /* Bide your time */ 58 - 59 - #endif 60 - 61 - /*********** end of file ***********/
-51
drivers/char/rio/defaults.h
··· 1 - 2 - /**************************************************************************** 3 - ******* ******* 4 - ******* D E F A U L T S 5 - ******* ******* 6 - **************************************************************************** 7 - 8 - Author : Ian Nandhra 9 - Date : 10 - 11 - * 12 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 13 - * 14 - * This program is free software; you can redistribute it and/or modify 15 - * it under the terms of the GNU General Public License as published by 16 - * the Free Software Foundation; either version 2 of the License, or 17 - * (at your option) any later version. 18 - * 19 - * This program is distributed in the hope that it will be useful, 20 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 21 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 22 - * GNU General Public License for more details. 23 - * 24 - * You should have received a copy of the GNU General Public License 25 - * along with this program; if not, write to the Free Software 26 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 27 - 28 - Version : 0.01 29 - 30 - 31 - Mods 32 - ---------------------------------------------------------------------------- 33 - Date By Description 34 - ---------------------------------------------------------------------------- 35 - 36 - ***************************************************************************/ 37 - 38 - #ifndef lint 39 - #ifdef SCCS 40 - static char *_rio_defaults_h_sccs = "@(#)defaults.h 1.1"; 41 - #endif 42 - #endif 43 - 44 - 45 - #define MILLISECOND (int) (1000/64) /* 15.625 low ticks */ 46 - #define SECOND (int) 15625 /* Low priority ticks */ 47 - 48 - #define LINK_TIMEOUT (int) (POLL_PERIOD / 2) 49 - 50 - 51 - /*********** end of file ***********/
-82
drivers/char/rio/error.h
··· 1 - 2 - /**************************************************************************** 3 - ******* ******* 4 - ******* E R R O R H E A D E R F I L E 5 - ******* ******* 6 - **************************************************************************** 7 - 8 - Author : Ian Nandhra 9 - Date : 10 - 11 - * 12 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 13 - * 14 - * This program is free software; you can redistribute it and/or modify 15 - * it under the terms of the GNU General Public License as published by 16 - * the Free Software Foundation; either version 2 of the License, or 17 - * (at your option) any later version. 18 - * 19 - * This program is distributed in the hope that it will be useful, 20 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 21 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 22 - * GNU General Public License for more details. 23 - * 24 - * You should have received a copy of the GNU General Public License 25 - * along with this program; if not, write to the Free Software 26 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 27 - 28 - Version : 0.01 29 - 30 - 31 - Mods 32 - ---------------------------------------------------------------------------- 33 - Date By Description 34 - ---------------------------------------------------------------------------- 35 - 36 - ***************************************************************************/ 37 - 38 - #ifndef lint 39 - /* static char *_rio_error_h_sccs = "@(#)error.h 1.3"; */ 40 - #endif 41 - 42 - #define E_NO_ERROR ((ushort) 0) 43 - #define E_PROCESS_NOT_INIT ((ushort) 1) 44 - #define E_LINK_TIMEOUT ((ushort) 2) 45 - #define E_NO_ROUTE ((ushort) 3) 46 - #define E_CONFUSED ((ushort) 4) 47 - #define E_HOME ((ushort) 5) 48 - #define E_CSUM_FAIL ((ushort) 6) 49 - #define E_DISCONNECTED ((ushort) 7) 50 - #define E_BAD_RUP ((ushort) 8) 51 - #define E_NO_VIRGIN ((ushort) 9) 52 - #define E_BOOT_RUP_BUSY ((ushort) 10) 53 - 54 - 55 - 56 - /************************************************* 57 - * Parsed to mem_halt() 58 - ************************************************/ 59 - #define E_CHANALLOC ((ushort) 0x80) 60 - #define E_POLL_ALLOC ((ushort) 0x81) 61 - #define E_LTTWAKE ((ushort) 0x82) 62 - #define E_LTT_ALLOC ((ushort) 0x83) 63 - #define E_LRT_ALLOC ((ushort) 0x84) 64 - #define E_CIRRUS ((ushort) 0x85) 65 - #define E_MONITOR ((ushort) 0x86) 66 - #define E_PHB_ALLOC ((ushort) 0x87) 67 - #define E_ARRAY_ALLOC ((ushort) 0x88) 68 - #define E_QBUF_ALLOC ((ushort) 0x89) 69 - #define E_PKT_ALLOC ((ushort) 0x8a) 70 - #define E_GET_TX_Q_BUF ((ushort) 0x8b) 71 - #define E_GET_RX_Q_BUF ((ushort) 0x8c) 72 - #define E_MEM_OUT ((ushort) 0x8d) 73 - #define E_MMU_INIT ((ushort) 0x8e) 74 - #define E_LTT_INIT ((ushort) 0x8f) 75 - #define E_LRT_INIT ((ushort) 0x90) 76 - #define E_LINK_RUN ((ushort) 0x91) 77 - #define E_MONITOR_ALLOC ((ushort) 0x92) 78 - #define E_MONITOR_INIT ((ushort) 0x93) 79 - #define E_POLL_INIT ((ushort) 0x94) 80 - 81 - 82 - /*********** end of file ***********/
+2 -5
drivers/char/rio/func.h
··· 49 49 int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT *); 50 50 int RIOBootOk(struct rio_info *, struct Host *, unsigned long); 51 51 int RIORtaBound(struct rio_info *, unsigned int); 52 - void FillSlot(int, int, unsigned int, struct Host *); 52 + void rio_fill_host_slot(int, int, unsigned int, struct Host *); 53 53 54 54 /* riocmd.c */ 55 55 int RIOFoadRta(struct Host *, struct Map *); ··· 66 66 int RIOWFlushMark(unsigned long, struct CmdBlk *); 67 67 int RIORFlushEnable(unsigned long, struct CmdBlk *); 68 68 int RIOUnUse(unsigned long, struct CmdBlk *); 69 - void ShowPacket(unsigned int, struct PKT *); 70 69 71 70 /* rioctrl.c */ 72 71 int riocontrol(struct rio_info *, dev_t, int, caddr_t, int); ··· 78 79 int RIODoAT(struct rio_info *, int, int); 79 80 caddr_t RIOCheckForATCard(int); 80 81 int RIOAssignAT(struct rio_info *, int, caddr_t, int); 81 - int RIOBoardTest(paddr_t, caddr_t, unsigned char, int); 82 + int RIOBoardTest(unsigned long, caddr_t, unsigned char, int); 82 83 void RIOAllocDataStructs(struct rio_info *); 83 84 void RIOSetupDataStructs(struct rio_info *); 84 85 int RIODefaultName(struct rio_info *, struct Host *, unsigned int); 85 86 struct rioVersion *RIOVersid(void); 86 - int RIOMapin(paddr_t, int, caddr_t *); 87 - void RIOMapout(paddr_t, long, caddr_t); 88 87 void RIOHostReset(unsigned int, struct DpRam *, unsigned int); 89 88 90 89 /* riointr.c */
+1 -1
drivers/char/rio/host.h
··· 56 56 unsigned char Slot; /* Slot */ 57 57 caddr_t Caddr; /* KV address of DPRAM */ 58 58 struct DpRam *CardP; /* KV address of DPRAM, with overlay */ 59 - paddr_t PaddrP; /* Phys. address of DPRAM */ 59 + unsigned long PaddrP; /* Phys. address of DPRAM */ 60 60 char Name[MAX_NAME_LEN]; /* The name of the host */ 61 61 unsigned int UniqueNum; /* host unique number */ 62 62 spinlock_t HostLock; /* Lock structure for MPX */
+6 -6
drivers/char/rio/link.h
··· 50 50 51 51 struct LPB { 52 52 u16 link_number; /* Link Number */ 53 - Channel_ptr in_ch; /* Link In Channel */ 54 - Channel_ptr out_ch; /* Link Out Channel */ 53 + u16 in_ch; /* Link In Channel */ 54 + u16 out_ch; /* Link Out Channel */ 55 55 u8 attached_serial[4]; /* Attached serial number */ 56 56 u8 attached_host_serial[4]; 57 57 /* Serial number of Host who ··· 59 59 u16 descheduled; /* Currently Descheduled */ 60 60 u16 state; /* Current state */ 61 61 u16 send_poll; /* Send a Poll Packet */ 62 - Process_ptr ltt_p; /* Process Descriptor */ 63 - Process_ptr lrt_p; /* Process Descriptor */ 62 + u16 ltt_p; /* Process Descriptor */ 63 + u16 lrt_p; /* Process Descriptor */ 64 64 u16 lrt_status; /* Current lrt status */ 65 65 u16 ltt_status; /* Current ltt status */ 66 66 u16 timeout; /* Timeout value */ ··· 71 71 u16 add_packet_list; /* Add packets to here */ 72 72 u16 remove_packet_list; /* Send packets from here */ 73 73 74 - Channel_ptr lrt_fail_chan; /* Lrt's failure channel */ 75 - Channel_ptr ltt_fail_chan; /* Ltt's failure channel */ 74 + u16 lrt_fail_chan; /* Lrt's failure channel */ 75 + u16 ltt_fail_chan; /* Ltt's failure channel */ 76 76 77 77 /* RUP structure for HOST to driver communications */ 78 78 struct RUP rup;
-4
drivers/char/rio/linux_compat.h
··· 25 25 struct termios tm; 26 26 }; 27 27 28 - #define bcopy(src, dest, n) memcpy ((dest), (src), (n)) 29 - 30 - #define SEM_SIGIGNORE 0x1234 31 - 32 28 extern int rio_debug; 33 29 34 30 #define RIO_DEBUG_INIT 0x000001
-56
drivers/char/rio/list.h
··· 1 - /**************************************************************************** 2 - ******* ******* 3 - ******* L I S T ******* 4 - ******* ******* 5 - **************************************************************************** 6 - 7 - Author : Jeremy Rolls. 8 - Date : 04-Nov-1990 9 - 10 - * 11 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 12 - * 13 - * This program is free software; you can redistribute it and/or modify 14 - * it under the terms of the GNU General Public License as published by 15 - * the Free Software Foundation; either version 2 of the License, or 16 - * (at your option) any later version. 17 - * 18 - * This program is distributed in the hope that it will be useful, 19 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 20 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 21 - * GNU General Public License for more details. 22 - * 23 - * You should have received a copy of the GNU General Public License 24 - * along with this program; if not, write to the Free Software 25 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 26 - 27 - Version : 0.01 28 - 29 - 30 - Mods 31 - ---------------------------------------------------------------------------- 32 - Date By Description 33 - ---------------------------------------------------------------------------- 34 - ***************************************************************************/ 35 - 36 - #ifndef _list_h 37 - #define _list_h 1 38 - 39 - #ifdef SCCS_LABELS 40 - #ifndef lint 41 - static char *_rio_list_h_sccs = "@(#)list.h 1.9"; 42 - #endif 43 - #endif 44 - 45 - #define PKT_IN_USE 0x1 46 - 47 - #define ZERO_PTR (ushort) 0x8000 48 - #define CaD PortP->Caddr 49 - 50 - /* 51 - ** We can add another packet to a transmit queue if the packet pointer pointed 52 - ** to by the TxAdd pointer has PKT_IN_USE clear in its address. 53 - */ 54 - 55 - #endif /* ifndef _list.h */ 56 - /*********** end of file ***********/
+6 -6
drivers/char/rio/map.h
··· 47 47 #define MAX_NAME_LEN 32 48 48 49 49 struct Map { 50 - uint HostUniqueNum; /* Supporting hosts unique number */ 51 - uint RtaUniqueNum; /* Unique number */ 50 + unsigned int HostUniqueNum; /* Supporting hosts unique number */ 51 + unsigned int RtaUniqueNum; /* Unique number */ 52 52 /* 53 53 ** The next two IDs must be swapped on big-endian architectures 54 54 ** when using a v2.04 /etc/rio/config with a v3.00 driver (when 55 55 ** upgrading for example). 56 56 */ 57 - ushort ID; /* ID used in the subnet */ 58 - ushort ID2; /* ID of 2nd block of 8 for 16 port */ 59 - ulong Flags; /* Booted, ID Given, Disconnected */ 60 - ulong SysPort; /* First tty mapped to this port */ 57 + unsigned short ID; /* ID used in the subnet */ 58 + unsigned short ID2; /* ID of 2nd block of 8 for 16 port */ 59 + unsigned long Flags; /* Booted, ID Given, Disconnected */ 60 + unsigned long SysPort; /* First tty mapped to this port */ 61 61 struct Top Topology[LINKS_PER_UNIT]; /* ID connected to each link */ 62 62 char Name[MAX_NAME_LEN]; /* Cute name by which RTA is known */ 63 63 };
+12 -12
drivers/char/rio/param.h
··· 43 43 */ 44 44 45 45 struct phb_param { 46 - BYTE Cmd; /* It is very important that these line up */ 47 - BYTE Cor1; /* with what is expected at the other end. */ 48 - BYTE Cor2; /* to confirm that you've got it right, */ 49 - BYTE Cor4; /* check with cirrus/cirrus.h */ 50 - BYTE Cor5; 51 - BYTE TxXon; /* Transmit X-On character */ 52 - BYTE TxXoff; /* Transmit X-Off character */ 53 - BYTE RxXon; /* Receive X-On character */ 54 - BYTE RxXoff; /* Receive X-Off character */ 55 - BYTE LNext; /* Literal-next character */ 56 - BYTE TxBaud; /* Transmit baudrate */ 57 - BYTE RxBaud; /* Receive baudrate */ 46 + u8 Cmd; /* It is very important that these line up */ 47 + u8 Cor1; /* with what is expected at the other end. */ 48 + u8 Cor2; /* to confirm that you've got it right, */ 49 + u8 Cor4; /* check with cirrus/cirrus.h */ 50 + u8 Cor5; 51 + u8 TxXon; /* Transmit X-On character */ 52 + u8 TxXoff; /* Transmit X-Off character */ 53 + u8 RxXon; /* Receive X-On character */ 54 + u8 RxXoff; /* Receive X-Off character */ 55 + u8 LNext; /* Literal-next character */ 56 + u8 TxBaud; /* Transmit baudrate */ 57 + u8 RxBaud; /* Receive baudrate */ 58 58 }; 59 59 60 60 #endif
+7 -7
drivers/char/rio/parmmap.h
··· 47 47 typedef struct PARM_MAP PARM_MAP; 48 48 49 49 struct PARM_MAP { 50 - PHB_ptr phb_ptr; /* Pointer to the PHB array */ 50 + u16 phb_ptr; /* Pointer to the PHB array */ 51 51 u16 phb_num_ptr; /* Ptr to Number of PHB's */ 52 - FREE_LIST_ptr free_list; /* Free List pointer */ 53 - FREE_LIST_ptr free_list_end; /* Free List End pointer */ 54 - Q_BUF_ptr_ptr q_free_list_ptr; /* Ptr to Q_BUF variable */ 52 + u16 free_list; /* Free List pointer */ 53 + u16 free_list_end; /* Free List End pointer */ 54 + u16 q_free_list_ptr; /* Ptr to Q_BUF variable */ 55 55 u16 unit_id_ptr; /* Unit Id */ 56 - LPB_ptr link_str_ptr; /* Link Structure Array */ 56 + u16 link_str_ptr; /* Link Structure Array */ 57 57 u16 bootloader_1; /* 1st Stage Boot Loader */ 58 58 u16 bootloader_2; /* 2nd Stage Boot Loader */ 59 59 u16 port_route_map_ptr; /* Port Route Map */ 60 - ROUTE_STR_ptr route_ptr; /* Unit Route Map */ 60 + u16 route_ptr; /* Unit Route Map */ 61 61 u16 map_present; /* Route Map present */ 62 62 s16 pkt_num; /* Total number of packets */ 63 63 s16 q_num; /* Total number of Q packets */ ··· 70 70 u16 rx_limit; /* For high / low watermarks */ 71 71 s16 links; /* Links to use */ 72 72 s16 timer; /* Interrupts per second */ 73 - RUP_ptr rups; /* Pointer to the RUPs */ 73 + u16 rups; /* Pointer to the RUPs */ 74 74 u16 max_phb; /* Mostly for debugging */ 75 75 u16 living; /* Just increments!! */ 76 76 u16 init_done; /* Initialisation over */
+1 -1
drivers/char/rio/phb.h
··· 117 117 * the start. The pointer tx_add points to a SPACE to put a Packet. 118 118 * The pointer tx_remove points to the next Packet to remove 119 119 *************************************************************************/ 120 - typedef struct PHB PHB; 120 + 121 121 struct PHB { 122 122 u8 source; 123 123 u8 handshake;
-62
drivers/char/rio/qbuf.h
··· 1 - 2 - /**************************************************************************** 3 - ******* ******* 4 - ******* Q U E U E B U F F E R S T R U C T U R E S 5 - ******* ******* 6 - **************************************************************************** 7 - 8 - Author : Ian Nandhra / Jeremy Rolls 9 - Date : 10 - 11 - * 12 - * (C) 1990 - 2000 Specialix International Ltd., Byfleet, Surrey, UK. 13 - * 14 - * This program is free software; you can redistribute it and/or modify 15 - * it under the terms of the GNU General Public License as published by 16 - * the Free Software Foundation; either version 2 of the License, or 17 - * (at your option) any later version. 18 - * 19 - * This program is distributed in the hope that it will be useful, 20 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 21 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 22 - * GNU General Public License for more details. 23 - * 24 - * You should have received a copy of the GNU General Public License 25 - * along with this program; if not, write to the Free Software 26 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 27 - 28 - Version : 0.01 29 - 30 - 31 - Mods 32 - ---------------------------------------------------------------------------- 33 - Date By Description 34 - ---------------------------------------------------------------------------- 35 - 36 - ***************************************************************************/ 37 - 38 - #ifndef _qbuf_h 39 - #define _qbuf_h 1 40 - 41 - #ifndef lint 42 - #ifdef SCCS_LABELS 43 - static char *_rio_qbuf_h_sccs = "@(#)qbuf.h 1.1"; 44 - #endif 45 - #endif 46 - 47 - 48 - 49 - #define PKTS_PER_BUFFER (220 / PKT_LENGTH) 50 - 51 - typedef struct Q_BUF Q_BUF; 52 - struct Q_BUF { 53 - Q_BUF_ptr next; 54 - Q_BUF_ptr prev; 55 - PKT_ptr buf[PKTS_PER_BUFFER]; 56 - }; 57 - 58 - 59 - #endif 60 - 61 - 62 - /*********** end of file ***********/