From 26e3c85eed48e7369df18aa4d9161b0e464f9860 Mon Sep 17 00:00:00 2001
From: downsj <downsj@openbsd.org>
Date: Sun, 16 Feb 1997 14:37:06 +0000
Subject: [PATCH] More rd changes that were missed...  Still not working.

---
 sys/arch/hp300/conf/DISKLESS    | 4 +++-
 sys/arch/hp300/conf/GENERIC     | 4 +++-
 sys/arch/hp300/conf/MINIROOT    | 4 ++--
 sys/arch/hp300/hp300/autoconf.c | 3 ++-
 sys/arch/hp300/hp300/conf.c     | 8 ++++++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 1921913c03e..054e33d7c16 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.12 1997/02/16 10:42:14 downsj Exp $
+#	$OpenBSD: DISKLESS,v 1.13 1997/02/16 14:37:06 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -88,3 +88,5 @@ dca*		at dio? scode ?
 dcm*		at dio? scode ?	flags 0xe # DCM 4- or 8-port serial interfaces
 
 le*		at dio? scode ?		# LANCE ethernet interfaces
+
+pseudo-device	rd 2
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 5b1c8d7b699..8a51d303420 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.16 1997/02/16 10:42:16 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.17 1997/02/16 14:37:08 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -108,3 +108,5 @@ oscsi*		at dio? scode ?		# Old HP SCSI
 sd*		at oscsi? target ? lun ?	# SCSI disks
 st*		at oscsi? target ? lun ?	# SCSI tapes
 ac*		at oscsi? target ? lun ?	# SCSI changers
+
+pseudo-device	rd 2
diff --git a/sys/arch/hp300/conf/MINIROOT b/sys/arch/hp300/conf/MINIROOT
index 6492918cf38..514aaac21c2 100644
--- a/sys/arch/hp300/conf/MINIROOT
+++ b/sys/arch/hp300/conf/MINIROOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: MINIROOT,v 1.1 1997/02/16 10:42:17 downsj Exp $
+#	$OpenBSD: MINIROOT,v 1.2 1997/02/16 14:37:08 downsj Exp $
 #
 # Ram disk kernel for the miniroot.
 #
@@ -45,7 +45,7 @@ option	 	SE_KEYBOARD	# include Swedish HIL keymap
 # (Warning: this compiles in a large string table)
 option	 	DIOVERBOSE	# recognize "unknown" DIO devices
 
-config		bsd swap generic
+config		bsd root rd0 swap sd0 and sd1 and hd0 and hd1
 
 mainbus0	at root		# root "bus"
 
diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index 888dd232af9..718a4962d36 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.11 1997/02/03 08:11:59 downsj Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.12 1997/02/16 14:37:10 downsj Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.31 1997/01/31 01:49:41 thorpej Exp $	*/
 
 /*
@@ -423,6 +423,7 @@ struct nam2blk {
 	{ "ct",		0 },
 	{ "hd",		2 },
 	{ "sd",		4 },
+	{ "rd",		8 },
 };
 
 static int
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 9ae5b68d210..736be6f3d6b 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.13 1997/02/16 10:42:22 downsj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.14 1997/02/16 14:37:11 downsj Exp $	*/
 /*	$NetBSD: conf.c,v 1.34 1996/12/17 08:41:20 thorpej Exp $	*/
 
 /*-
@@ -258,6 +258,10 @@ static int chrtoblktbl[] = {
 	/* 28 */	NODEV,
 	/* 29 */	NODEV,
 	/* 30 */	NODEV,
+	/* 31 */	NODEV,
+	/* 32 */	NODEV,
+	/* 33 */	NODEV,
+	/* 34 */	8,
 };
 
 /*
@@ -277,7 +281,7 @@ chrtoblk(dev)
 }
 
 /*
- * Convert a character device number to a block device number.
+ * Convert a block device number to a character device number.
  */
 dev_t
 blktochr(dev)
-- 
2.20.1