Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with sbus attach args changes.

This commit is contained in:
pk 1998-07-29 18:44:22 +00:00
parent 9e4d2f9b53
commit 402a052405
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/sparc/dev/bwtwo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bwtwo.c,v 1.38 1998/04/07 20:18:17 pk Exp $ */
/* $NetBSD: bwtwo.c,v 1.39 1998/07/29 18:44:22 pk Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -283,7 +283,8 @@ bwtwoattach_sbus(parent, self, args)
sc->sc_get_video = bwtwo_get_video_sun4c;
sc->sc_set_video = bwtwo_set_video_sun4c;
sc->sc_fb.fb_pixels = sa->sa_promvaddr;
if (sa->sa_npromvaddrs != 0)
sc->sc_fb.fb_pixels = sa->sa_promvaddrs[0];
if (isconsole && sc->sc_fb.fb_pixels == NULL) {
int ramsize = fb->fb_type.fb_height * fb->fb_linebytes;
if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,

7
sys/arch/sparc/dev/cgthree.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgthree.c,v 1.37 1998/04/07 20:18:18 pk Exp $ */
/* $NetBSD: cgthree.c,v 1.38 1998/07/29 18:44:22 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -258,7 +258,8 @@ cgthreeattach_sbus(parent, self, args)
isconsole = node == fbnode && fbconstty != NULL;
name = getpropstring(node, "model");
fb->fb_pixels = sa->sa_promvaddr;
if (sa->sa_npromvaddrs != 0)
fb->fb_pixels = sa->sa_promvaddrs[0];
if (isconsole && fb->fb_pixels == NULL) {
int ramsize = fb->fb_type.fb_height * fb->fb_linebytes;
if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,
@ -270,7 +271,7 @@ cgthreeattach_sbus(parent, self, args)
printf("%s: cannot map pixels\n", self->dv_xname);
return;
}
sc->sc_fb.fb_pixels = (char *)bh;
fb->fb_pixels = (char *)bh;
}
sbus_establish(&sc->sc_sd, &sc->sc_dev);

10
sys/arch/sparc/dev/esp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp.c,v 1.74 1998/07/27 19:32:42 pk Exp $ */
/* $NetBSD: esp.c,v 1.75 1998/07/29 18:44:23 pk Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -269,8 +269,8 @@ espattach_sbus(parent, self, aux)
* Map my registers in, if they aren't already in virtual
* address space.
*/
if (sa->sa_promvaddr)
esc->sc_reg = (volatile u_char *) sa->sa_promvaddr;
if (sa->sa_npromvaddrs)
esc->sc_reg = (volatile u_char *) sa->sa_promvaddrs[0];
else {
bus_space_handle_t bh;
if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,
@ -320,8 +320,8 @@ espattach_dma(parent, self, aux)
* Map my registers in, if they aren't already in virtual
* address space.
*/
if (sa->sa_promvaddr)
esc->sc_reg = (volatile u_char *) sa->sa_promvaddr;
if (sa->sa_npromvaddrs)
esc->sc_reg = (volatile u_char *) sa->sa_promvaddrs[0];
else {
bus_space_handle_t bh;
if (bus_space_map2(sa->sa_bustag,

6
sys/arch/sparc/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.62 1998/07/04 22:18:38 jonathan Exp $ */
/* $NetBSD: fd.c,v 1.63 1998/07/29 18:44:23 pk Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
@ -453,8 +453,8 @@ fdcattach_obio(parent, self, aux)
fdc->sc_bustag = sa->sa_bustag;
if (sa->sa_promvaddr != 0)
fdc->sc_reg = (caddr_t)sa->sa_promvaddr;
if (sa->sa_npromvaddrs != 0)
fdc->sc_reg = (caddr_t)sa->sa_promvaddrs[0];
else {
bus_space_handle_t bh;

8
sys/arch/sparc/dev/isp_sbus.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: isp_sbus.c,v 1.12 1998/07/20 21:18:38 thorpej Exp $ */
/* $Id: isp_sbus.c,v 1.12 1998/07/20 21:18:38 thorpej Exp $ */
/* $NetBSD: isp_sbus.c,v 1.13 1998/07/29 18:44:23 pk Exp $ */
/* $Id: isp_sbus.c,v 1.13 1998/07/29 18:44:23 pk Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@ -140,8 +140,8 @@ isp_sbus_attach(parent, self, aux)
sbc->sbus_pri = sa->sa_pri;
sbc->sbus_mdvec = mdvec;
if (sa->sa_promvaddr) {
sbc->sbus_reg = (volatile u_char *) sa->sa_promvaddr;
if (sa->sa_npromvaddrs != 0) {
sbc->sbus_reg = (volatile u_char *) sa->sa_promvaddrs[0];
} else {
bus_space_handle_t bh;
if (sbus_bus_map(sa->sa_bustag, sa->sa_slot,