summaryrefslogtreecommitdiffstats
path: root/sys/dev/mcd
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-10-05 16:35:33 +0000
committerphk <phk@FreeBSD.org>2002-10-05 16:35:33 +0000
commit951c3e53b2ed3b6d204d571d81928a44baf1a85e (patch)
tree281a4e3831a5ca364a19928efbfe097201919121 /sys/dev/mcd
parentca4946005d763c5181649378e37809110aa0e1b5 (diff)
downloadFreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.zip
FreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.tar.gz
NB: This commit does *NOT* make GEOM the default in FreeBSD
NB: But it will enable it in all kernels not having options "NO_GEOM" Put the GEOM related options into the intended order. Add "options NO_GEOM" to all kernel configs apart from NOTES. In some order of controlled fashion, the NO_GEOM options will be removed, architecture by architecture in the coming days. There are currently three known issues which may force people to need the NO_GEOM option: boot0cfg/fdisk: Tries to update the MBR while it is being used to control slices. GEOM does not allow this as a direct operation. SCSI floppy drives: Appearantly the scsi-da driver return "EBUSY" if no media is inserted. This is wrong, it should return ENXIO. PC98: It is unclear if GEOM correctly recognizes all variants of PC98 disklabels. (Help Wanted! I have neither docs nor HW) These issues are all being worked. Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/dev/mcd')
-rw-r--r--sys/dev/mcd/mcd.c4
-rw-r--r--sys/dev/mcd/mcd_isa.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 1952e7c..7fbb3ba 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -1,5 +1,7 @@
#include "opt_geom.h"
-#ifndef GEOM
+#ifndef NO_GEOM
+#warning "The mcd driver is currently not compatible with GEOM"
+#else
/*
* Copyright 1993 by Holger Veit (data part)
* Copyright 1993 by Brian Moore (audio part)
diff --git a/sys/dev/mcd/mcd_isa.c b/sys/dev/mcd/mcd_isa.c
index 823dde8..e08a847 100644
--- a/sys/dev/mcd/mcd_isa.c
+++ b/sys/dev/mcd/mcd_isa.c
@@ -2,6 +2,9 @@
* $FreeBSD$
*/
+#include "opt_geom.h"
+#ifdef NO_GEOM
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -209,3 +212,5 @@ static driver_t mcd_isa_driver = {
static devclass_t mcd_devclass;
DRIVER_MODULE(mcd, isa, mcd_isa_driver, mcd_devclass, NULL, 0);
+
+#endif /* GEOM */
OpenPOWER on IntegriCloud