diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-09 23:45:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 04:12:08 -0500 |
| commit | 5fe91cf6254c8f23d90efb5fc11fff57dd5ab8dd (patch) | |
| tree | 3a5d3ec9a752a7996f8e9060710fee322f2d5214 /include | |
| parent | ed6b0b45437dcf7ef1c48b3be413bebcc84771d8 (diff) | |
[SPARC]: Clean up idprom header files.
Delete unused macros, and use fixed sized types in
sparc32 header.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/idprom.h | 26 | ||||
| -rw-r--r-- | include/asm-sparc64/idprom.h | 12 |
2 files changed, 10 insertions, 28 deletions
diff --git a/include/asm-sparc/idprom.h b/include/asm-sparc/idprom.h index d856e640acd3..59083ed85232 100644 --- a/include/asm-sparc/idprom.h +++ b/include/asm-sparc/idprom.h | |||
| @@ -7,27 +7,19 @@ | |||
| 7 | #ifndef _SPARC_IDPROM_H | 7 | #ifndef _SPARC_IDPROM_H |
| 8 | #define _SPARC_IDPROM_H | 8 | #define _SPARC_IDPROM_H |
| 9 | 9 | ||
| 10 | /* Offset into the EEPROM where the id PROM is located on the 4c */ | 10 | #include <linux/types.h> |
| 11 | #define IDPROM_OFFSET 0x7d8 | ||
| 12 | 11 | ||
| 13 | /* On sun4m; physical. */ | 12 | struct idprom { |
| 14 | /* MicroSPARC(-II) does not decode 31rd bit, but it works. */ | 13 | u8 id_format; /* Format identifier (always 0x01) */ |
| 15 | #define IDPROM_OFFSET_M 0xfd8 | 14 | u8 id_machtype; /* Machine type */ |
| 16 | 15 | u8 id_ethaddr[6]; /* Hardware ethernet address */ | |
| 17 | struct idprom | 16 | s32 id_date; /* Date of manufacture */ |
| 18 | { | 17 | u32 id_sernum:24; /* Unique serial number */ |
| 19 | unsigned char id_format; /* Format identifier (always 0x01) */ | 18 | u8 id_cksum; /* Checksum - xor of the data bytes */ |
| 20 | unsigned char id_machtype; /* Machine type */ | 19 | u8 reserved[16]; |
| 21 | unsigned char id_ethaddr[6]; /* Hardware ethernet address */ | ||
| 22 | long id_date; /* Date of manufacture */ | ||
| 23 | unsigned int id_sernum:24; /* Unique serial number */ | ||
| 24 | unsigned char id_cksum; /* Checksum - xor of the data bytes */ | ||
| 25 | unsigned char reserved[16]; | ||
| 26 | }; | 20 | }; |
| 27 | 21 | ||
| 28 | extern struct idprom *idprom; | 22 | extern struct idprom *idprom; |
| 29 | extern void idprom_init(void); | 23 | extern void idprom_init(void); |
| 30 | 24 | ||
| 31 | #define IDPROM_SIZE (sizeof(struct idprom)) | ||
| 32 | |||
| 33 | #endif /* !(_SPARC_IDPROM_H) */ | 25 | #endif /* !(_SPARC_IDPROM_H) */ |
diff --git a/include/asm-sparc64/idprom.h b/include/asm-sparc64/idprom.h index 701483c5465d..77fbf987385f 100644 --- a/include/asm-sparc64/idprom.h +++ b/include/asm-sparc64/idprom.h | |||
| @@ -9,15 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | 11 | ||
| 12 | /* Offset into the EEPROM where the id PROM is located on the 4c */ | 12 | struct idprom { |
| 13 | #define IDPROM_OFFSET 0x7d8 | ||
| 14 | |||
| 15 | /* On sun4m; physical. */ | ||
| 16 | /* MicroSPARC(-II) does not decode 31rd bit, but it works. */ | ||
| 17 | #define IDPROM_OFFSET_M 0xfd8 | ||
| 18 | |||
| 19 | struct idprom | ||
| 20 | { | ||
| 21 | u8 id_format; /* Format identifier (always 0x01) */ | 13 | u8 id_format; /* Format identifier (always 0x01) */ |
| 22 | u8 id_machtype; /* Machine type */ | 14 | u8 id_machtype; /* Machine type */ |
| 23 | u8 id_ethaddr[6]; /* Hardware ethernet address */ | 15 | u8 id_ethaddr[6]; /* Hardware ethernet address */ |
| @@ -30,6 +22,4 @@ struct idprom | |||
| 30 | extern struct idprom *idprom; | 22 | extern struct idprom *idprom; |
| 31 | extern void idprom_init(void); | 23 | extern void idprom_init(void); |
| 32 | 24 | ||
| 33 | #define IDPROM_SIZE (sizeof(struct idprom)) | ||
| 34 | |||
| 35 | #endif /* !(_SPARC_IDPROM_H) */ | 25 | #endif /* !(_SPARC_IDPROM_H) */ |