regen

2 files changed, 34 insertions, 28 deletions

diff --git a/sys/arch/hppa/dev/cpudevs.h b/sys/arch/hppa/dev/cpudevs.h
index 707717c4fc1..2bc092acc1d 100644
--- a/sys/arch/hppa/dev/cpudevs.h
+++ b/sys/arch/hppa/dev/cpudevs.h
@@ -1,7 +1,7 @@
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *	OpenBSD: cpudevs,v 1.30 2003/10/15 03:10:09 mickey Exp 
+ *	OpenBSD: cpudevs,v 1.32 2004/04/21 07:30:38 mickey Exp 
  */
 
 #define	HPPA_TYPE_NPROC	0x00
@@ -145,30 +145,33 @@
 #define	HPPA_BOARD_HP800D	0x5ba
 #define	HPPA_BOARD_HP785C	0x5bb
 #define	HPPA_BOARD_HP785B	0x5bc
-#define	HPPA_BOARD_HP785J	0x5bd
-#define	HPPA_BOARD_HP800N	0x5be
+#define	HPPA_BOARD_HP785_J5000	0x5bd
+#define	HPPA_BOARD_HP800_N400036	0x5be
 #define	HPPA_BOARD_HP785_J7000	0x5bf
 #define	HPPA_BOARD_HP800_L200044	0x5c4
 #define	HPPA_BOARD_HP800_L200036	0x5c5
 #define	HPPA_BOARD_HP785C_1	0x5c6
 #define	HPPA_BOARD_HP800_L100044	0x5c9
 #define	HPPA_BOARD_HP800_L100036	0x5ca
-#define	HPPA_BOARD_HP800_A50044	0x5cb
+#define	HPPA_BOARD_HP897_A50044	0x5cb
 #define	HPPA_BOARD_HP800_N400044	0x5cc
 #define	HPPA_BOARD_HP785_C3600	0x5cf
 #define	HPPA_BOARD_HP786_B2000	0x5d0
 #define	HPPA_BOARD_HP785_J5600	0x5d1
-#define	HPPA_BOARD_HP800_N400055	0x5d3
+#define	HPPA_BOARD_HP800_N40005X	0x5d3
 #define	HPPA_BOARD_HP785_J6000	0x5d4
-#define	HPPA_BOARD_HP800_A5005X	0x5d5
-#define	HPPA_BOARD_HP800_A40044	0x5d6
+#define	HPPA_BOARD_HP897_A5005X	0x5d5
+#define	HPPA_BOARD_HP897_A40044	0x5d6
+#define	HPPA_BOARD_HP800_L150044	0x5d8
+#define	HPPA_BOARD_HP800_L150036	0x5d9
 #define	HPPA_BOARD_HP800_L30005X	0x5db
 #define	HPPA_BOARD_HP785_J6700	0x5dd
 #define	HPPA_BOARD_HP785_B2600	0x5de
-#define	HPPA_BOARD_HP800_A4006X	0x5e1
-#define	HPPA_BOARD_HP800_A5006X	0x5e2
-#define	HPPA_BOARD_HP800_A5007X	0x5e3
-#define	HPPA_BOARD_HP800_RP7410	0x5e4
+#define	HPPA_BOARD_HP897_A4006X	0x5e1
+#define	HPPA_BOARD_HP897_A5006X	0x5e2
+#define	HPPA_BOARD_HP897_A5007X	0x5e3
+#define	HPPA_BOARD_HP800_N40007X	0x5e4
+#define	HPPA_BOARD_HP800_N40006X	0x5e6
 #define	HPPA_BOARD_HITACHIW	0x5ff
 #define	HPPA_BOARD_HP712_60	0x600
 #define	HPPA_BOARD_HP712_80	0x601
diff --git a/sys/arch/hppa/dev/cpudevs_data.h b/sys/arch/hppa/dev/cpudevs_data.h
index 19b7342ae23..eee331152f9 100644
--- a/sys/arch/hppa/dev/cpudevs_data.h
+++ b/sys/arch/hppa/dev/cpudevs_data.h
@@ -1,7 +1,7 @@
 /*
  * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
  * generated from:
- *	OpenBSD: cpudevs,v 1.30 2003/10/15 03:10:09 mickey Exp 
+ *	OpenBSD: cpudevs,v 1.32 2004/04/21 07:30:38 mickey Exp 
  */
 
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP840,	"840/930 (Indigo)" },
@@ -61,8 +61,8 @@
 {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_HPD210,	"811/D210/D310 (UltraLight L 100)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HPD200,	"801/D200/D300 (UltraLight 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)" },
@@ -77,8 +77,8 @@
 {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_HP803,	"803/D220 (UltraLight L2 132)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP813,	"813/D320 (UltraLight L2 160)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP778_B132,	"778/B132 (Merlin Jr. L2 132)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A132,	"800/A132 (Staccato L2 132)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A180C,	"800/A180C (Staccato L2 180)" },
@@ -125,30 +125,33 @@
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800D,	"800/D390/R390 (UltraLight 2w U+/240)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785C,	"785/C3000 (AllegroHigh W)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785B,	"785/B1000 (AllegroLow W)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP785J,	"785/J5000 (Forte W 2w)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800N,	"800/N4000-36 (Prelude W)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_J5000,	"785/J5000 (Forte W 2w)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N400036,	"800/N4000-36/rp7405 (Prelude W)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_J7000,	"785/J7000 (Forte W 4w)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L200044,	"800/L2000-44/rp5450 (Rhapsody 440)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L200036,	"800/L2000-36/rp5450 (Rhapsody 360)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785C_1,	"780/C360 (Raven W 360)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L100044,	"800/L1000-44/rp5400 (Rhapsody DC-440)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L100036,	"800/L1000-36/rp5400 (Rhapsody DC-360)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A50044,	"800/A500-44/rp2450 (Crescendo 440)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N400044,	"800/N4000-44 (Prelude W 440)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A50044,	"897/A500-44/rp2450 (Crescendo 440)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N400044,	"800/N4000-44/rp7405 (Prelude W 440)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_C3600,	"785/C3600 (Allegro)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP786_B2000,	"786/B2000 (Kazoo W+)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_J5600,	"785/J5600 (Forte W+ 2w)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N400055,	"800/N4000-55 (Prelude W+ 550)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N40005X,	"800/N4000-5X/rp7410 (Prelude W+ 550)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_J6000,	"785/J6000 (Duet W+)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A5005X,	"800/A500-5X/rp2450 (Crescendo 550)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A40044,	"800/A400-44/rp2400 (Crescendo DC-440)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L30005X,	"800/L3000-5x (Marcato W+)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A5005X,	"897/A500-5X/rp2450 (Crescendo 550)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A40044,	"897/A400-44/rp2400 (Crescendo 440)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L150044,	"800/L1500-44/rp5430 (Rhapsody wave 2 W+)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L150036,	"800/L1500-36/rp5430 (Rhapsody wave 2 W+)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_L30005X,	"800/L3000-5x/rp5470 (Marcato W+)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_J6700,	"785/J6700 (Duet W2)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP785_B2600,	"785/B2600 (Piccolo W+)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A4006X,	"800/A400-6X/rp2430 (Crescendo DC-W2)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A5006X,	"800/A500-6X/rp2470 (Crescendo 650 W2)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_A5007X,	"800/A500-7X/rp2470 (Crescendo 750 W2)" },
-{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_RP7410,	"800/rp7410 (Keystone/Matterhorn W2 750)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A4006X,	"897/A400-6X/rp2430 (Crescendo DC-W2)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A5006X,	"897/A500-6X/rp2470 (Crescendo 650 W2)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP897_A5007X,	"897/A500-7X/rp2470 (Crescendo 750 W2)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N40007X,	"800/N4000-7X/rp7410 (Keystone/Matterhorn W2 750)" },
+{HPPA_TYPE_BOARD,	HPPA_BOARD_HP800_N40006X,	"800/N4000-6X/rp7410 (Keystone/Matterhorn W2 650)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HITACHIW,	"(Hitachi W)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_60,	"712/60 (Gecko)" },
 {HPPA_TYPE_BOARD,	HPPA_BOARD_HP712_80,	"712/80 (King Gecko)" },