diff options
| -rw-r--r-- | sys/arch/landisk/include/conf.h | 51 | ||||
| -rw-r--r-- | sys/arch/landisk/landisk/conf.c | 12 | ||||
| -rw-r--r-- | sys/arch/sh/dev/scif.c | 5 |
3 files changed, 6 insertions, 62 deletions
diff --git a/sys/arch/landisk/include/conf.h b/sys/arch/landisk/include/conf.h index 0d7bc55fd2c..e34fc42ca93 100644 --- a/sys/arch/landisk/include/conf.h +++ b/sys/arch/landisk/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.2 2006/11/03 20:08:35 mickey Exp $ */ +/* $OpenBSD: conf.h,v 1.3 2006/11/03 20:21:23 mickey Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -56,28 +56,9 @@ cdev_decl(fd); /* Character device declarations */ -/* open, close, read, write, ioctl, tty, mmap -- XXX should be a tty */ -#define cdev_physcon_init(c,n) cdev__ttym_init(c,n,0) - -/* open, close, ioctl */ -#define cdev_beep_init(c,n) cdev__oci_init(c,n) - -/* open, close, read, ioctl */ -#define cdev_kbd_init(c,n) cdev__ocri_init(c,n) - -/* open, close, ioctl, mmap */ -#define cdev_vidcvid_init(c,n) { \ - dev_init(c,n,open), dev_init(c,n,close), dev_noimpl(read,enodev), \ - dev_noimpl(write,enodev), dev_init(c,n,ioctl), \ - dev_noimpl(stop,enodev), 0, seltrue, dev_init(c,n,mmap), 0 } - /* open, close, read, write, ioctl */ -#define cdev_iic_init(c,n) cdev__ocrwi_init(c,n) #define cdev_rtc_init(c,n) cdev__ocrwi_init(c,n) -/* open, close, read, ioctl */ -#define cdev_prof_init(c,n) cdev__ocri_init(c,n) - /* open, close, ioctl, kqueue */ #define cdev_apm_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ @@ -85,40 +66,10 @@ cdev_decl(fd); (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } -cdev_decl(physcon); -cdev_decl(vidcconsole); -cdev_decl(biconsdev); cdev_decl(com); -cdev_decl(lpt); -cdev_decl(qms); -cdev_decl(opms); -cdev_decl(beep); -cdev_decl(kbd); -cdev_decl(iic); cdev_decl(rtc); -cdev_decl(fcom); -cdev_decl(pc); -cdev_decl(ofcons_); -cdev_decl(ofd); -cdev_decl(ofrtc); -cdev_decl(sacom); -cdev_decl(scr); -cdev_decl(prof); -#define ofromread ofromrw -#define ofromwrite ofromrw -cdev_decl(ofrom); -cdev_decl(joy); -cdev_decl(vc_nb_); cdev_decl(wsfont); -cdev_decl(scsibus); -cdev_decl(openfirm); cdev_decl(pci); -cdev_decl(agp); -cdev_decl(iop); -cdev_decl(ld); -cdev_decl(mlx); -cdev_decl(mly); -cdev_decl(plcom); cdev_decl(apm); cdev_decl(spkr); cdev_decl(scif); diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index e983ab6c2a2..0002a8da0ce 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.2 2006/11/03 19:54:02 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.3 2006/11/03 20:21:23 mickey Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -152,12 +152,6 @@ cdev_decl(wskbd); cdev_decl(wsmouse); #include "lpt.h" -#ifdef CONF_HAVE_FCOM -#include "fcom.h" -#else -#define NFCOM 0 -#endif - #include "radio.h" cdev_decl(radio); @@ -294,7 +288,7 @@ struct cdevsw cdevsw[] = { cdev_log_init(1,log), /* 6: /dev/klog */ cdev_fd_init(1,filedesc), /* 7: file descriptor pseudo-device */ cdev_ksyms_init(NKSYMS,ksyms), /* 8: Kernel symbols device */ - cdev_lpt_init(NLPT,lpt), /* 9: parallel printer */ + cdev_lkm_dummy(), /* 9: */ cdev_lkm_dummy(), /* 10: */ cdev_tty_init(NSCIF,scif), /* 11: scif */ cdev_tty_init(NCOM,com), /* 12: serial port */ @@ -343,7 +337,7 @@ struct cdevsw cdevsw[] = { #endif cdev_notdef(), /* 52: reserved */ cdev_notdef(), /* 53: reserved */ - cdev_tty_init(NFCOM,fcom), /* 54: FOOTBRIDGE console */ + cdev_notdef(), /* 54: reserved */ cdev_lkm_dummy(), /* 55: Reserved for bypass device */ cdev_notdef(), /* 56: reserved */ cdev_midi_init(NMIDI,midi), /* 57: MIDI I/O */ diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c index c2449a8cbd4..e6d2382c83e 100644 --- a/sys/arch/sh/dev/scif.c +++ b/sys/arch/sh/dev/scif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scif.c,v 1.1 2006/10/06 21:02:55 miod Exp $ */ +/* $OpenBSD: scif.c,v 1.2 2006/11/03 20:21:23 mickey Exp $ */ /* $NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */ /*- @@ -117,6 +117,7 @@ #include <sh/clock.h> #include <sh/trap.h> #include <machine/intr.h> +#include <machine/conf.h> #include <sh/dev/scifreg.h> @@ -246,8 +247,6 @@ struct cfdriver scif_cd = { static int scif_attached; -cdev_decl(scif); - void InitializeScif(unsigned int); /* |