patch-2.1.9 linux/include/asm-sparc/idprom.h

Next file: linux/include/asm-sparc/io.h
Previous file: linux/include/asm-sparc/head.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.8/linux/include/asm-sparc/idprom.h linux/include/asm-sparc/idprom.h
@@ -1,4 +1,4 @@
-/* $Id: idprom.h,v 1.5 1995/11/25 02:31:49 davem Exp $
+/* $Id: idprom.h,v 1.6 1996/08/04 10:35:07 ecd Exp $
  * idprom.h: Macros and defines for idprom routines
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -7,8 +7,6 @@
 #ifndef _SPARC_IDPROM_H
 #define _SPARC_IDPROM_H
 
-extern struct linux_romvec *romvec;
-
 /* Offset into the EEPROM where the id PROM is located on the 4c */
 #define IDPROM_OFFSET  0x7d8
 
@@ -16,19 +14,20 @@
 /* MicroSPARC(-II) does not decode 31rd bit, but it works. */
 #define IDPROM_OFFSET_M  0xfd8
 
-struct idp_struct
+struct idprom
 {
-  unsigned char id_f_id;      /* format identifier */
-  unsigned char id_machtype;  /* Machine type */
-  unsigned char id_eaddr[6];  /* hardware ethernet address */
-  long id_domf;               /* Date when this machine was manufactured */
-  unsigned int id_sernum:24;  /* Unique serial number */
-  unsigned char id_cksum;     /* XXX */
-  unsigned char dummy[16];    /* XXX */
+	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];
 };
 
-extern struct idp_struct *idprom;
+extern struct idprom *idprom;
+extern void idprom_init(void);
 
-#define IDPROM_SIZE  (sizeof(struct idp_struct))
+#define IDPROM_SIZE  (sizeof(struct idprom))
 
 #endif /* !(_SPARC_IDPROM_H) */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov