sync

4 files changed, 509 insertions, 120 deletions

diff --git a/sys/arch/hppa/dev/boards.h b/sys/arch/hppa/dev/boards.h
deleted file mode 100644
index c1607683117..00000000000
--- a/sys/arch/hppa/dev/boards.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
- * generated from:
- *	OpenBSD: cpudevs,v 1.8 1999/02/17 03:21:43 mickey Exp 
- */
-
-#define	HPPA_BOARD_HP710	0x300
-#define	HPPA_BOARD_HP712_60	0x600
-#define	HPPA_BOARD_HP712_80	0x601
-#define	HPPA_BOARD_HP712_80i	0x602
-#define	HPPA_BOARD_HP712_100	0x605
-#define	HPPA_BOARD_HP715_33	0x311
-#define	HPPA_BOARD_HP715_50	0x310
-#define	HPPA_BOARD_HP715T_50	0x312
-#define	HPPA_BOARD_HP715S_50	0x314
-#define	HPPA_BOARD_HP715_64	0x60A
-#define	HPPA_BOARD_HP715_75	0x316
-#define	HPPA_BOARD_HP715_99	0x60B
-#define	HPPA_BOARD_HP725_50	0x318
-#define	HPPA_BOARD_HP725_75	0x319
-#define	HPPA_BOARD_HP725_100	0x60D
-#define	HPPA_BOARD_HP735_99	0x203
-#define	HPPA_BOARD_HP735_125	0x206
-#define	HPPA_BOARD_HP750	0x201
diff --git a/sys/arch/hppa/dev/boards_data.h b/sys/arch/hppa/dev/boards_data.h
deleted file mode 100644
index dbd8f648117..00000000000
--- a/sys/arch/hppa/dev/boards_data.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
- * generated from:
- *	OpenBSD: cpudevs,v 1.8 1999/02/17 03:21:43 mickey Exp 
- */
-
-static const struct hppa_board_info hppa_knownboards[] = {
-	{ HPPA_BOARD_HP710,	"HP710",	"710 (Bushmaster)" },
-	{ HPPA_BOARD_HP712_60,	"HP712_60",	"712/60 (Gecko)" },
-	{ HPPA_BOARD_HP712_80,	"HP712_80",	"712/80 (Gecko)" },
-	{ HPPA_BOARD_HP712_80i,	"HP712_80i",	"712/80i (Gecko)" },
-	{ HPPA_BOARD_HP712_100,	"HP712_100",	"712/100 (Gecko)" },
-	{ HPPA_BOARD_HP715_33,	"HP715_33",	"715/33 (Scorpio)" },
-	{ HPPA_BOARD_HP715_50,	"HP715_50",	"715/50 (Scorpio)" },
-	{ HPPA_BOARD_HP715T_50,	"HP715T_50",	"715T/50 (Scorpio (4XXt up))" },
-	{ HPPA_BOARD_HP715S_50,	"HP715S_50",	"715S/50 (Scorpio (4XXs up))" },
-	{ HPPA_BOARD_HP715_64,	"HP715_64",	"715/64 (Scorpio)" },
-	{ HPPA_BOARD_HP715_75,	"HP715_75",	"715/75 (Scorpio)" },
-	{ HPPA_BOARD_HP715_99,	"HP715_99",	"715/99 (Scorpio)" },
-	{ HPPA_BOARD_HP725_50,	"HP725_50",	"725/50 (Scorpio)" },
-	{ HPPA_BOARD_HP725_75,	"HP725_75",	"725/75 (Scorpio)" },
-	{ HPPA_BOARD_HP725_100,	"HP725_100",	"725/100 (Scorpio)" },
-	{ HPPA_BOARD_HP735_99,	"HP735_99",	"735/99 (Hardball)" },
-	{ HPPA_BOARD_HP735_125,	"HP735_125",	"735/125 (Hardball)" },
-	{ HPPA_BOARD_HP750,	"HP750",	"750 (Coral)" },
-	{ -1 }
-};
diff --git a/sys/arch/hppa/dev/cpudevs.h b/sys/arch/hppa/dev/cpudevs.h
index b871f7a3257..aa7b5beb42c 100644
--- a/sys/arch/hppa/dev/cpudevs.h
+++ b/sys/arch/hppa/dev/cpudevs.h
@@ -1,58 +1,281 @@
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *	OpenBSD: cpudevs,v 1.8 1999/02/17 03:21:43 mickey Exp 
+ *	OpenBSD: cpudevs,v 1.9 1999/04/20 20:19:36 mickey Exp 
  */
 
-#define	HPPA_TYPE_CPU	0
-#define	HPPA_TYPE_MEMORY	1
-#define	HPPA_TYPE_BDMA	2
-#define	HPPA_TYPE_BDIRECT	3
-#define	HPPA_TYPE_ADMA	4
-#define	HPPA_TYPE_ADIRECT	5
-#define	HPPA_TYPE_OTHER	6
-#define	HPPA_TYPE_BCP	7
-#define	HPPA_TYPE_CIO	8
-#define	HPPA_TYPE_CONSOLE	9
-#define	HPPA_TYPE_FIO	10
-#define	HPPA_TYPE_BHA	11
-#define	HPPA_TYPE_MULTI	12
-#define	HPPA_TYPE_FAULTY	31
-#define	HPPA_CPU_HPPA10	0
-#define	HPPA_CPU_HPPA11	4
-#define	HPPA_CPU_HPPA20	8
-#define	HPPA_MEMORY_ARCH	0x8
-#define	HPPA_MEMORY_PDEP	0x9
-#define	HPPA_OTHER_SPECFB	0x48
-#define	HPPA_OTHER_SPECCTL	0x49
-#define	HPPA_BHA_DIO	0x03
-#define	HPPA_BHA_SGC	0x05
-#define	HPPA_BHA_GSC	0x07
-#define	HPPA_BHA_ASP	0x70
-#define	HPPA_BHA_EISA	0x76
-#define	HPPA_BHA_VME	0x78
-#define	HPPA_BHA_LASI	0x81
-#define	HPPA_BHA_WAX	0x8e
-#define	HPPA_BHA_WEISA	0x90
-#define	HPPA_ADMA_FWSCSI	0x89
-#define	HPPA_ADMA_MYRI	0x95
-#define	HPPA_FIO_SCSI	0x71
-#define	HPPA_FIO_LAN	0x72
-#define	HPPA_FIO_HIL	0x73
-#define	HPPA_FIO_CENT	0x74
-#define	HPPA_FIO_RS232	0x75
-#define	HPPA_FIO_SGC	0x77
-#define	HPPA_FIO_A1	0x7a
-#define	HPPA_FIO_A2NB	0x7b
-#define	HPPA_FIO_FWSCSI	0x7c
-#define	HPPA_FIO_FDDI	0x7d
-#define	HPPA_FIO_A1NB	0x7e
-#define	HPPA_FIO_A2	0x7f
-#define	HPPA_FIO_HPIB	0x80
-#define	HPPA_FIO_GSCSI	0x82
-#define	HPPA_FIO_GPCFD	0x83
-#define	HPPA_FIO_GPCIO	0x84
-#define	HPPA_FIO_GSGC	0x85
-#define	HPPA_FIO_GSCSCSI	0x89
-#define	HPPA_FIO_GLAN	0x8a
-#define	HPPA_FIO_GRS232	0x8c
+#define	HPPA_TYPE_NPROC	0x00
+#define	HPPA_TYPE_MEMORY	0x01
+#define	HPPA_TYPE_BDMA	0x02
+#define	HPPA_TYPE_BDIRECT	0x03
+#define	HPPA_TYPE_ADMA	0x04
+#define	HPPA_TYPE_ADIRECT	0x05
+#define	HPPA_TYPE_OTHER	0x06
+#define	HPPA_TYPE_BCPORT	0x07
+#define	HPPA_TYPE_CIO	0x08
+#define	HPPA_TYPE_CONSOLE	0x09
+#define	HPPA_TYPE_FIO	0x0a
+#define	HPPA_TYPE_BHA	0x0b
+#define	HPPA_TYPE_IOA	0x0c
+#define	HPPA_TYPE_BRIDGE	0x0d
+#define	HPPA_TYPE_FABRIC	0x0e
+#define	HPPA_TYPE_FAULTY	0x1f
+#define	HPPA_TYPE_BOARD	0x80
+#define	HPPA_TYPE_CPU	0x81
+#define	HPPA_TYPE_FPU	0x82
+#define	HPPA_TYPE_BUS	0x83
+#define	HPPA_BOARD_HP840	0x004
+#define	HPPA_BOARD_HP825	0x008
+#define	HPPA_BOARD_HP835	0x00a
+#define	HPPA_BOARD_HP845	0x00b
+#define	HPPA_BOARD_HP850	0x00C
+#define	HPPA_BOARD_HP949	0x00f
+#define	HPPA_BOARD_HP950S	0x080
+#define	HPPA_BOARD_HP855	0x081
+#define	HPPA_BOARD_HP860	0x082
+#define	HPPA_BOARD_HP870	0x083
+#define	HPPA_BOARD_HP810	0x100
+#define	HPPA_BOARD_HP822	0x101
+#define	HPPA_BOARD_HP832	0x102
+#define	HPPA_BOARD_HP808	0x103
+#define	HPPA_BOARD_HP842	0x104
+#define	HPPA_BOARD_HP852	0x105
+#define	HPPA_BOARD_HP890	0x181
+#define	HPPA_BOARD_HP891	0x182
+#define	HPPA_BOARD_HP892	0x183
+#define	HPPA_BOARD_HP893_T540	0x184
+#define	HPPA_BOARD_HPHXPROC	0x1ff
+#define	HPPA_BOARD_HP720	0x200
+#define	HPPA_BOARD_HP750_66	0x201
+#define	HPPA_BOARD_HP730_66	0x202
+#define	HPPA_BOARD_HP735_99	0x203
+#define	HPPA_BOARD_HP755_99	0x204
+#define	HPPA_BOARD_HP755_125	0x205
+#define	HPPA_BOARD_HP735_130	0x206
+#define	HPPA_BOARD_HP817	0x280
+#define	HPPA_BOARD_HP837	0x281
+#define	HPPA_BOARD_HP807	0x282
+#define	HPPA_BOARD_HP867	0x283
+#define	HPPA_BOARD_HP887	0x284
+#define	HPPA_BOARD_HP710	0x300
+#define	HPPA_BOARD_HP705	0x302
+#define	HPPA_BOARD_HP715_50	0x310
+#define	HPPA_BOARD_HP715_33	0x311
+#define	HPPA_BOARD_HP715S_50	0x312
+#define	HPPA_BOARD_HP715S_33	0x313
+#define	HPPA_BOARD_HP715T_50	0x314
+#define	HPPA_BOARD_HP715T_33	0x315
+#define	HPPA_BOARD_HP715_75	0x316
+#define	HPPA_BOARD_HP715_100	0x317
+#define	HPPA_BOARD_HP725_50	0x318
+#define	HPPA_BOARD_HP725_75	0x319
+#define	HPPA_BOARD_HP745I_50	0x401
+#define	HPPA_BOARD_HP742I_50	0x402
+#define	HPPA_BOARD_HP747I_100	0x403
+#define	HPPA_BOARD_HPE23	0x480
+#define	HPPA_BOARD_HPE25	0x481
+#define	HPPA_BOARD_HPE35	0x482
+#define	HPPA_BOARD_HPE45	0x483
+#define	HPPA_BOARD_HPD210	0x484
+#define	HPPA_BOARD_HPD200	0x485
+#define	HPPA_BOARD_HP778_B132L	0x501
+#define	HPPA_BOARD_HP778_B160L	0x502
+#define	HPPA_BOARD_HP778_B132LP	0x503
+#define	HPPA_BOARD_HP778_B180L	0x504
+#define	HPPA_BOARD_HP779_C132L	0x505
+#define	HPPA_BOARD_HP779_C160L	0x506
+#define	HPPA_BOARD_HP779_C180L	0x507
+#define	HPPA_BOARD_HP779_C160L1	0x508
+#define	HPPA_BOARD_HP712_132L2	0x509
+#define	HPPA_BOARD_HP712_160L2	0x50a
+#define	HPPA_BOARD_HP712_132L21	0x50b
+#define	HPPA_BOARD_HP712_160L21	0x50c
+#define	HPPA_BOARD_HP744_132L	0x50f
+#define	HPPA_BOARD_HP744_165L	0x510
+#define	HPPA_BOARD_HP803	0x512
+#define	HPPA_BOARD_HP813	0x513
+#define	HPPA_BOARD_HP809	0x580
+#define	HPPA_BOARD_HP839	0x581
+#define	HPPA_BOARD_HP829	0x582
+#define	HPPA_BOARD_HP849	0x583
+#define	HPPA_BOARD_HPT120	0x584
+#define	HPPA_BOARD_HP770_J200	0x585
+#define	HPPA_BOARD_HP770_J210	0x586
+#define	HPPA_BOARD_HP821	0x589
+#define	HPPA_BOARD_HP831	0x58a
+#define	HPPA_BOARD_HP819	0x58b
+#define	HPPA_BOARD_HP859	0x58c
+#define	HPPA_BOARD_HP869	0x58d
+#define	HPPA_BOARD_HP804	0x58f
+#define	HPPA_BOARD_HP889	0x590
+#define	HPPA_BOARD_HP780_C230	0x598
+#define	HPPA_BOARD_HP780_C240	0x599
+#define	HPPA_BOARD_HP780_C160	0x59b
+#define	HPPA_BOARD_HP780_C180	0x59c
+#define	HPPA_BOARD_HP780_C200	0x59d
+#define	HPPA_BOARD_HP780_C180P	0x59f
+#define	HPPA_BOARD_HP841	0x5a0
+#define	HPPA_BOARD_HP851	0x5a1
+#define	HPPA_BOARD_HP861	0x5a2
+#define	HPPA_BOARD_HP871	0x5a3
+#define	HPPA_BOARD_HP802	0x5a4
+#define	HPPA_BOARD_HP879	0x5a5
+#define	HPPA_BOARD_HP898	0x5ae
+#define	HPPA_BOARD_HP899	0x5b1
+#define	HPPA_BOARD_HP712_60	0x600
+#define	HPPA_BOARD_HP712_80	0x601
+#define	HPPA_BOARD_HP712_100	0x602
+#define	HPPA_BOARD_HP743I_64	0x603
+#define	HPPA_BOARD_HP743I_100	0x604
+#define	HPPA_BOARD_HP712_120	0x605
+#define	HPPA_BOARD_HP715_80	0x609
+#define	HPPA_BOARD_HP715_64	0x60A
+#define	HPPA_BOARD_HP715_99	0x60B
+#define	HPPA_BOARD_HP725_99P	0x60C
+#define	HPPA_BOARD_HP725_100	0x60D
+#define	HPPA_BOARD_HP725_120	0x60E
+#define	HPPA_BOARD_HP715_100L	0x610
+#define	HPPA_BOARD_HP715_120L	0x611
+#define	HPPA_BOARD_HP725_80L	0x612
+#define	HPPA_BOARD_HP725_100L	0x613
+#define	HPPA_BOARD_HP725_120L	0x614
+#define	HPPA_BOARD_HP743_50	0x617
+#define	HPPA_BOARD_HP743_100	0x618
+#define	HPPA_BOARD_HP715_801	0x619
+#define	HPPA_BOARD_HP743T	0x61c
+#define	HPPA_BUS_MID_BUS	0
+#define	HPPA_BUS_SMB	1
+#define	HPPA_BUS_HPPB	2
+#define	HPPA_BUS_SUMMIT	3
+#define	HPPA_BUS_VVSC	4
+#define	HPPA_BUS_VHPPB	5
+#define	HPPA_BUS_K9KSC	6
+#define	HPPA_BUS_SPSSC	7
+#define	HPPA_BUS_STSSC	8
+#define	HPPA_BUS_GSCHPPB	9
+#define	HPPA_BUS_GSCHSC	10
+#define	HPPA_BUS_RUNWAY	11
+#define	HPPA_BUS_GSC	12
+#define	HPPA_BUS_GSCP	13
+#define	HPPA_BUS_NECSB	14
+#define	HPPA_BUS_ROPES	15
+#define	HPPA_BUS_MERCED	16
+#define	HPPA_CPU_SOFTEMU	0x01
+#define	HPPA_CPU_TORNADO	0x0b
+#define	HPPA_CPU_PCXL	0x0d
+#define	HPPA_CPU_PCXU	0x0e
+#define	HPPA_CPU_PCXL2	0x0f
+#define	HPPA_CPU_PCXUP	0x10
+#define	HPPA_CPU_PCXW	0x11
+#define	HPPA_FPU_SOFTEMU	0x01
+#define	HPPA_FPU_INDIGO	0x02
+#define	HPPA_FPU_TYCO	0x03
+#define	HPPA_FPU_ROC	0x04
+#define	HPPA_FPU_FPCW	0x06
+#define	HPPA_FPU_FPCB	0x07
+#define	HPPA_FPU_PCXS	0x08
+#define	HPPA_FPU_PCXT	0x09
+#define	HPPA_FPU_HARP	0x0a
+#define	HPPA_FPU_TORNADO	0x0b
+#define	HPPA_FPU_PA50	0x0c
+#define	HPPA_FPU_PCXL	0x0d
+#define	HPPA_FPU_PCXU	0x0e
+#define	HPPA_FPU_VR	0x0f
+#define	HPPA_FPU_PCXW	0x10
+#define	HPPA_NPROC_HPPA	4
+#define	HPPA_MEMORY_ARCH	0x008
+#define	HPPA_MEMORY_PDEP	0x009
+#define	HPPA_BDMA_PARALLEL	0x018
+#define	HPPA_BDMA_PRDB	0x019
+#define	HPPA_BDMA_MIDBUSPSI	0x020
+#define	HPPA_BDMA_HPPBTPSI	0x02f
+#define	HPPA_BDMA_EXERCISER	0x094
+#define	HPPA_ADMA_SCSI	0x039
+#define	HPPA_ADMA_FWSCSI0	0x03b
+#define	HPPA_ADMA_HPIB	0x040
+#define	HPPA_ADMA_HPPBFL	0x041
+#define	HPPA_ADMA_HPPBIB	0x042
+#define	HPPA_ADMA_HPPBCL	0x043
+#define	HPPA_ADMA_HPPBGPS	0x044
+#define	HPPA_ADMA_HPPBGPL	0x045
+#define	HPPA_ADMA_2X25	0x046
+#define	HPPA_ADMA_4X25	0x047
+#define	HPPA_ADMA_NIMBFB	0x04a
+#define	HPPA_ADMA_NIMBCL	0x04b
+#define	HPPA_ADMA_MRTI	0x04c
+#define	HPPA_ADMA_ACCMUX	0x04d
+#define	HPPA_ADMA_L8023	0x050
+#define	HPPA_ADMA_FWSCSI	0x089
+#define	HPPA_ADMA_NETFC	0x091
+#define	HPPA_ADMA_YATM	0x092
+#define	HPPA_ADMA_MYRI	0x095
+#define	HPPA_ADMA_VATM	0x09a
+#define	HPPA_ADMA_HSCPCI	0x09d
+#define	HPPA_ADMA_MASSFC	0x0a7
+#define	HPPA_ADMA_IPFC	0x380
+#define	HPPA_ADMA_IPATM	0x381
+#define	HPPA_ADMA_IP100T	0x382
+#define	HPPA_ADMA_IPNIOVG	0x383
+#define	HPPA_ADIRECT_APMUX	0x00d
+#define	HPPA_ADIRECT_RS232	0x00e
+#define	HPPA_ADIRECT_PEACOCK	0x00f
+#define	HPPA_ADIRECT_HIL	0x014
+#define	HPPA_ADIRECT_LEONARDO	0x015
+#define	HPPA_ADIRECT_HRM	0x016
+#define	HPPA_ADIRECT_HRC	0x017
+#define	HPPA_ADIRECT_LPT	0x03a
+#define	HPPA_ADIRECT_ATTDK	0x04e
+#define	HPPA_OTHER_MIDBVM	0x030
+#define	HPPA_OTHER_MIDBVS	0x034
+#define	HPPA_OTHER_MIDBEDU	0x038
+#define	HPPA_OTHER_SPECFB	0x048
+#define	HPPA_OTHER_SPECCTL	0x049
+#define	HPPA_CIO_CIO	0x010
+#define	HPPA_CONSOLE_CHEETAH	0x01c
+#define	HPPA_CONSOLE_NULL	0x01f
+#define	HPPA_FIO_A_X25	0x02e
+#define	HPPA_FIO_8X25	0x04f
+#define	HPPA_FIO_SCSI	0x071
+#define	HPPA_FIO_LAN	0x072
+#define	HPPA_FIO_HIL	0x073
+#define	HPPA_FIO_CENT	0x074
+#define	HPPA_FIO_RS232	0x075
+#define	HPPA_FIO_SGC	0x077
+#define	HPPA_FIO_A1	0x07a
+#define	HPPA_FIO_A2NB	0x07b
+#define	HPPA_FIO_FWSCSI	0x07c
+#define	HPPA_FIO_FDDI	0x07d
+#define	HPPA_FIO_A1NB	0x07e
+#define	HPPA_FIO_A2	0x07f
+#define	HPPA_FIO_HPIB	0x080
+#define	HPPA_FIO_TR9000	0x086
+#define	HPPA_FIO_VMENET	0x088
+#define	HPPA_FIO_BOOTROM	0x08f
+#define	HPPA_FIO_DINOPCK	0x096
+#define	HPPA_FIO_EISALAN	0x097
+#define	HPPA_FIO_WHPIB	0x099
+#define	HPPA_FIO_PCILAN	0x0a2
+#define	HPPA_FIO_PCIDSK	0x0a3
+#define	HPPA_FIO_SONICET	0x0a6
+#define	HPPA_FIO_PCIMISC	0x0a9
+#define	HPPA_FIO_GSCSI	0x082
+#define	HPPA_FIO_GPCFD	0x083
+#define	HPPA_FIO_GPCIO	0x084
+#define	HPPA_FIO_GSGC	0x085
+#define	HPPA_FIO_GISDN	0x087
+#define	HPPA_FIO_GSCSCSI	0x089
+#define	HPPA_FIO_GLAN	0x08a
+#define	HPPA_FIO_GRS232	0x08c
+#define	HPPA_FIO_GRJ16	0x08d
+#define	HPPA_BHA_DIO	0x003
+#define	HPPA_BHA_SGC	0x005
+#define	HPPA_BHA_GSC	0x007
+#define	HPPA_BHA_ASP	0x070
+#define	HPPA_BHA_EISA	0x076
+#define	HPPA_BHA_VME	0x078
+#define	HPPA_BHA_LASI	0x081
+#define	HPPA_BHA_PCMCIA	0x08b
+#define	HPPA_BHA_WAX	0x08e
+#define	HPPA_BHA_WEISA	0x090
+#define	HPPA_BHA_TIMI	0x093
+#define	HPPA_BHA_EPICPCI	0x0a5
diff --git a/sys/arch/hppa/dev/cpudevs_data.h b/sys/arch/hppa/dev/cpudevs_data.h
index 7ed3b416476..5b2f7d1c66d 100644
--- a/sys/arch/hppa/dev/cpudevs_data.h
+++ b/sys/arch/hppa/dev/cpudevs_data.h
@@ -1,28 +1,221 @@
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *	OpenBSD: cpudevs,v 1.8 1999/02/17 03:21:43 mickey Exp 
+ *	OpenBSD: cpudevs,v 1.9 1999/04/20 20:19:36 mickey Exp 
  */
 
 static const struct hppa_mod_info hppa_knownmods[] = {
-	{HPPA_TYPE_CPU,	HPPA_CPU_HPPA10,	"PA-RISC 1.0" },
-	{HPPA_TYPE_CPU,	HPPA_CPU_HPPA11,	"PA-RISC 1.1" },
-	{HPPA_TYPE_CPU,	HPPA_CPU_HPPA20,	"PA-RISC 2.0" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP840,	"840/930 (Indigo)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP825,	"825/925 (FireFox)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP835,	"83[45]/935 (TopGun)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP845,	"845/945 (Technical ShoGun)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP850,	"850/950 (Cheetah)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP949,	"949 (Commercial ShoGun)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP950S,	"950S (Cheetah)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP855,	"855/955 (Jaguar)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP860,	"860/960 (Cougar)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP870,	"865/870/980 (Panther)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP810,	"810 (Burgundy)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP822,	"822/922 (SilverFox Low)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP832,	"832/932 (SilverFox High)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP808,	"808/815/920 (Lego, SilverLite)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP842,	"842/948 (SilverBullet Low)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP852,	"852/958 (SilverBullet High)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP890,	"890/990/992 (Chimera)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP891,	"891/T500 (TNT 100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP892,	"892/T520 (TNT 120)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP893_T540,	"893/T540 (Jade 180)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPHXPROC,	"Hitachi X Processor" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP720,	"720 (Cobra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP750_66,	"750/66 (Coral)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP730_66,	"730/66 (King Cobra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP735_99,	"735/99 (Hardball)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP755_99,	"755/99 (Coral II)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP755_125,	"755/125 (Coral II)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP735_130,	"735/130 (Snake Cheetah)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP817,	"817/827/957/957LX (Nova Low)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP837,	"837/847/857/967/967LX (Nova High)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP807,	"807/917/917LX/927/927LX/937/937LX/947/947LX (Nova8)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP867,	"867/877/977 (Nova64)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP887,	"887/897/987 (TNova)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP710,	"710/50 (Bushmaster)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP705,	"705/35 (Flounder)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_50,	"715/50 (Scorpio)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_33,	"715/33 (Scorpio Jr.)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715S_50,	"715S/50 (Spider-50)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715S_33,	"715S/33 (Spider-33)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715T_50,	"715T/50 (Trailways-50)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715T_33,	"715T/33 (Trailways-33)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_75,	"715/75 (Scorpio Sr.)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_100,	"715/100 (Scorpio 100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_50,	"725/50 (Spectra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_75,	"725/75 (Spectra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP745I_50,	"745i/747i/50 (Pace)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP742I_50,	"742i/50 (Sidewinder)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP747I_100,	"745i/747i/100 (Fast Pace)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPE23,	"E23 (Orville)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPE25,	"E25 (Wilbur)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPE35,	"816/E35 (Wright Brothers 80)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPE45,	"826/E45 (Wright Brothers 96)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPD210,	"811/D210/D310 (UltraLight Proc L-100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPD200,	"801/D200/D300 (UltraLight Proc L-75)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP778_B132L,	"778/B132L (Merlin L2 132)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP778_B160L,	"778/B160L (Merlin L2 160)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP778_B132LP,	"778/B132L (Merlin L2+ 132)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP778_B180L,	"778/B180L (Merlin L2+ 180)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP779_C132L,	"779/C132L (Raven L2 132)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP779_C160L,	"779/C160L (Raven L2 160)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP779_C180L,	"779/C160L (Raven L2 180)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP779_C160L1,	"779/C160L (Raven L2 160)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_132L2,	"712/132 (L2 Upgrade)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_160L2,	"712/160 (L2 Upgrade)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_132L21,	"712/132 (L2 Upgrade)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_160L21,	"712/160 (L2 Upgrade)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP744_132L,	"744/132L (Anole-132L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP744_165L,	"744/165L (Anole-165L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP803,	"803/D220/D320 (UltraLight L2 132)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP813,	"813/D220/D320 (UltraLight L2 160)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP809,	"809/K100 (KittyHawk DC2-100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP839,	"839/K210 (KittyHawk DC3-120)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP829,	"829/K400 (KittyHawk DC3-100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP849,	"849/K410 (KittyHawk DC3-120)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HPT120,	"T120 (LighteningHawk)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP770_J200,	"770/J200 (SkyHawk 100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP770_J210,	"770/J210 (SkyHawk 120)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP821,	"821/D250/D350 (UltraLight Proc 1-way T'100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP831,	"831/D250/D350 (UltraLight Proc 2-way T'100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP819,	"819/K200 (KittyHawk DC2 100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP859,	"859/K220 (ThunderHawk DC3- 120 1M)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP869,	"869/K420 (ThunderHawk DC3 120 1M)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP804,	"804/K450 (Mohawk 160 U 1M DC3)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP889,	"889/K460 (Mohawk 180 U 1M DC3)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C230,	"780/C230 (Raven U 230)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C240,	"780/C240 (Raven U 240)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C160,	"780/C160 (Raven U 160)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C180,	"780/C180 (Raven U 180)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C200,	"780/C200 (Raven U 200)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP780_C180P,	"780/C180+ (Raven U 180+)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP841,	"841/D260/D360 (UltraLight 1-way T120 1MB)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP851,	"851/D260/D360 (UltraLight 2-way T120 1MB)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP861,	"861/D270/D370 (UltraLight 1-way U160 512K)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP871,	"871/D270/D370 (UltraLight 2-way U160 512K)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP802,	"802/K250 (MoHawk U160 1M DC3-)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP879,	"879/K260 (MoHawk U180 1M DC3-)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP898,	"898/K370 (BraveHawk 200 DC3-)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP899,	"899/K570 (BraveHawk 200 DC3)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_60,	"712/60 (Gecko)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_80,	"712/80 (King Gecko)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_100,	"712/100 (King Gecko)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP743I_64,	"743i/64 (Anole-64)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP743I_100,	"743i/100 (Anole-100)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_120,	"712/120 (King Gecko)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_80,	"715/80 (Scorpio-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_64,	"715/64 (Mirage Jr.)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_99,	"715/100 (Mirage Sr.)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_99P,	"715/100+ (Mirage Sr.)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_100,	"725/100 (Electra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_120,	"725/120 (Electra)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_100L,	"715/100L (Scorpio-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_120L,	"715/120L (Scorpio-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_80L,	"725/80L (Spectra-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_100L,	"725/100L (Spectra-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP725_120L,	"725/120L (Spectra-L)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP743_50,	"743/50 (Jason)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP743_100,	"743/100 (Jason)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP715_801,	"715/80 (Mirage)" },
+	{HPPA_TYPE_BOARD,	HPPA_BOARD_HP743T,	"743T (Anole T)" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_MID_BUS,	"MID_BUS" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_SMB,	"SMB" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_HPPB,	"HP-PB" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_SUMMIT,	"Summit" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_VVSC,	"Viper-VSC" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_VHPPB,	"Viper-HPPB" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_K9KSC,	"K9-KSC" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_SPSSC,	"Spider-SSC" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_STSSC,	"Stiletto-SSC" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_GSCHPPB,	"GSC-HPPB" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_GSCHSC,	"GSC+(HSC)" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_RUNWAY,	"Runway" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_GSC,	"GSC" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_GSCP,	"GSC++" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_NECSB,	"NEC System Bus" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_ROPES,	"Ropes" },
+	{HPPA_TYPE_BUS,	HPPA_BUS_MERCED,	"Merced" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_SOFTEMU,	"Software Emulation" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_TORNADO,	"Tornado" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_PCXL,	"PCX-L" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_PCXU,	"PCX-U" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_PCXL2,	"PCX-L2" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_PCXUP,	"PCX-U+" },
+	{HPPA_TYPE_CPU,	HPPA_CPU_PCXW,	"0cx-W" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_SOFTEMU,	"Software Emulation" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_INDIGO,	"Indigo" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_TYCO,	"Sterling I MIU (TYCO)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_ROC,	"Sterling I MIU (ROC w/Weitek)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_FPCW,	"FPC (NMOS-III w/Weitek)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_FPCB,	"FPC (NMOS-III w/Bit)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PCXS,	"PCX-S (Timex-II)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PCXT,	"PCX-T (Rolex - CMOS-26B)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_HARP,	"HARP-I" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_TORNADO,	"Tornado" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PA50,	"PA-50 (Hitachi)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PCXL,	"PCX-L (CMOS-26B)" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PCXU,	"PCX-U/PCX-U+" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_VR,	"VR" },
+	{HPPA_TYPE_FPU,	HPPA_FPU_PCXW,	"PCX-W" },
+	{HPPA_TYPE_NPROC,	HPPA_NPROC_HPPA,	"PA-RISC" },
 	{HPPA_TYPE_MEMORY,	HPPA_MEMORY_ARCH,	"architected memory module" },
 	{HPPA_TYPE_MEMORY,	HPPA_MEMORY_PDEP,	"pdep memory module" },
+	{HPPA_TYPE_BDMA,	HPPA_BDMA_PARALLEL,	"Parallel I/O" },
+	{HPPA_TYPE_BDMA,	HPPA_BDMA_PRDB,	"Parallel RDB" },
+	{HPPA_TYPE_BDMA,	HPPA_BDMA_MIDBUSPSI,	"MID_BUS PSI" },
+	{HPPA_TYPE_BDMA,	HPPA_BDMA_HPPBTPSI,	"HP-PB Transit PSI" },
+	{HPPA_TYPE_BDMA,	HPPA_BDMA_EXERCISER,	"GSC+ Exerciser" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_SCSI,	"SCSI" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_FWSCSI0,	"Wizard FW SCSI" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPIB,	"HP-IB" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPPBFL,	"HP-PB HP-FL" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPPBIB,	"HP-PB LoQuix HP-IB" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPPBCL,	"HP-PB Crypt LoQuix" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPPBGPS,	"HP-PB Shazam GPIO" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HPPBGPL,	"HP-PB LoQuix GPIO" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_2X25,	"2-Port X.25 NIO_ACC" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_4X25,	"4-Port X.25 NIO_ACC" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_NIMBFB,	"Nimbus Frame Buffer" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_NIMBCL,	"Nimbus Control" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_MRTI,	"Martian RTI" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_ACCMUX,	"ACC Mux" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_L8023,	"Lanbrusca 802.3" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_FWSCSI,	"FW SCSI" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_NETFC,	"Net FC" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_YATM,	"GSC+ YLIASTER ATM" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_MYRI,	"Hamlyn GSC+ Network Card" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_VATM,	"GSC+ Venus ATM" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_HSCPCI,	"HP HSC-PCI Cards" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_MASSFC,	"Add-on mass FC" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_IPFC,	"Interphase NIO-FC" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_IPATM,	"Interphase NIO-ATM" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_IP100T,	"Interphase NIO-100BaseT" },
+	{HPPA_TYPE_ADMA,	HPPA_ADMA_IPNIOVG,	"Interphase NIO-100VG" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_APMUX,	"AP/MUX" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_RS232,	"RS-232" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_PEACOCK,	"Peacock Graphics" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_HIL,	"HIL" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_LEONARDO,	"Leonardo" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_HRM,	"HP-PB HRM" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_HRC,	"HP-PB HRC" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_LPT,	"Centronics interface" },
+	{HPPA_TYPE_ADIRECT,	HPPA_ADIRECT_ATTDK,	"AT&T DataKit" },
+	{HPPA_TYPE_OTHER,	HPPA_OTHER_MIDBVM,	"MID_BUS Verification Master" },
+	{HPPA_TYPE_OTHER,	HPPA_OTHER_MIDBVS,	"MID_BUS Verification Slave" },
+	{HPPA_TYPE_OTHER,	HPPA_OTHER_MIDBEDU,	"MID_BUS Verification EDU" },
 	{HPPA_TYPE_OTHER,	HPPA_OTHER_SPECFB,	"Spectograph frame buffer" },
 	{HPPA_TYPE_OTHER,	HPPA_OTHER_SPECCTL,	"Spectograph control" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_DIO,	"DIO Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_SGC,	"SGC Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_GSC,	"GSC Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_ASP,	"Core Bus Adapter (ASP)" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_EISA,	"EISA Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_VME,	"VME Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_LASI,	"LASI Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_WAX,	"WAX ??? Bus Adapter" },
-	{HPPA_TYPE_BHA,	HPPA_BHA_WEISA,	"WAX EISA Bus Adapter ???" },
-	{HPPA_TYPE_ADMA,	HPPA_ADMA_FWSCSI,	"Core FW SCSI" },
-	{HPPA_TYPE_ADMA,	HPPA_ADMA_MYRI,	"Hamlyn GSC+ Network Card" },
+	{HPPA_TYPE_CIO,	HPPA_CIO_CIO,	"CIO" },
+	{HPPA_TYPE_CONSOLE,	HPPA_CONSOLE_CHEETAH,	"Cheetah Console" },
+	{HPPA_TYPE_CONSOLE,	HPPA_CONSOLE_NULL,	"Jason/Anole Null Console" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_A_X25,	"Armyknife Optional X.25" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_8X25,	"8-Port X.25 EISA-ACC" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_SCSI,	"Core SCSI" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_LAN,	"Core LAN" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_HIL,	"Core HIL" },
@@ -36,12 +229,36 @@ static const struct hppa_mod_info hppa_knownmods[] = {
 	{HPPA_TYPE_FIO,	HPPA_FIO_A1NB,	"Core audio (no beeper)" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_A2,	"Advanced audio" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_HPIB,	"Core HPIB" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_TR9000,	"GSC IBM TokenRing" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_VMENET,	"VME Networking" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_BOOTROM,	"BOOT ROM" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_DINOPCK,	"Dino PC Keyboard" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_EISALAN,	"Cascade EISA 100VG lan" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_WHPIB,	"Wax/Clark/Dino HPIB" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_PCILAN,	"PCI Plug-In LAN" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_PCIDSK,	"PCI Plug-In Disk Controller" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_SONICET,	"Sonic Ethernet" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_PCIMISC,	"Miscelaneous PCI Plug-in" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GSCSI,	"Core SCSI" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GPCFD,	"floppy controller" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GPCIO,	"PS/2 port" },
-	{HPPA_TYPE_FIO,	HPPA_FIO_GSGC,	"SGC Graphics" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_GSGC,	"GIO Graphics" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_GISDN,	"Core ISDN" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GSCSCSI,	"GSC SCSI" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GLAN,	"Core LAN" },
 	{HPPA_TYPE_FIO,	HPPA_FIO_GRS232,	"Core RS-232C" },
+	{HPPA_TYPE_FIO,	HPPA_FIO_GRJ16,	"Optional RJ-16" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_DIO,	"DIO Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_SGC,	"SGC Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_GSC,	"GSC Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_ASP,	"Core Bus Adapter (ASP)" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_EISA,	"EISA Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_VME,	"VME Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_LASI,	"LASI Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_PCMCIA,	"PCMCIA Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_WAX,	"WAX Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_WEISA,	"WAX EISA Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_TIMI,	"TIMI Bus Adapter" },
+	{HPPA_TYPE_BHA,	HPPA_BHA_EPICPCI,	"Epic PCI Bridge" },
 	{ -1 }
 };