diff options
Diffstat (limited to 'drivers/char/rio/riospace.h')
-rw-r--r-- | drivers/char/rio/riospace.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/drivers/char/rio/riospace.h b/drivers/char/rio/riospace.h index 32b09b0f23aa..534f1f5b9f53 100644 --- a/drivers/char/rio/riospace.h +++ b/drivers/char/rio/riospace.h | |||
@@ -47,9 +47,8 @@ static char *_riospace_h_sccs_ = "@(#)riospace.h 1.2"; | |||
47 | ** In particular, it won't be able to see changes to RIO_SLOTS | 47 | ** In particular, it won't be able to see changes to RIO_SLOTS |
48 | */ | 48 | */ |
49 | 49 | ||
50 | struct Conf | 50 | struct Conf { |
51 | { | 51 | char Locator[24]; |
52 | char Locator[24]; | ||
53 | unsigned int StartupTime; | 52 | unsigned int StartupTime; |
54 | unsigned int SlowCook; | 53 | unsigned int SlowCook; |
55 | unsigned int IntrPollTime; | 54 | unsigned int IntrPollTime; |
@@ -59,8 +58,8 @@ struct Conf | |||
59 | unsigned int HostLoadBase; | 58 | unsigned int HostLoadBase; |
60 | unsigned int XpHz; | 59 | unsigned int XpHz; |
61 | unsigned int XpCps; | 60 | unsigned int XpCps; |
62 | char *XpOn; | 61 | char *XpOn; |
63 | char *XpOff; | 62 | char *XpOff; |
64 | unsigned int MaxXpCps; | 63 | unsigned int MaxXpCps; |
65 | unsigned int MinXpCps; | 64 | unsigned int MinXpCps; |
66 | unsigned int SpinCmds; | 65 | unsigned int SpinCmds; |
@@ -74,7 +73,7 @@ struct Conf | |||
74 | 73 | ||
75 | /* | 74 | /* |
76 | ** Board types - these MUST correspond to product codes! | 75 | ** Board types - these MUST correspond to product codes! |
77 | */ | 76 | */ |
78 | #define RIO_EMPTY 0x0 | 77 | #define RIO_EMPTY 0x0 |
79 | #define RIO_EISA 0x3 | 78 | #define RIO_EISA 0x3 |
80 | #define RIO_RTA_16 0x9 | 79 | #define RIO_RTA_16 0x9 |
@@ -86,18 +85,16 @@ struct Conf | |||
86 | /* | 85 | /* |
87 | ** Board data structure. This is used for configuration info | 86 | ** Board data structure. This is used for configuration info |
88 | */ | 87 | */ |
89 | struct Brd | 88 | struct Brd { |
90 | { | 89 | unsigned char Type; /* RIO_EISA, RIO_MCA, RIO_AT, RIO_EMPTY... */ |
91 | unsigned char Type; /* RIO_EISA, RIO_MCA, RIO_AT, RIO_EMPTY... */ | 90 | unsigned char Ivec; /* POLLED or ivec number */ |
92 | unsigned char Ivec; /* POLLED or ivec number */ | 91 | unsigned char Mode; /* Control stuff, see below */ |
93 | unsigned char Mode; /* Control stuff, see below */ | ||
94 | }; | 92 | }; |
95 | 93 | ||
96 | struct Board | 94 | struct Board { |
97 | { | 95 | char Locator[RIO_LOCATOR_LEN]; |
98 | char Locator[RIO_LOCATOR_LEN]; | 96 | int NumSlots; |
99 | int NumSlots; | 97 | struct Brd Boards[MAX_RIO_BOARDS]; |
100 | struct Brd Boards[MAX_RIO_BOARDS]; | ||
101 | }; | 98 | }; |
102 | 99 | ||
103 | #define BOOT_FROM_LINK 0x00 | 100 | #define BOOT_FROM_LINK 0x00 |
@@ -158,4 +155,4 @@ struct Board | |||
158 | 155 | ||
159 | #define DBG_ALWAYS 0x80000000 | 156 | #define DBG_ALWAYS 0x80000000 |
160 | 157 | ||
161 | #endif /* __rio_riospace_h__ */ | 158 | #endif /* __rio_riospace_h__ */ |