Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/macppc/dev For and from bouyer@: call wdc_init_shad...



details:   https://anonhg.NetBSD.org/src/rev/d197c5cf120c
branches:  trunk
changeset: 571478:d197c5cf120c
user:      manu <manu%NetBSD.org@localhost>
date:      Thu Nov 25 15:24:14 2004 +0000

description:
For and from bouyer@: call wdc_init_shadow_reg(chp) only after chp has
been initialized. Cause the hard disk to be detected again on the iBook G4,
and probably other machines.

Weee, I can run -current again!

diffstat:

 sys/arch/macppc/dev/kauai.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 1c015fdb7375 -r d197c5cf120c sys/arch/macppc/dev/kauai.c
--- a/sys/arch/macppc/dev/kauai.c       Thu Nov 25 14:10:28 2004 +0000
+++ b/sys/arch/macppc/dev/kauai.c       Thu Nov 25 15:24:14 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kauai.c,v 1.16 2004/08/20 06:39:38 thorpej Exp $       */
+/*     $NetBSD: kauai.c,v 1.17 2004/11/25 15:24:14 manu Exp $  */
 
 /*-
  * Copyright (c) 2003 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.16 2004/08/20 06:39:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.17 2004/11/25 15:24:14 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -168,7 +168,6 @@
                        return;
                }
        }
-       wdc_init_shadow_regs(chp);
 
        if (pci_intr_establish(pa->pa_pc, ih, IPL_BIO, wdcintr, chp) == NULL) {
                printf("%s: unable to establish interrupt\n", self->dv_xname);
@@ -195,6 +194,7 @@
        chp->ch_channel = 0;
        chp->ch_atac = &sc->sc_wdcdev.sc_atac;
        chp->ch_queue = &sc->sc_queue;
+       wdc_init_shadow_regs(chp);
 
        wdcattach(chp);
 }



Home | Main Index | Thread Index | Old Index