wd(4) device node support was missing, add it.

diff --git a/etc/etc.powerpc64/MAKEDEV.md b/etc/etc.powerpc64/MAKEDEV.md
index 408fde7..85e3962 100644 (file)
--- a/etc/etc.powerpc64/MAKEDEV.md
+++ b/etc/etc.powerpc64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,powerpc64)dnl
 vers(__file__,
-       {-$OpenBSD: MAKEDEV.md,v 1.8 2021/02/12 10:26:34 jsg Exp $-},
+       {-$OpenBSD: MAKEDEV.md,v 1.9 2021/10/05 04:55:51 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -29,6 +29,7 @@ _DEV(vnd, 24, 1)
 _DEV(rd, 25, 2)
 _DEV(sd, 26, 3)
 _DEV(cd, 27, 4)
+_DEV(wd, 17, 5)
 _TITLE(tap)
 _DEV(ch, 68)
 _DEV(st, 69)

diff --git a/sys/arch/powerpc64/conf/files.powerpc64 b/sys/arch/powerpc64/conf/files.powerpc64
index d4bc2b3..bc87f7a 100644 (file)
--- a/sys/arch/powerpc64/conf/files.powerpc64
+++ b/sys/arch/powerpc64/conf/files.powerpc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.powerpc64,v 1.26 2021/01/23 12:10:08 kettenis Exp $
+# $OpenBSD: files.powerpc64,v 1.27 2021/10/05 04:55:53 deraadt Exp $
 
 maxpartitions  16
 maxusers       2 8 128
@@ -6,6 +6,7 @@ maxusers        2 8 128
 major  {rd = 2}
 major  {sd = 3}
 major  {cd = 4}
+major  {wd = 5}
 
 file   arch/powerpc64/powerpc64/locore.S
 file   arch/powerpc64/powerpc64/autoconf.c

diff --git a/sys/arch/powerpc64/powerpc64/conf.c b/sys/arch/powerpc64/powerpc64/conf.c
index 4f6b805..7d2a989 100644 (file)
--- a/sys/arch/powerpc64/powerpc64/conf.c
+++ b/sys/arch/powerpc64/powerpc64/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.11 2021/01/23 05:08:36 thfr Exp $  */
+/*     $OpenBSD: conf.c,v 1.12 2021/10/05 04:55:53 deraadt Exp $       */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -39,6 +39,8 @@
 
 #include <machine/conf.h>
 
+#include "wd.h"
+bdev_decl(wd);
 #include "cd.h"
 #include "rd.h"
 #include "sd.h"
@@ -51,11 +53,13 @@ struct bdevsw bdevsw[] =
        bdev_disk_init(NRD,rd),         /* 2: ram disk driver */
        bdev_disk_init(NSD,sd),         /* 3: SCSI disk */
        bdev_disk_init(NCD,cd),         /* 4: SCSI CD-ROM */
+       bdev_disk_init(NWD,wd),         /* 5: ST506/ESDI/IDE disk */
        bdev_notdef(),
 };
 int    nblkdev = nitems(bdevsw);
 
 #include "audio.h"
+cdev_decl(wd);
 #include "bio.h"
 #include "bpfilter.h"
 #include "ch.h"
@@ -121,7 +125,7 @@ struct cdevsw cdevsw[] =
        cdev_kcov_init(NKCOV,kcov),     /* 14: kcov */
        cdev_kstat_init(NKSTAT,kstat),  /* 15: kernel statistics */
        cdev_kexec_init(NKEXEC,kexec),  /* 16: kexec */
-       cdev_notdef(),                  /* 17 */
+       cdev_disk_init(NWD,wd),         /* 17: ST506/ESDI/IDE disk */
        cdev_notdef(),                  /* 18 */
        cdev_notdef(),                  /* 19 */
        cdev_notdef(),                  /* 20 */
@@ -249,7 +253,7 @@ int chrtoblktbl[] = {
        /* 14 */        NODEV,
        /* 15 */        NODEV,
        /* 16 */        NODEV,
-       /* 17 */        NODEV,
+       /* 17 */        5,              /* wd */
        /* 18 */        NODEV,
        /* 19 */        NODEV,
        /* 20 */        NODEV,