summaryrefslogtreecommitdiffstats
path: root/sys/pc98/cbus/fdcreg.h
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2001-12-16 09:00:03 +0000
committernyan <nyan@FreeBSD.org>2001-12-16 09:00:03 +0000
commit1384726539c246bfdec6aa61edc388ccb7961e62 (patch)
tree3dd8e5017be71fa6b703ca9a0b36f6c58fb93ee1 /sys/pc98/cbus/fdcreg.h
parent4e774e7f0224114e8e57e4840447cca1f5683da3 (diff)
downloadFreeBSD-src-1384726539c246bfdec6aa61edc388ccb7961e62.zip
FreeBSD-src-1384726539c246bfdec6aa61edc388ccb7961e62.tar.gz
Merged from sys/isa/{fd.c,fdreg.h} revisions 1.222 and 1.15, respectively.
Diffstat (limited to 'sys/pc98/cbus/fdcreg.h')
-rw-r--r--sys/pc98/cbus/fdcreg.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index 4ec923e..e1841c9 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -74,14 +74,11 @@
#define FDCTL 7 /* Control Register (W) */
#endif /* PC98 */
-#ifndef FDC_500KBPS
-# define FDC_500KBPS 0x00 /* 500KBPS MFM drive transfer rate */
-# define FDC_300KBPS 0x01 /* 300KBPS MFM drive transfer rate */
-# define FDC_250KBPS 0x02 /* 250KBPS MFM drive transfer rate */
-# define FDC_125KBPS 0x03 /* 125KBPS FM drive transfer rate */
- /* for some controllers 1MPBS instead */
-#endif /* FDC_500KBPS */
-
+/*
+ * The definitions for FDC_500KBPS etc. have been moved out to <sys/fdcio.h>
+ * since they need to be visible in userland. They cover the lower two bits
+ * of FDCTL when used for output.
+ */
/*
* this is the secret PIO data port (offset from base)
*/
OpenPOWER on IntegriCloud