From 5269af8fde9b2d0cf2fe02e76df20be0d87413eb Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 9 Feb 2006 20:45:26 -0800 Subject: [PATCH] --- yaml --- r: 21399 b: refs/heads/master c: 5fe91cf6254c8f23d90efb5fc11fff57dd5ab8dd h: refs/heads/master i: 21397: 3af86fe94db66c97b2627352f57df34d379c8641 21395: 53a946e2d9e84d3c592431f3df40a96cae780310 21391: f3e1043eeb015c4f820801e65ea408efd6206348 v: v3 --- [refs] | 2 +- trunk/include/asm-sparc/idprom.h | 26 +++++++++----------------- trunk/include/asm-sparc64/idprom.h | 12 +----------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 7a213710592e..c16309f093ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed6b0b45437dcf7ef1c48b3be413bebcc84771d8 +refs/heads/master: 5fe91cf6254c8f23d90efb5fc11fff57dd5ab8dd diff --git a/trunk/include/asm-sparc/idprom.h b/trunk/include/asm-sparc/idprom.h index d856e640acd3..59083ed85232 100644 --- a/trunk/include/asm-sparc/idprom.h +++ b/trunk/include/asm-sparc/idprom.h @@ -7,27 +7,19 @@ #ifndef _SPARC_IDPROM_H #define _SPARC_IDPROM_H -/* Offset into the EEPROM where the id PROM is located on the 4c */ -#define IDPROM_OFFSET 0x7d8 +#include -/* On sun4m; physical. */ -/* MicroSPARC(-II) does not decode 31rd bit, but it works. */ -#define IDPROM_OFFSET_M 0xfd8 - -struct idprom -{ - unsigned char id_format; /* Format identifier (always 0x01) */ - unsigned char id_machtype; /* Machine type */ - 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]; +struct idprom { + u8 id_format; /* Format identifier (always 0x01) */ + u8 id_machtype; /* Machine type */ + u8 id_ethaddr[6]; /* Hardware ethernet address */ + s32 id_date; /* Date of manufacture */ + u32 id_sernum:24; /* Unique serial number */ + u8 id_cksum; /* Checksum - xor of the data bytes */ + u8 reserved[16]; }; extern struct idprom *idprom; extern void idprom_init(void); -#define IDPROM_SIZE (sizeof(struct idprom)) - #endif /* !(_SPARC_IDPROM_H) */ diff --git a/trunk/include/asm-sparc64/idprom.h b/trunk/include/asm-sparc64/idprom.h index 701483c5465d..77fbf987385f 100644 --- a/trunk/include/asm-sparc64/idprom.h +++ b/trunk/include/asm-sparc64/idprom.h @@ -9,15 +9,7 @@ #include -/* Offset into the EEPROM where the id PROM is located on the 4c */ -#define IDPROM_OFFSET 0x7d8 - -/* On sun4m; physical. */ -/* MicroSPARC(-II) does not decode 31rd bit, but it works. */ -#define IDPROM_OFFSET_M 0xfd8 - -struct idprom -{ +struct idprom { u8 id_format; /* Format identifier (always 0x01) */ u8 id_machtype; /* Machine type */ u8 id_ethaddr[6]; /* Hardware ethernet address */ @@ -30,6 +22,4 @@ struct idprom extern struct idprom *idprom; extern void idprom_init(void); -#define IDPROM_SIZE (sizeof(struct idprom)) - #endif /* !(_SPARC_IDPROM_H) */