diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-23 19:52:37 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-04-23 19:52:37 +0000 |
| commit | 68957afbe436d13477bdc78daf5e390a240eeacf (patch) | |
| tree | 4c7710336ead333b6e1b476a2c0918b6eb3efdbd /sys | |
| parent | 633e80833427eef32f32fd959d37e067b11a8415 (diff) | |
Move assignment of kl_hub_widget[] outside a #ifdef DEBUG ... #endif block,
giving systems with non-default values a chance to work again. Pass the brown
paper bag, please.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sgi/sgi/sginode.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/sgi/sgi/sginode.c b/sys/arch/sgi/sgi/sginode.c index 73c7a6ad5c7..95bfbb9058a 100644 --- a/sys/arch/sgi/sgi/sginode.c +++ b/sys/arch/sgi/sgi/sginode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sginode.c,v 1.26 2011/04/23 19:35:57 miod Exp $ */ +/* $OpenBSD: sginode.c,v 1.27 2011/04/23 19:52:36 miod Exp $ */ /* * Copyright (c) 2008, 2009, 2011 Miodrag Vallat. * @@ -227,11 +227,11 @@ kl_first_pass_comp(klinfo_t *comp, void *arg) int ip35 = *(int *)arg; klcpu_t *cpucomp; klmembnk_m_t *memcomp_m; + klxbow_t *xbowcomp; arc_config64_t *arc; #ifdef DEBUG klmembnk_n_t *memcomp_n; klhub_t *hubcomp; - klxbow_t *xbowcomp; klscsi_t *scsicomp; klscctl_t *scsi2comp; int i; @@ -330,19 +330,12 @@ kl_first_pass_comp(klinfo_t *comp, void *arg) } break; -#ifdef DEBUG - case KLSTRUCT_HUB: - hubcomp = (klhub_t *)comp; - DB_PRF(("\t port %d flag %d speed %dMHz\n", - hubcomp->hub_port.port_nasid, hubcomp->hub_port.port_flag, - hubcomp->hub_speed / 1000000)); - break; - case KLSTRUCT_XBOW: xbowcomp = (klxbow_t *)comp; DB_PRF(("\t hub master link %d\n", xbowcomp->xbow_hub_master_link)); kl_hub_widget[comp->nasid] = xbowcomp->xbow_hub_master_link; +#ifdef DEBUG for (i = 0; i < MAX_XBOW_LINKS; i++) { if (!ISSET(xbowcomp->xbow_port_info[i].port_flag, XBOW_PORT_ENABLE)) @@ -351,6 +344,15 @@ kl_first_pass_comp(klinfo_t *comp, void *arg) xbowcomp->xbow_port_info[i].port_nasid, xbowcomp->xbow_port_info[i].port_flag)); } +#endif + break; + +#ifdef DEBUG + case KLSTRUCT_HUB: + hubcomp = (klhub_t *)comp; + DB_PRF(("\t port %d flag %d speed %dMHz\n", + hubcomp->hub_port.port_nasid, hubcomp->hub_port.port_flag, + hubcomp->hub_speed / 1000000)); break; case KLSTRUCT_SCSI2: |