| .. | .. |
|---|
| 10 | 10 | #define SVERSION_ANY_ID PA_SVERSION_ANY_ID |
|---|
| 11 | 11 | |
|---|
| 12 | 12 | struct hp_hardware { |
|---|
| 13 | | - unsigned short hw_type:5; /* HPHW_xxx */ |
|---|
| 14 | | - unsigned short hversion; |
|---|
| 15 | | - unsigned long sversion:28; |
|---|
| 16 | | - unsigned short opt; |
|---|
| 17 | | - const char name[80]; /* The hardware description */ |
|---|
| 18 | | -}; |
|---|
| 13 | + unsigned int hw_type:8; /* HPHW_xxx */ |
|---|
| 14 | + unsigned int hversion:12; |
|---|
| 15 | + unsigned int sversion:12; |
|---|
| 16 | + unsigned char opt; |
|---|
| 17 | + unsigned char name[59]; /* The hardware description */ |
|---|
| 18 | +} __packed; |
|---|
| 19 | 19 | |
|---|
| 20 | 20 | struct parisc_device; |
|---|
| 21 | 21 | |
|---|
| .. | .. |
|---|
| 120 | 120 | extern void init_parisc_bus(void); |
|---|
| 121 | 121 | extern struct device *hwpath_to_device(struct hardware_path *modpath); |
|---|
| 122 | 122 | extern void device_to_hwpath(struct device *dev, struct hardware_path *path); |
|---|
| 123 | | - |
|---|
| 123 | +extern int machine_has_merced_bus(void); |
|---|
| 124 | 124 | |
|---|
| 125 | 125 | /* inventory.c: */ |
|---|
| 126 | 126 | extern void do_memory_inventory(void); |
|---|