diff options
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/conf.c | 5 | ||||
| -rw-r--r-- | sys/sys/conf.h | 9 |
7 files changed, 13 insertions, 26 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index d2fa2a4e57d..431b3c3c931 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.7 2005/06/02 20:09:38 tholo Exp $ */ +/* $OpenBSD: conf.c,v 1.8 2005/07/31 06:39:06 dlg Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -50,7 +50,6 @@ bdev_decl(fd); #include "wt.h" bdev_decl(wt); #include "sd.h" -#include "ses.h" #include "st.h" #include "cd.h" #include "uk.h" @@ -220,7 +219,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 21 */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */ - cdev_ses_init(NSES,ses), /* 24: SES/SAF-TE SCSI */ + cdev_notdef(), /* 24 */ #if 0 cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */ #else diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index 34ce8783929..caba8cf1f9e 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.33 2005/06/21 17:43:34 martin Exp $ */ +/* $OpenBSD: conf.c,v 1.34 2005/07/31 06:39:06 dlg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -48,7 +48,6 @@ #include "cd.h" #include "ch.h" #include "ss.h" -#include "ses.h" #include "uk.h" #include "wd.h" bdev_decl(wd); @@ -176,7 +175,7 @@ struct cdevsw cdevsw[] = cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */ cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */ cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */ - cdev_ses_init(NSES,ses), /* 37: SCSI SES/SAF-TE */ + cdev_notdef(), /* 37 */ cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */ cdev_disk_init(NWD,wd), /* 39: ST506 disk */ cdev_usb_init(NUSB,usb), /* 40: USB controller */ diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c index f58c4df177f..dd0420c01d6 100644 --- a/sys/arch/hppa64/hppa64/conf.c +++ b/sys/arch/hppa64/hppa64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.1 2005/04/01 10:40:47 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.2 2005/07/31 06:39:07 dlg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -48,7 +48,6 @@ #include "cd.h" #include "ch.h" #include "ss.h" -#include "ses.h" #include "uk.h" #include "wd.h" bdev_decl(wd); @@ -168,7 +167,7 @@ struct cdevsw cdevsw[] = cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */ cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */ cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */ - cdev_ses_init(NSES,ses), /* 37: SCSI SES/SAF-TE */ + cdev_notdef(), /* 37 */ cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */ cdev_disk_init(NWD,wd), /* 39: ST506 disk */ cdev_lkm_dummy(), diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 8a5ead04876..d0399bd48b0 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.110 2005/06/02 20:09:39 tholo Exp $ */ +/* $OpenBSD: conf.c,v 1.111 2005/07/31 06:39:07 dlg Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -51,7 +51,6 @@ bdev_decl(fd); #include "wt.h" bdev_decl(wt); #include "sd.h" -#include "ses.h" #include "st.h" #include "cd.h" #include "uk.h" @@ -245,7 +244,7 @@ struct cdevsw cdevsw[] = cdev_apm_init(NAPM,apm), /* 21: Advancded Power Management */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */ - cdev_ses_init(NSES,ses), /* 24: SES/SAF-TE SCSI */ + cdev_notdef(), /* 24 */ #if 0 cdev_ocis_init(NPCMCIA,pcmcia), /* 25: PCMCIA Bus */ #else diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index baac63ff72f..eb7dce4505c 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.42 2005/07/17 12:21:28 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.43 2005/07/31 06:39:07 dlg Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -59,7 +59,6 @@ #include "ccd.h" #include "raid.h" #include "ch.h" -#include "ses.h" #include "ss.h" #include "uk.h" #include "sd.h" @@ -264,7 +263,7 @@ struct cdevsw cdevsw[] = cdev_ss_init(NSS,ss), /* 121: SCSI scanner */ cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */ cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */ - cdev_ses_init(NSES,ses), /* 124: SCSI SES or SAF-TE device */ + cdev_notdef(), /* 124 */ cdev_ptm_init(NPTY,ptm), /* 125: pseudo-tty ptm device */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 90d7d1323ea..145ae064cd2 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.39 2005/03/09 18:41:49 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.40 2005/07/31 06:39:07 dlg Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -96,7 +96,6 @@ cdev_decl(pci); #endif #include "rd.h" -#include "ses.h" #include "usb.h" #include "uhid.h" @@ -156,7 +155,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 1: tapemaster tape */ cdev_ctty_init(1,ctty), /* 2: controlling terminal */ cdev_mm_init(1,mm), /* 3: /dev/{null,mem,kmem,...} */ - cdev_ses_init(NSES,ses), /* 4: SCSI SES/SAF-TE */ + cdev_notdef(), /* 4 */ cdev_notdef(), /* 5: tapemaster tape */ cdev_notdef(), /* 6: systech/versatec */ cdev_swap_init(1,sw), /* 7: /dev/drum (swap pseudo-device) */ diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 4707a5c4b26..156d8bd5dc5 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.75 2004/06/03 18:08:00 grange Exp $ */ +/* $OpenBSD: conf.h,v 1.76 2005/07/31 06:39:07 dlg Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -323,13 +323,6 @@ extern struct cdevsw cdevsw[]; (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ (dev_type_mmap((*))) enodev } -/* open, close, ioctl */ -#define cdev_ses_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_poll((*))) enodev, \ - (dev_type_mmap((*))) enodev } - /* open, close, read, ioctl */ #define cdev_ss_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ |