tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
+10
-28
+9
-17
include/asm-sparc/idprom.h
+9
-17
include/asm-sparc/idprom.h
···
7
7
#ifndef _SPARC_IDPROM_H
8
8
#define _SPARC_IDPROM_H
9
9
10
-
/* Offset into the EEPROM where the id PROM is located on the 4c */
11
-
#define IDPROM_OFFSET 0x7d8
10
+
#include <linux/types.h>
12
11
13
-
/* On sun4m; physical. */
14
-
/* MicroSPARC(-II) does not decode 31rd bit, but it works. */
15
-
#define IDPROM_OFFSET_M 0xfd8
16
-
17
-
struct idprom
18
-
{
19
-
unsigned char id_format; /* Format identifier (always 0x01) */
20
-
unsigned char id_machtype; /* Machine type */
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];
12
+
struct idprom {
13
+
u8 id_format; /* Format identifier (always 0x01) */
14
+
u8 id_machtype; /* Machine type */
15
+
u8 id_ethaddr[6]; /* Hardware ethernet address */
16
+
s32 id_date; /* Date of manufacture */
17
+
u32 id_sernum:24; /* Unique serial number */
18
+
u8 id_cksum; /* Checksum - xor of the data bytes */
19
+
u8 reserved[16];
26
20
};
27
21
28
22
extern struct idprom *idprom;
29
23
extern void idprom_init(void);
30
-
31
-
#define IDPROM_SIZE (sizeof(struct idprom))
32
24
33
25
#endif /* !(_SPARC_IDPROM_H) */
+1
-11
include/asm-sparc64/idprom.h
+1
-11
include/asm-sparc64/idprom.h
···
9
9
10
10
#include <linux/types.h>
11
11
12
-
/* Offset into the EEPROM where the id PROM is located on the 4c */
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
-
{
12
+
struct idprom {
21
13
u8 id_format; /* Format identifier (always 0x01) */
22
14
u8 id_machtype; /* Machine type */
23
15
u8 id_ethaddr[6]; /* Hardware ethernet address */
···
21
29
22
30
extern struct idprom *idprom;
23
31
extern void idprom_init(void);
24
-
25
-
#define IDPROM_SIZE (sizeof(struct idprom))
26
32
27
33
#endif /* !(_SPARC_IDPROM_H) */