Remove inapplicable or no longer used cdevsw[] entries and macros.

2 files changed, 5 insertions, 71 deletions

diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 1dbbfc2b1dc..9ce99a28dc9 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.27 2010/09/23 05:02:14 claudio Exp $	*/
+/*	$OpenBSD: conf.c,v 1.28 2010/11/28 20:48:44 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * Character and Block Device configuration
  * Console configuration
  *
- * Defines the structures cdevsw and constab
+ * Defines the structures [bc]devsw
  *
  * Created      : 17/09/94
  */
@@ -66,13 +66,6 @@
  */
 #include "com.h"		/* NS164x0 serial ports */
 
-#ifdef CONF_HAVE_SSCOM
-#include "sscom.h"
-cdev_decl(sscom);
-#else
-#define NSSCOM 0
-#endif
-
 /*
  * Standard pseudo-devices
  */
@@ -158,11 +151,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);
@@ -314,7 +302,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_dummy(),			/* 11: */
 	cdev_tty_init(NCOM,com),		/* 12: serial port */
 	cdev_gpio_init(NGPIO,gpio),     	/* 13: GPIO interface */
-	cdev_tty_init(NSSCOM,sscom),		/* 14: alternate serial port */
+	cdev_notdef(),				/* 14 was alternate serial port */
 	cdev_lkm_dummy(),			/* 15: */
 	cdev_disk_init(NWD,wd),			/* 16: ST506/ESDI/IDE disk */
 	cdev_lkm_dummy(),			/* 17: */
@@ -358,7 +346,7 @@ struct cdevsw cdevsw[] = {
 #endif
  	cdev_bio_init(NBIO,bio),		/* 52: ioctl tunnel */
 	cdev_notdef(),				/* 53: reserved */
-	cdev_tty_init(NFCOM,fcom),		/* 54: FOOTBRIDGE console */
+	cdev_notdef(),				/* 54 was FOOTBRIDGE console */
 	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/arm/include/conf.h b/sys/arch/arm/include/conf.h
index 0e578e9fd4b..8ce86aa35a0 100644
--- a/sys/arch/arm/include/conf.h
+++ b/sys/arch/arm/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.7 2010/07/21 15:40:04 deraadt Exp $	*/
+/*	$OpenBSD: conf.h,v 1.8 2010/11/28 20:48:46 miod Exp $	*/
 /*	$NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $	*/
 
 /*
@@ -57,28 +57,6 @@ 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, \
@@ -86,41 +64,9 @@ cdev_decl(fd);
 	(dev_type_stop((*))) enodev, 0, selfalse, \
 	(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(sscom);
-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);