[parisc-linux-cvs] headerfile changes for __initdata hardware database

Helge Deller deller@gmx.de
Tue, 28 Aug 2001 09:52:59 +0200


changes to get the hardware database usable as __initdata

Index: hardware.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/asm-parisc/hardware.h,v
retrieving revision 1.19
diff -u -r1.19 hardware.h
--- hardware.h	2001/08/14 16:55:00	1.19
+++ hardware.h	2001/08/28 07:47:03
@@ -18,7 +18,7 @@
 	unsigned short	hversion;
 	unsigned long	sversion:28;
 	unsigned short	opt;
-	char		*name; 
+	const char	name[80];	/* The hardware description */
 };
 
 
@@ -30,8 +30,8 @@
 	struct parisc_device *parent;
 	struct parisc_device *sibling;
 	struct parisc_device *child;
-	struct hp_hardware *reference;  /* The hardware description */
 	struct parisc_driver *driver;	/* Driver for this device */
+	char name[80];			/* The hardware description */
 
 	unsigned int	num_addrs;	/* some devices have additional address ranges, */
 	unsigned long	addr[MAX_ADD_ADDRS]; /* which will be stored here */
@@ -92,18 +92,15 @@
 
 
 /* hardware.c: */
-extern char *parisc_getHWtype(unsigned short hw_type);
-extern char *parisc_getHWdescription(unsigned short hw_type,
-	    unsigned long hversion, unsigned long sversion);
+extern const char *parisc_type_description(unsigned short hw_type);
+extern const char *parisc_hardware_description(struct parisc_device_id *id);
 extern enum cpu_type parisc_get_cpu_type(unsigned long hversion);
-extern struct hp_hardware *parisc_get_reference(struct parisc_device_id *);
 
 
 /* drivers.c: */
 extern struct parisc_device *alloc_pa_dev(unsigned long hpa);
 extern int register_pa_dev(struct parisc_device *dev);
 extern int add_pa_dev_addr(struct parisc_device *dev, unsigned long addr);
-extern struct parisc_device *get_pa_dev(unsigned int index);
 extern int get_num_pa_dev(void);
 extern void print_pa_devices(int start_index, int num_indexes);
 extern int register_parisc_driver(struct parisc_driver *driver);
Index: processor.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/asm-parisc/processor.h,v
retrieving revision 1.43
diff -u -r1.43 processor.h
--- processor.h	2001/08/14 16:55:00	1.43
+++ processor.h	2001/08/28 07:47:04
@@ -53,15 +53,11 @@
 		struct pdc_model model;
 		unsigned long versions;
 		unsigned long cpuid;
-#if 0
-		struct pdc_model_caps caps;
-#endif
 		char   sys_model_name[81]; /* PDC-ROM returnes this model name */
 	} pdc;
 
-	char	 	*model_name;
-	char		*cpu_name;
-	char		*family_name;
+	char		*cpu_name;	/* e.g. "PA7300LC (PCX-L2)" */
+	char		*family_name;	/* e.g. "1.1e" */
 };