Commit 5fe91cf6 authored by David S. Miller's avatar David S. Miller

[SPARC]: Clean up idprom header files.

Delete unused macros, and use fixed sized types in
sparc32 header.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed6b0b45
...@@ -7,27 +7,19 @@ ...@@ -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) */
...@@ -9,15 +9,7 @@ ...@@ -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 ...@@ -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) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment