diff options
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 7 | ||||
| -rw-r--r-- | sys/sys/conf.h | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 4492e159bd5..6a0175611ca 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.76 2001/07/03 22:49:05 niklas Exp $ */ +/* $OpenBSD: conf.c,v 1.77 2001/07/05 02:35:34 mickey Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -195,6 +195,7 @@ cdev_decl(svr4_net); #include "apm.h" #include "pctr.h" #include "bios.h" +#include "iop.h" #ifdef XFS #include <xfs/nxfs.h> cdev_decl(xfs_dev); @@ -219,8 +220,6 @@ cdev_decl(urio); cdev_decl(ucom); #include "cz.h" cdev_decl(cztty); -#include "iop.h" -cdev_decl(iop); /* XXX -- this needs to be supported by config(8)! */ #if (NCOM > 0) && (NPCCOM > 0) @@ -348,7 +347,7 @@ struct cdevsw cdevsw[] = #endif cdev_pf_init(NPF,pf), /* 73: packet filter */ cdev_altq_init(NALTQ,altq), /* 74: ALTQ control interface */ - cdev_oci_init(NIOP,iop), /* 75: I2O controller */ + cdev_iop_init(NIOP,iop), /* 75: I2O IOP control interface */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 3089c7849b8..e77fae4a93a 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.43 2001/06/26 03:04:30 provos Exp $ */ +/* $OpenBSD: conf.h,v 1.44 2001/07/05 02:35:34 mickey Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -410,12 +410,20 @@ void randomattach __P((void)); #define cdev_usbdev_init(c,n) cdev_random_init(c,n) #define cdev_ugen_init(c,n) cdev_random_init(c,n) +/* open, close, init */ #define cdev_pci_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ (dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \ (dev_type_mmap((*))) enodev } +/* open, close, init */ +#define cdev_iop_init(c,n) { \ + dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ + (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ + (dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \ + (dev_type_mmap((*))) enodev } + /* symbolic sleep message strings */ extern char devopn[], devio[], devwait[], devin[], devout[]; extern char devioc[], devcls[]; @@ -502,6 +510,8 @@ cdev_decl(ccd); bdev_decl(raid); cdev_decl(raid); +cdev_decl(iop); + cdev_decl(ch); cdev_decl(ss); |