Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sgimips/hpc Fix up Jason's last cleanup (thanks for...



details:   https://anonhg.NetBSD.org/src/rev/228f81e0f8dc
branches:  trunk
changeset: 517863:228f81e0f8dc
user:      rafal <rafal%NetBSD.org@localhost>
date:      Tue Nov 20 16:09:00 2001 +0000

description:
Fix up Jason's last cleanup (thanks for that, btw!!)... Don't attach
hpc child devices that don't match our systype.  Attempting to attach
a wdsc1 on my Challenge S locks the box hard.

diffstat:

 sys/arch/sgimips/hpc/hpc.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (39 lines):

diff -r 4f345ae53d34 -r 228f81e0f8dc sys/arch/sgimips/hpc/hpc.c
--- a/sys/arch/sgimips/hpc/hpc.c        Tue Nov 20 16:08:37 2001 +0000
+++ b/sys/arch/sgimips/hpc/hpc.c        Tue Nov 20 16:09:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpc.c,v 1.3 2001/11/18 08:16:16 thorpej Exp $  */
+/*     $NetBSD: hpc.c,v 1.4 2001/11/20 16:09:01 rafal Exp $    */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -162,17 +162,20 @@
        sc->sc_base = ga->ga_addr;
 
        for (hd = hpc_devices; hd->hd_name != NULL; hd++) {
-               ha.ha_name = hd->hd_name;
-               ha.ha_devoff = hd->hd_devoff;
-               ha.ha_dmaoff = hd->hd_dmaoff;
-               ha.ha_irq = hd->hd_irq;
+               if (hd->hd_sysmask & sysmask) {
+                       ha.ha_name = hd->hd_name;
+                       ha.ha_devoff = hd->hd_devoff;
+                       ha.ha_dmaoff = hd->hd_dmaoff;
+                       ha.ha_irq = hd->hd_irq;
 
-               /* XXX This is disgusting. */
-               ha.ha_st = 1;
-               ha.ha_sh = MIPS_PHYS_TO_KSEG1(sc->sc_base);
-               ha.ha_dmat = &sgimips_default_bus_dma_tag;
+                       /* XXX This is disgusting. */
+                       ha.ha_st = 1;
+                       ha.ha_sh = MIPS_PHYS_TO_KSEG1(sc->sc_base);
+                       ha.ha_dmat = &sgimips_default_bus_dma_tag;
 
-               (void) config_found_sm(self, &ha, hpc_print, hpc_submatch);
+                       (void) config_found_sm(self, &ha, 
+                                               hpc_print, hpc_submatch);
+               }
        }
 
        /* 



Home | Main Index | Thread Index | Old Index