[src/trunk]: src/sys/dev/isa Handle yet another atari specific quirk in the M...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/83ef47b9127e
branches:  trunk
changeset: 358871:83ef47b9127e
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jan 20 18:18:02 2018 +0000

description:
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.

diffstat:

 sys/dev/isa/fd.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r ad50261b9158 -r 83ef47b9127e sys/dev/isa/fd.c
--- a/sys/dev/isa/fd.c  Sat Jan 20 18:04:28 2018 +0000
+++ b/sys/dev/isa/fd.c  Sat Jan 20 18:18:02 2018 +0000
@@ -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 @@
                         * 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];
+                       (void)config_found_ia(fdc->sc_dev, "fdc", (void *)&fa, fdprint);
 #endif
-                       (void)config_found_ia(fdc->sc_dev, "fdc", (void *)&fa, fdprint);
                }
        }
        fdc->sc_state = DEVIDLE;