aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJoerg Wunsch <joerg@FreeBSD.org>2001-12-18 22:16:33 +0000
committerJoerg Wunsch <joerg@FreeBSD.org>2001-12-18 22:16:33 +0000
commit038d1bbd1a1e50d4147b71d54593343ef71dc9d5 (patch)
tree0ca862316af87645f48a7df31cfa72a92a231b02 /sys/dev
parent856f23ed359b1138dbb07532a81dc83328b85941 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/fdc/fdc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index b0df64e72ea1..ca6c88acef44 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1180,7 +1180,13 @@ fd_probe(device_t dev)
fd->flags = FD_UA; /* make sure fdautoselect() will be called */
fd->type = FD_DTYPE(flags);
-#if _MACHINE_ARCH == i386
+/*
+ * XXX I think using __i386__ is wrong here since we actually want to probe
+ * for the machine type, not the CPU type (so non-PC arch's like the PC98 will
+ * fail the probe). However, for whatever reason, testing for _MACHINE_ARCH
+ * == i386 breaks the test on FreeBSD/Alpha.
+ */
+#ifdef __i386__
if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) {
/* Look up what the BIOS thinks we have. */
if (fd->fdu == 0) {
@@ -1200,7 +1206,7 @@ fd_probe(device_t dev)
if (fd->type == FDT_288M_1)
fd->type = FDT_288M;
}
-#endif /* _MACHINE_ARCH == i386 */
+#endif /* __i386__ */
/* is there a unit? */
if (fd->type == FDT_NONE)
return (ENXIO);