[src/trunk]: src/sys/dev/pci Fix no wd on cmd680.

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

details:   https://anonhg.NetBSD.org/src/rev/214494808497
branches:  trunk
changeset: 781390:214494808497
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Mon Sep 03 15:38:17 2012 +0000

description:
Fix no wd on cmd680.
Also move setting wdc_maxdrives into cmd*_chip_map().

diffstat:

 sys/dev/pci/cmdide.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 5306d7c6281a -r 214494808497 sys/dev/pci/cmdide.c
--- a/sys/dev/pci/cmdide.c      Mon Sep 03 15:32:18 2012 +0000
+++ b/sys/dev/pci/cmdide.c      Mon Sep 03 15:38:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmdide.c,v 1.37 2012/07/31 15:50:36 bouyer Exp $       */
+/*     $NetBSD: cmdide.c,v 1.38 2012/09/03 15:38:17 kiyohara Exp $     */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.37 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.38 2012/09/03 15:38:17 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -148,7 +148,6 @@
        cp->name = PCIIDE_CHANNEL_NAME(channel);
        cp->ata_channel.ch_channel = channel;
        cp->ata_channel.ch_atac = &sc->sc_wdcdev.sc_atac;
-       sc->sc_wdcdev.wdc_maxdrives = 2;
 
        /*
         * Older CMD64X doesn't have independent channels
@@ -339,6 +338,7 @@
        sc->sc_wdcdev.sc_atac.atac_pio_cap = 4;
        sc->sc_wdcdev.sc_atac.atac_dma_cap = 2;
        sc->sc_wdcdev.sc_atac.atac_set_modes = cmd0643_9_setup_channel;
+       sc->sc_wdcdev.wdc_maxdrives = 2;
 
        ATADEBUG_PRINT(("cmd0643_9_chip_map: old timings reg 0x%x 0x%x\n",
                pci_conf_read(sc->sc_pc, sc->sc_tag, 0x54),
@@ -483,6 +483,7 @@
        sc->sc_wdcdev.sc_atac.atac_pio_cap = 4;
        sc->sc_wdcdev.sc_atac.atac_dma_cap = 2;
        sc->sc_wdcdev.sc_atac.atac_set_modes = cmd680_setup_channel;
+       sc->sc_wdcdev.wdc_maxdrives = 2;
 
        pciide_pci_write(sc->sc_pc, sc->sc_tag, 0x80, 0x00);
        pciide_pci_write(sc->sc_pc, sc->sc_tag, 0x84, 0x00);