diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:04:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:29 -0400 |
commit | d6ae390a0be73e6b777c6171e6b6f616462f555d (patch) | |
tree | e574562c895d30fab675e02c810ec49faf76cc30 /include/asm-x86/voyager.h | |
parent | 8948584eb282c4dc5c54f6f6ebbaf447a665c653 (diff) |
include/asm-x86/voyager.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/voyager.h')
-rw-r--r-- | include/asm-x86/voyager.h | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/include/asm-x86/voyager.h b/include/asm-x86/voyager.h index 91a9932937a..9c811d2e6f9 100644 --- a/include/asm-x86/voyager.h +++ b/include/asm-x86/voyager.h | |||
@@ -91,8 +91,7 @@ | |||
91 | #define VOYAGER_WRITE_CONFIG 0x2 | 91 | #define VOYAGER_WRITE_CONFIG 0x2 |
92 | #define VOYAGER_BYPASS 0xff | 92 | #define VOYAGER_BYPASS 0xff |
93 | 93 | ||
94 | typedef struct voyager_asic | 94 | typedef struct voyager_asic { |
95 | { | ||
96 | __u8 asic_addr; /* ASIC address; Level 4 */ | 95 | __u8 asic_addr; /* ASIC address; Level 4 */ |
97 | __u8 asic_type; /* ASIC type */ | 96 | __u8 asic_type; /* ASIC type */ |
98 | __u8 asic_id; /* ASIC id */ | 97 | __u8 asic_id; /* ASIC id */ |
@@ -113,7 +112,7 @@ typedef struct voyager_module { | |||
113 | __u16 largest_reg; /* Largest register in the scan path */ | 112 | __u16 largest_reg; /* Largest register in the scan path */ |
114 | __u16 smallest_reg; /* Smallest register in the scan path */ | 113 | __u16 smallest_reg; /* Smallest register in the scan path */ |
115 | voyager_asic_t *asic; /* First ASIC in scan path (CAT_I) */ | 114 | voyager_asic_t *asic; /* First ASIC in scan path (CAT_I) */ |
116 | struct voyager_module *submodule; /* Submodule pointer */ | 115 | struct voyager_module *submodule; /* Submodule pointer */ |
117 | struct voyager_module *next; /* Next module in linked list */ | 116 | struct voyager_module *next; /* Next module in linked list */ |
118 | } voyager_module_t; | 117 | } voyager_module_t; |
119 | 118 | ||
@@ -135,7 +134,7 @@ typedef struct voyager_eeprom_hdr { | |||
135 | __u16 cct_offset; | 134 | __u16 cct_offset; |
136 | __u16 log_length; /* length of err log */ | 135 | __u16 log_length; /* length of err log */ |
137 | __u16 xsum_end; /* offset to end of | 136 | __u16 xsum_end; /* offset to end of |
138 | checksum */ | 137 | checksum */ |
139 | __u8 reserved[4]; | 138 | __u8 reserved[4]; |
140 | __u8 sflag; /* starting sentinal */ | 139 | __u8 sflag; /* starting sentinal */ |
141 | __u8 part_number[13]; /* prom part number */ | 140 | __u8 part_number[13]; /* prom part number */ |
@@ -148,7 +147,8 @@ typedef struct voyager_eeprom_hdr { | |||
148 | 147 | ||
149 | 148 | ||
150 | 149 | ||
151 | #define VOYAGER_EPROM_SIZE_OFFSET ((__u16)(&(((voyager_eprom_hdr_t *)0)->ee_size))) | 150 | #define VOYAGER_EPROM_SIZE_OFFSET \ |
151 | ((__u16)(&(((voyager_eprom_hdr_t *)0)->ee_size))) | ||
152 | #define VOYAGER_XSUM_END_OFFSET 0x2a | 152 | #define VOYAGER_XSUM_END_OFFSET 0x2a |
153 | 153 | ||
154 | /* the following three definitions are for internal table layouts | 154 | /* the following three definitions are for internal table layouts |
@@ -199,7 +199,7 @@ typedef struct voyager_asic_data_table { | |||
199 | #define VOYAGER_WCBIC_TOM_L 0x4 | 199 | #define VOYAGER_WCBIC_TOM_L 0x4 |
200 | #define VOYAGER_WCBIC_TOM_H 0x5 | 200 | #define VOYAGER_WCBIC_TOM_H 0x5 |
201 | 201 | ||
202 | /* register defines for Voyager Memory Contol (VMC) | 202 | /* register defines for Voyager Memory Contol (VMC) |
203 | * these are present on L4 machines only */ | 203 | * these are present on L4 machines only */ |
204 | #define VOYAGER_VMC1 0x81 | 204 | #define VOYAGER_VMC1 0x81 |
205 | #define VOYAGER_VMC2 0x91 | 205 | #define VOYAGER_VMC2 0x91 |
@@ -334,7 +334,7 @@ typedef struct { | |||
334 | 334 | ||
335 | struct QuadDescription { | 335 | struct QuadDescription { |
336 | __u8 Type; /* for type 0 (DYADIC or MONADIC) all fields | 336 | __u8 Type; /* for type 0 (DYADIC or MONADIC) all fields |
337 | * will be zero except for slot */ | 337 | * will be zero except for slot */ |
338 | __u8 StructureVersion; | 338 | __u8 StructureVersion; |
339 | __u32 CPI_BaseAddress; | 339 | __u32 CPI_BaseAddress; |
340 | __u32 LARC_BankSize; | 340 | __u32 LARC_BankSize; |
@@ -342,7 +342,7 @@ struct QuadDescription { | |||
342 | __u8 Slot; /* Processor slots 1 - 4 */ | 342 | __u8 Slot; /* Processor slots 1 - 4 */ |
343 | } __attribute__((packed)); | 343 | } __attribute__((packed)); |
344 | 344 | ||
345 | struct ProcBoardInfo { | 345 | struct ProcBoardInfo { |
346 | __u8 Type; | 346 | __u8 Type; |
347 | __u8 StructureVersion; | 347 | __u8 StructureVersion; |
348 | __u8 NumberOfBoards; | 348 | __u8 NumberOfBoards; |
@@ -382,19 +382,30 @@ struct CPU_Info { | |||
382 | * packed in it by our friend the compiler. | 382 | * packed in it by our friend the compiler. |
383 | */ | 383 | */ |
384 | typedef struct { | 384 | typedef struct { |
385 | __u8 Mailbox_SUS; /* Written to by SUS to give commands/response to the OS */ | 385 | __u8 Mailbox_SUS; /* Written to by SUS to give |
386 | __u8 Mailbox_OS; /* Written to by the OS to give commands/response to SUS */ | 386 | commands/response to the OS */ |
387 | __u8 SUS_MailboxVersion; /* Tells the OS which iteration of the interface SUS supports */ | 387 | __u8 Mailbox_OS; /* Written to by the OS to give |
388 | __u8 OS_MailboxVersion; /* Tells SUS which iteration of the interface the OS supports */ | 388 | commands/response to SUS */ |
389 | __u32 OS_Flags; /* Flags set by the OS as info for SUS */ | 389 | __u8 SUS_MailboxVersion; /* Tells the OS which iteration of the |
390 | __u32 SUS_Flags; /* Flags set by SUS as info for the OS */ | 390 | interface SUS supports */ |
391 | __u32 WatchDogPeriod; /* Watchdog period (in seconds) which the DP uses to see if the OS is dead */ | 391 | __u8 OS_MailboxVersion; /* Tells SUS which iteration of the |
392 | interface the OS supports */ | ||
393 | __u32 OS_Flags; /* Flags set by the OS as info for | ||
394 | SUS */ | ||
395 | __u32 SUS_Flags; /* Flags set by SUS as info | ||
396 | for the OS */ | ||
397 | __u32 WatchDogPeriod; /* Watchdog period (in seconds) which | ||
398 | the DP uses to see if the OS | ||
399 | is dead */ | ||
392 | __u32 WatchDogCount; /* Updated by the OS on every tic. */ | 400 | __u32 WatchDogCount; /* Updated by the OS on every tic. */ |
393 | __u32 MemoryFor_SUS_ErrorLog; /* Flat 32 bit address which tells SUS where to stuff the SUS error log on a dump */ | 401 | __u32 MemoryFor_SUS_ErrorLog; /* Flat 32 bit address which tells SUS |
394 | MC_SlotInformation_t MC_SlotInfo[NUMBER_OF_MC_BUSSES*SLOTS_PER_MC_BUS]; /* Storage for MCA POS data */ | 402 | where to stuff the SUS error log |
403 | on a dump */ | ||
404 | MC_SlotInformation_t MC_SlotInfo[NUMBER_OF_MC_BUSSES*SLOTS_PER_MC_BUS]; | ||
405 | /* Storage for MCA POS data */ | ||
395 | /* All new SECOND_PASS_INTERFACE fields added from this point */ | 406 | /* All new SECOND_PASS_INTERFACE fields added from this point */ |
396 | struct ProcBoardInfo *BoardData; | 407 | struct ProcBoardInfo *BoardData; |
397 | struct CPU_Info *CPU_Data; | 408 | struct CPU_Info *CPU_Data; |
398 | /* All new fields must be added from this point */ | 409 | /* All new fields must be added from this point */ |
399 | } Voyager_KernelSUS_Mbox_t; | 410 | } Voyager_KernelSUS_Mbox_t; |
400 | 411 | ||
@@ -478,7 +489,7 @@ struct voyager_SUS { | |||
478 | __u32 SUS_errorlog; | 489 | __u32 SUS_errorlog; |
479 | /* lots of system configuration stuff under here */ | 490 | /* lots of system configuration stuff under here */ |
480 | }; | 491 | }; |
481 | 492 | ||
482 | /* Variables exported by voyager_smp */ | 493 | /* Variables exported by voyager_smp */ |
483 | extern __u32 voyager_extended_vic_processors; | 494 | extern __u32 voyager_extended_vic_processors; |
484 | extern __u32 voyager_allowed_boot_processors; | 495 | extern __u32 voyager_allowed_boot_processors; |