diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-03-24 03:18:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-24 07:33:28 -0800 |
| commit | 74769abfcb430b839914f3fe91e23a4f628d9553 (patch) | |
| tree | af7443e43f236d4d9e6c87ef777989989f1079ec /drivers/char/rio/rup.h | |
| parent | 10e705f83c3e796893a70fb872895ba604901166 (diff) | |
[PATCH] rio: more header cleanup
Strip some of the typedef mess out Remove a small subset of unused defines
and the like.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/rio/rup.h')
| -rw-r--r-- | drivers/char/rio/rup.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/char/rio/rup.h b/drivers/char/rio/rup.h index f74f67c6f70..40c617436bd 100644 --- a/drivers/char/rio/rup.h +++ b/drivers/char/rio/rup.h @@ -37,14 +37,7 @@ #ifndef _rup_h #define _rup_h 1 -#ifdef SCCS_LABELS -#ifndef lint -/* static char *_rio_rup_h_sccs = "@(#)rup.h 1.5"; */ -#endif -#endif - #define MAX_RUP ((short) 16) - #define PKTS_PER_RUP ((short) 2) /* They are always used in pairs */ /************************************************* @@ -62,13 +55,13 @@ struct RUP { PKT_ptr txpkt; /* Outgoing packet */ PKT_ptr rxpkt; /* Incoming packet */ - WORD link; /* Which link to send down? */ - BYTE rup_dest_unit[2]; /* Destination unit */ - WORD handshake; /* For handshaking */ - WORD timeout; /* Timeout */ - WORD status; /* Status */ - WORD txcontrol; /* Transmit control */ - WORD rxcontrol; /* Receive control */ + u16 link; /* Which link to send down? */ + u8 rup_dest_unit[2]; /* Destination unit */ + u16 handshake; /* For handshaking */ + u16 timeout; /* Timeout */ + u16 status; /* Status */ + u16 txcontrol; /* Transmit control */ + u16 rxcontrol; /* Receive control */ }; #endif |