[src/trunk]: src/sys/dev/sbus Adapt to recent sbusvar.h changes.

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

details:   https://anonhg.NetBSD.org/src/rev/2f4cfb9a513f
branches:  trunk
changeset: 536031:2f4cfb9a513f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 04 16:17:52 2002 +0000

description:
Adapt to recent sbusvar.h changes.

Use a slightly less conservative timing configuration.

diffstat:

 sys/dev/sbus/stp4020.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r 5401b5c11298 -r 2f4cfb9a513f sys/dev/sbus/stp4020.c
--- a/sys/dev/sbus/stp4020.c    Wed Sep 04 16:12:23 2002 +0000
+++ b/sys/dev/sbus/stp4020.c    Wed Sep 04 16:17:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $ */
+/*     $NetBSD: stp4020.c,v 1.24 2002/09/04 16:17:52 martin Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.24 2002/09/04 16:17:52 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -323,9 +323,9 @@
                        continue;
 
                if (sbus_bus_map(sa->sa_bustag,
-                                sa->sa_reg[i].sbr_slot,
-                                sa->sa_reg[i].sbr_offset,
-                                sa->sa_reg[i].sbr_size,
+                                sa->sa_reg[i].oa_space,
+                                sa->sa_reg[i].oa_base,
+                                sa->sa_reg[i].oa_size,
                                 0, &bh) != 0) {
                        printf("%s: attach: cannot map registers\n",
                                self->dv_xname);
@@ -355,10 +355,10 @@
         * the lower level for PC card I/O.
         */
        if (sa->sa_nintr != 0) {
-               bus_intr_establish(sa->sa_bustag, sa->sa_intr[1].sbi_pri,
+               bus_intr_establish(sa->sa_bustag, sa->sa_intr[1].oi_pri,
                                   IPL_NONE, 0, stp4020_statintr, sc);
 
-               bus_intr_establish(sa->sa_bustag, sa->sa_intr[0].sbi_pri,
+               bus_intr_establish(sa->sa_bustag, sa->sa_intr[0].oi_pri,
                                   IPL_NONE, 0, stp4020_iointr, sc);
        }
 
@@ -696,7 +696,7 @@
         * seem to propagate timing information, so we use that
         * everywhere.
         */
-       stp4020_calc_speed(speed, 300, &length, &delay);
+       stp4020_calc_speed(speed, (win==STP_WIN_ATTR)? 300 : 100, &length, &delay);
 
        /*
         * Fill in the Address Space Select and Base Address