lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC]: Clean up idprom header files.

Browse Source 
Delete unused macros, and use fixed sized types in
sparc32 header.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-02-09 20:45:26 -08:00
parent ed6b0b4543
commit 5fe91cf625
2 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/asm-sparc/idprom.h
View File

@@ -7,27 +7,19 @@
#ifndef _SPARC_IDPROM_H #ifndef _SPARC_IDPROM_H
#define _SPARC_IDPROM_H #define _SPARC_IDPROM_H
/* Offset into the EEPROM where the id PROM is located on the 4c */ #include <linux/types.h>
#define IDPROM_OFFSET 0x7d8
/* On sun4m; physical. */ struct idprom {
/* MicroSPARC(-II) does not decode 31rd bit, but it works. */ u8 id_format; /* Format identifier (always 0x01) */
#define IDPROM_OFFSET_M 0xfd8 u8 id_machtype; /* Machine type */
u8 id_ethaddr[6]; /* Hardware ethernet address */
struct idprom s32 id_date; /* Date of manufacture */
{ u32 id_sernum:24; /* Unique serial number */
unsigned char id_format; /* Format identifier (always 0x01) */ u8 id_cksum; /* Checksum - xor of the data bytes */
unsigned char id_machtype; /* Machine type */ u8 reserved[16];
unsigned char id_ethaddr[6]; /* Hardware ethernet address */
long id_date; /* Date of manufacture */
unsigned int id_sernum:24; /* Unique serial number */
unsigned char id_cksum; /* Checksum - xor of the data bytes */
unsigned char reserved[16];
}; };
extern struct idprom *idprom; extern struct idprom *idprom;
extern void idprom_init(void); extern void idprom_init(void);
#define IDPROM_SIZE (sizeof(struct idprom))
#endif /* !(_SPARC_IDPROM_H) */ #endif /* !(_SPARC_IDPROM_H) */

12
include/asm-sparc64/idprom.h
View File

@@ -9,15 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
/* Offset into the EEPROM where the id PROM is located on the 4c */ struct idprom {
#define IDPROM_OFFSET 0x7d8
/* On sun4m; physical. */
/* MicroSPARC(-II) does not decode 31rd bit, but it works. */
#define IDPROM_OFFSET_M 0xfd8
struct idprom
{
u8 id_format; /* Format identifier (always 0x01) */ u8 id_format; /* Format identifier (always 0x01) */
u8 id_machtype; /* Machine type */ u8 id_machtype; /* Machine type */
u8 id_ethaddr[6]; /* Hardware ethernet address */ u8 id_ethaddr[6]; /* Hardware ethernet address */
@@ -30,6 +22,4 @@ struct idprom
extern struct idprom *idprom; extern struct idprom *idprom;
extern void idprom_init(void); extern void idprom_init(void);
#define IDPROM_SIZE (sizeof(struct idprom))
#endif /* !(_SPARC_IDPROM_H) */ #endif /* !(_SPARC_IDPROM_H) */