cleanup and guess some models based on descriptions

1 files changed, 20 insertions, 20 deletions

diff --git a/sys/arch/hppa/dev/cpudevs b/sys/arch/hppa/dev/cpudevs
index fa075661780..146276d53ea 100644
--- a/sys/arch/hppa/dev/cpudevs
+++ b/sys/arch/hppa/dev/cpudevs
@@ -1,4 +1,4 @@
-$OpenBSD: cpudevs,v 1.31 2004/04/07 18:24:19 mickey Exp $
+$OpenBSD: cpudevs,v 1.32 2004/04/21 07:30:38 mickey Exp $
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -121,8 +121,8 @@ board	HPE23		0x480	806/E23 (Orville)
 board	HPE25		0x481	E25 (Wilbur)
 board	HPE35		0x482	816/E35 (Wright Brothers 80)
 board	HPE45		0x483	826/E45 (Wright Brothers 96)
-board	HPD210		0x484	811/D210/D310 (UltraLight Proc L-100)
-board	HPD200		0x485	801/D200/D300 (UltraLight Proc L-75)
+board	HPD210		0x484	811/D210/D310 (UltraLight L 100)
+board	HPD200		0x485	801/D200/D300 (UltraLight L 75)
 
 board	HP778_B132L	0x501	778/B132L (Merlin L2 132)
 board	HP778_B160L	0x502	778/B160L (Merlin L2 160)
@@ -141,8 +141,8 @@ board	HP712_160L21	0x50c	712/160 (L2 Upgrade)
 board	HP744_132L	0x50f	744/132L (Anole-132L)
 board	HP744_165L	0x510	744/165L (Anole-165L)
 #board	HPKIJI132	0x511	(Kiji L2 132)
-board	HP803		0x512	803/D220/D320 (UltraLight L2 132)
-board	HP813		0x513	813/D220/D320 (UltraLight L2 160)
+board	HP803		0x512	803/D220 (UltraLight L2 132)
+board	HP813		0x513	813/D320 (UltraLight L2 160)
 board	HP778_B132	0x514	778/B132 (Merlin Jr. L2 132)
 board	HP800_A132	0x515	800/A132 (Staccato L2 132)
 board	HP800_A180C	0x516	800/A180C (Staccato L2 180)
@@ -208,8 +208,8 @@ board	HP821		0x5b9	821/D350/R350 (UltraLight 1w U+/240)
 board	HP800D		0x5ba	800/D390/R390 (UltraLight 2w U+/240)
 board	HP785C		0x5bb	785/C3000 (AllegroHigh W)
 board	HP785B		0x5bc	785/B1000 (AllegroLow W)
-board	HP785J		0x5bd	785/J5000 (Forte W 2w)
-board	HP800N		0x5be	800/N4000-36 (Prelude W)
+board	HP785_J5000	0x5bd	785/J5000 (Forte W 2w)
+board	HP800_N400036	0x5be	800/N4000-36/rp7405 (Prelude W)
 board	HP785_J7000	0x5bf	785/J7000 (Forte W 4w)
 #board			0x5c0	(M2250)
 #board			0x5c1	(M2500)
@@ -222,33 +222,33 @@ board	HP785C_1	0x5c6	780/C360 (Raven W 360)
 #board			0x5c8	(Lego 360)
 board	HP800_L100044	0x5c9	800/L1000-44/rp5400 (Rhapsody DC-440)
 board	HP800_L100036	0x5ca	800/L1000-36/rp5400 (Rhapsody DC-360)
-board	HP800_A50044	0x5cb	800/A500-44/rp2450 (Crescendo 440)
-board	HP800_N400044	0x5cc	800/N4000-44 (Prelude W 440)
+board	HP897_A50044	0x5cb	897/A500-44/rp2450 (Crescendo 440)
+board	HP800_N400044	0x5cc	800/N4000-44/rp7405 (Prelude W 440)
 #board			0x5cd	SPP2600
 #board			0x5ce	M2600
 board	HP785_C3600	0x5cf	785/C3600 (Allegro)
 board	HP786_B2000	0x5d0	786/B2000 (Kazoo W+)
 board	HP785_J5600	0x5d1	785/J5600 (Forte W+ 2w)
 #board			0x5d2	(Forte W+ 4w)
-board	HP800_N400055	0x5d3	800/N4000-55 (Prelude W+ 550)
+board	HP800_N40005X	0x5d3	800/N4000-5X/rp7410 (Prelude W+ 550)
 board	HP785_J6000	0x5d4	785/J6000 (Duet W+)
-board	HP800_A5005X	0x5d5	800/A500-5X/rp2450 (Crescendo 550)
-board	HP800_A40044	0x5d6	800/A400-44/rp2400 (Crescendo DC-440)
+board	HP897_A5005X	0x5d5	897/A500-5X/rp2450 (Crescendo 550)
+board	HP897_A40044	0x5d6	897/A400-44/rp2400 (Crescendo 440)
 #board			0x5d7	(Keystone W+)
-#board			0x5d8	(Rhapsody wave 2 W+ DC-)
-#board			0x5d9	(Rhapsody wave 2 W+)
+board	HP800_L150044	0x5d8	800/L1500-44/rp5430 (Rhapsody wave 2 W+)
+board	HP800_L150036	0x5d9	800/L1500-36/rp5430 (Rhapsody wave 2 W+)
 #board			0x5da	(Marcato W+ DC-)
-board	HP800_L30005X	0x5db	800/L3000-5x (Marcato W+)
+board	HP800_L30005X	0x5db	800/L3000-5x/rp5470 (Marcato W+)
 board	HP785_J6700	0x5dd	785/J6700 (Duet W2)
 board	HP785_B2600	0x5de	785/B2600 (Piccolo W+)
 #board	HP		0x5df	(Cantata W2)
 #board	HP		0x5e0	(Cantata DC- W2)
-board	HP800_A4006X	0x5e1	800/A400-6X/rp2430 (Crescendo DC-W2)
-board	HP800_A5006X	0x5e2	800/A500-6X/rp2470 (Crescendo 650 W2)
-board	HP800_A5007X	0x5e3	800/A500-7X/rp2470 (Crescendo 750 W2)
-board	HP800_rp7410	0x5e4	800/rp7410 (Keystone/Matterhorn W2 750)
+board	HP897_A4006X	0x5e1	897/A400-6X/rp2430 (Crescendo DC-W2)
+board	HP897_A5006X	0x5e2	897/A500-6X/rp2470 (Crescendo 650 W2)
+board	HP897_A5007X	0x5e3	897/A500-7X/rp2470 (Crescendo 750 W2)
+board	HP800_N40007X	0x5e4	800/N4000-7X/rp7410 (Keystone/Matterhorn W2 750)
 #board	HP		0x5e5	(PowerBar W+)
-#board	HP		0x5e6	(Keystone/Matterhorn W2 650)
+board	HP800_N40006X	0x5e6	800/N4000-6X/rp7410 (Keystone/Matterhorn W2 650)
 #board			0x5e7	(Caribe W2 800)
 #board			0x5e8	(Pikes Peak W2)