diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-26 23:19:12 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-26 23:19:12 +0000 |
| commit | eef856390bdffdd87a3e60124940fbc3fae829fc (patch) | |
| tree | 6218b87b49fce37b5e929c930650258106cac3f5 /sys/arch/amd64 | |
| parent | 61ca5ddc65874b95e765bb5859e4f38511d356fd (diff) | |
kill mcd dead. ok krw matthew millert thib
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 12 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/dev_i386.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/devopen.c | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index f0bac927980..b4f78ff319c 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.33 2011/03/22 15:29:48 marco Exp $ */ +/* $OpenBSD: conf.c,v 1.34 2011/06/26 23:19:11 tedu Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -51,8 +51,6 @@ bdev_decl(fd); #include "st.h" #include "cd.h" #include "uk.h" -#include "mcd.h" -bdev_decl(mcd); #include "vnd.h" #include "ccd.h" #include "raid.h" @@ -67,7 +65,7 @@ struct bdevsw bdevsw[] = bdev_disk_init(NSD,sd), /* 4: SCSI disk */ bdev_tape_init(NST,st), /* 5: SCSI tape */ bdev_disk_init(NCD,cd), /* 6: SCSI CD-ROM */ - bdev_disk_init(NMCD,mcd), /* 7: Mitsumi CD-ROM */ + bdev_notdef(), /* 7 */ bdev_lkm_dummy(), /* 8 */ bdev_lkm_dummy(), /* 9 */ bdev_lkm_dummy(), /* 10 */ @@ -121,7 +119,6 @@ cdev_decl(wd); #include "com.h" cdev_decl(com); cdev_decl(fd); -cdev_decl(scd); #include "lpt.h" cdev_decl(lpt); #include "ch.h" @@ -142,7 +139,6 @@ cdev_decl(pms); #endif #include "cy.h" cdev_decl(cy); -cdev_decl(mcd); #include "tun.h" #include "audio.h" #include "video.h" @@ -238,7 +234,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 36: Logitech mouse */ cdev_notdef(), /* 37: Extended PS/2 mouse */ cdev_tty_init(NCY,cy), /* 38: Cyclom serial port */ - cdev_disk_init(NMCD,mcd), /* 39: Mitsumi CD-ROM */ + cdev_notdef(), /* 39: Mitsumi CD-ROM */ cdev_tun_init(NTUN,tun), /* 40: network tunnel */ cdev_disk_init(NVND,vnd), /* 41: vnode disk driver */ cdev_audio_init(NAUDIO,audio), /* 42: generic audio I/O */ @@ -390,7 +386,7 @@ int chrtoblktbl[] = { /* 36 */ NODEV, /* 37 */ NODEV, /* 38 */ NODEV, - /* 39 */ 7, /* mcd */ + /* 39 */ NODEV, /* 40 */ NODEV, /* 41 */ 14, /* vnd */ /* 42 */ NODEV, diff --git a/sys/arch/amd64/stand/libsa/dev_i386.c b/sys/arch/amd64/stand/libsa/dev_i386.c index 69487614d8c..b5c5f98a1de 100644 --- a/sys/arch/amd64/stand/libsa/dev_i386.c +++ b/sys/arch/amd64/stand/libsa/dev_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_i386.c,v 1.7 2011/06/26 21:37:52 tedu Exp $ */ +/* $OpenBSD: dev_i386.c,v 1.8 2011/06/26 23:19:11 tedu Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -35,7 +35,7 @@ extern int debug; /* XXX use slot for 'rd' for 'hd' pseudo-device */ const char bdevs[][4] = { - "wd", "", "fd", "", "sd", "st", "cd", "mcd", + "wd", "", "fd", "", "sd", "st", "cd", "", "", "", "", "", "", "", "", "", "", "hd", "" }; const int nbdevs = nitems(bdevs); diff --git a/sys/arch/amd64/stand/pxeboot/devopen.c b/sys/arch/amd64/stand/pxeboot/devopen.c index 82036bb0910..e3d8cecf88e 100644 --- a/sys/arch/amd64/stand/pxeboot/devopen.c +++ b/sys/arch/amd64/stand/pxeboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.8 2011/06/26 21:37:52 tedu Exp $ */ +/* $OpenBSD: devopen.c,v 1.9 2011/06/26 23:19:11 tedu Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -42,7 +42,7 @@ extern char *bootmac; /* Gets passed to kernel for network boot */ /* XXX use slot for 'rd' for 'hd' pseudo-device */ const char bdevs[][4] = { - "wd", "", "fd", "", "sd", "st", "cd", "mcd", + "wd", "", "fd", "", "sd", "st", "cd", "", "", "", "", "", "", "", "", "", "", "hd", "" }; const int nbdevs = nitems(bdevs); |