Module Name: src
Committed By: tsutsui
Date: Sat Jan 20 18:18:02 UTC 2018
Modified Files:
src/sys/dev/isa: fd.c
Log Message:
Handle yet another atari specific quirk in the MI ISA fdc(4)/fd(4) driver.
This makes fd(4) drive(s) (which is necessary for installation)
properly attached on Milan.
atari uses "fdcisa" and "fdisa" for ISA fdc to co-exist other fd(4)
drivers, on-board (atari/dev/fd.c) one and Hades (atari/dev/hdfd.c) one.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/isa/fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.110 src/sys/dev/isa/fd.c:1.111
--- src/sys/dev/isa/fd.c:1.110 Tue Dec 8 20:36:15 2015
+++ src/sys/dev/isa/fd.c Sat Jan 20 18:18:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.110 2015/12/08 20:36:15 christos Exp $ */
+/* $NetBSD: fd.c,v 1.111 2018/01/20 18:18:02 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.110 2015/12/08 20:36:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.111 2018/01/20 18:18:02 tsutsui Exp $");
#include "opt_ddb.h"
@@ -460,14 +460,16 @@ fdcfinishattach(device_t self)
* Atari has a different ordening, defaults to 1.44
*/
fa.fa_deftype = &fd_types[2];
+ /* Atari also configures ISA fdc(4) as "fdcisa" */
+ (void)config_found_ia(fdc->sc_dev, "fdcisa", (void *)&fa, fdprint);
#else
/*
* Default to 1.44MB on Alpha and BeBox. How do we tell
* on these platforms?
*/
fa.fa_deftype = &fd_types[0];
-#endif
(void)config_found_ia(fdc->sc_dev, "fdc", (void *)&fa, fdprint);
+#endif
}
}
fdc->sc_state = DEVIDLE;
