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

Call obio_alloc with just two args (mappings always writable).

Browse Source
This commit is contained in:
gwr 1994-09-20 16:21:44 +00:00
parent d68c93647d
commit 51afe89406
3 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/sun3/dev/if_le_subr.c
View File

@ -28,8 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Header: /cvsroot/src/sys/arch/sun3/dev/Attic/if_le_subr.c,v 1.5 1994/05/28 15:45:53 gwr Exp $ * $Id: if_le_subr.c,v 1.6 1994/09/20 16:21:44 gwr Exp $
* gwr: uncomment obio_probe_byte
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -58,6 +57,8 @@
#include "if_lereg.h" #include "if_lereg.h"
#include "if_le.h" #include "if_le.h"
extern int leintr();
int int
le_md_match(parent, cf, args) le_md_match(parent, cf, args)
struct device *parent; struct device *parent;
@ -87,8 +88,8 @@ le_md_attach(parent, self, args)
struct device *self; struct device *self;
void *args; void *args;
{ {
caddr_t dvma_malloc(), le_addr; caddr_t dvma_malloc();
int level, leintr(); int le_addr, level;
struct le_softc *le = (struct le_softc *) self; struct le_softc *le = (struct le_softc *) self;
struct obio_cf_loc *obio_loc = OBIO_LOC(self); struct obio_cf_loc *obio_loc = OBIO_LOC(self);
@ -97,11 +98,11 @@ le_md_attach(parent, self, args)
if (!le->sc_r2) if (!le->sc_r2)
panic(": not enough dvma space"); panic(": not enough dvma space");
idprom_etheraddr(le->sc_addr); /* ethernet addr */ idprom_etheraddr(le->sc_addr); /* ethernet addr */
le_addr = OBIO_DEFAULT_PARAM(caddr_t, obio_loc->obio_addr, OBIO_AMD_ETHER); le_addr = OBIO_DEFAULT_PARAM(int, obio_loc->obio_addr, OBIO_AMD_ETHER);
/* register access */ /* register access */
le->sc_r1 = (struct lereg1 *) le->sc_r1 = (struct lereg1 *)
obio_alloc(le_addr, OBIO_AMD_ETHER_SIZE, OBIO_WRITE); obio_alloc(le_addr, OBIO_AMD_ETHER_SIZE);
if (!le->sc_r1) if (!le->sc_r1)
panic(": not enough obio space\n"); panic(": not enough obio space\n");
level = OBIO_DEFAULT_PARAM(int, obio_loc->obio_level, 3); level = OBIO_DEFAULT_PARAM(int, obio_loc->obio_level, 3);

11
sys/arch/sun3/dev/si.c
View File

@ -31,7 +31,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: si.c,v 1.6 1994/07/06 02:53:39 gwr Exp $ * $Id: si.c,v 1.7 1994/09/20 16:21:46 gwr Exp $
*/ */
/* #define DEBUG 1 */ /* #define DEBUG 1 */
@ -196,15 +196,16 @@ si_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {
caddr_t dvma_malloc(), si_addr; caddr_t dvma_malloc();
int level, ncr_intr(), unit = DEVICE_UNIT(self); int si_addr, level;
int unit = DEVICE_UNIT(self);
struct ncr5380_softc *ncr5380 = (struct ncr5380_softc *) self; struct ncr5380_softc *ncr5380 = (struct ncr5380_softc *) self;
struct obio_cf_loc *obio_loc = OBIO_LOC(self); struct obio_cf_loc *obio_loc = OBIO_LOC(self);
struct cfdata *new_match; struct cfdata *new_match;
si_addr = OBIO_DEFAULT_PARAM(caddr_t, obio_loc->obio_addr, OBIO_NCR_SCSI); si_addr = OBIO_DEFAULT_PARAM(int, obio_loc->obio_addr, OBIO_NCR_SCSI);
ncr5380->sc_regs = (sci_regmap_t *) ncr5380->sc_regs = (sci_regmap_t *)
obio_alloc(si_addr, OBIO_NCR_SCSI_SIZE, OBIO_WRITE); obio_alloc(si_addr, OBIO_NCR_SCSI_SIZE);
level = OBIO_DEFAULT_PARAM(int, obio_loc->obio_level, 2); level = OBIO_DEFAULT_PARAM(int, obio_loc->obio_level, 2);

64
sys/arch/sun3/dev/zs.c
View File

@ -1,4 +1,5 @@
/* /*
* Copyright (c) 1994 Gordon W. Ross
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
@ -41,9 +42,7 @@
* *
* @(#)zs.c 8.1 (Berkeley) 7/19/93 * @(#)zs.c 8.1 (Berkeley) 7/19/93
* *
* from: Header: zs.c,v 1.30 93/07/19 23:44:42 torek Exp * $Id: zs.c,v 1.9 1994/09/20 16:21:48 gwr Exp $
* from: sparc/dev/zs.c,v 1.3 1993/10/13 02:36:44 deraadt Exp
* $Id: zs.c,v 1.8 1994/06/28 21:42:32 gwr Exp $
*/ */
/* /*
@ -149,8 +148,6 @@ static int zs_kgdb_savedspeed;
static void zs_checkkgdb(int, struct zs_chanstate *, struct tty *); static void zs_checkkgdb(int, struct zs_chanstate *, struct tty *);
#endif #endif
static volatile struct zsdevice *zsaddr[NZS]; /* XXX, but saves work */
/* /*
* Console keyboard L1-A processing is done in the hardware interrupt code, * Console keyboard L1-A processing is done in the hardware interrupt code,
* so we need to duplicate some of the console keyboard decode state. (We * so we need to duplicate some of the console keyboard decode state. (We
@ -166,6 +163,19 @@ static struct conk_state { /* console keyboard state */
int zshardscope; int zshardscope;
int zsshortcuts; /* number of "shortcut" software interrupts */ int zsshortcuts; /* number of "shortcut" software interrupts */
static volatile struct zsdevice *zsaddr[NZS]; /* XXX, but saves work */
/* Find PROM mappings (for console support). */
void zs_init()
{
if (zsaddr[0] == NULL)
zsaddr[0] = (struct zsdevice *)
obio_find_mapping(OBIO_ZS, OBIO_ZS_SIZE);
if (zsaddr[1] == NULL)
zsaddr[1] = (struct zsdevice *)
obio_find_mapping(OBIO_KEYBD_MS, OBIO_ZS_SIZE);
}
/* /*
* Match slave number to zs unit number, so that misconfiguration will * Match slave number to zs unit number, so that misconfiguration will
* not set up the keyboard as ttya, etc. * not set up the keyboard as ttya, etc.
@ -196,18 +206,18 @@ zsattach(struct device *parent, struct device *dev, void *aux)
register struct zs_chanstate *cs; register struct zs_chanstate *cs;
register volatile struct zsdevice *addr; register volatile struct zsdevice *addr;
register struct tty *tp, *ctp; register struct tty *tp, *ctp;
int softcar; int softcar, obio_addr;
static int didintr; static int didintr;
caddr_t obio_addr;
obio_addr = (caddr_t)obio_loc->obio_addr; obio_addr = obio_loc->obio_addr;
obio_print(obio_addr, ZSSOFT_PRI); obio_print(obio_addr, ZSSOFT_PRI);
printf(" hwpri %d\n", ZSHARD_PRI); printf(" hwpri %d\n", ZSHARD_PRI);
if ((addr = zsaddr[zs]) == NULL) { if (zsaddr[zs] == NULL) {
zsaddr[zs] = addr = (struct zsdevice *) zsaddr[zs] = (struct zsdevice *)
obio_alloc(obio_addr, OBIO_ZS_SIZE, OBIO_WRITE); obio_alloc(obio_addr, OBIO_ZS_SIZE);
} }
addr = zsaddr[zs];
if (!didintr) { if (!didintr) {
didintr = 1; didintr = 1;
@ -357,11 +367,10 @@ zs_reset(zc, inten, speed)
int int
zscnprobe_kbd() zscnprobe_kbd()
{ {
if (zs1_va == NULL) { if (zsaddr[1] == NULL) {
mon_printf("zscnprobe_kbd: zs1 not yet mapped\n"); mon_printf("zscnprobe_kbd: zs1 not yet mapped\n");
return CN_DEAD; return CN_DEAD;
} }
zsaddr[1] = (struct zsdevice *)zs1_va;
return CN_INTERNAL; return CN_INTERNAL;
} }
@ -373,12 +382,11 @@ zscnprobe(struct consdev *cn, int unit)
{ {
int maj, eeCons; int maj, eeCons;
if (zs0_va == NULL) { if (zsaddr[0] == NULL) {
mon_printf("zscnprobe: zs0 not yet mapped\n"); mon_printf("zscnprobe: zs0 not mapped\n");
cn->cn_pri = CN_DEAD; cn->cn_pri = CN_DEAD;
return 0; return 0;
} }
zsaddr[0] = (struct zsdevice *)zs0_va;
/* XXX - Also try to make sure it exists? */ /* XXX - Also try to make sure it exists? */
/* locate the major number */ /* locate the major number */
@ -389,12 +397,7 @@ zscnprobe(struct consdev *cn, int unit)
cn->cn_dev = makedev(maj, unit); cn->cn_dev = makedev(maj, unit);
/* Use EEPROM console setting to decide "remote" console. */ /* Use EEPROM console setting to decide "remote" console. */
if (eeprom_va == NULL) { eeCons = ee_get_byte(EE_CONS_OFFSET, 0);
mon_printf("zscnprobe: eeprom not yet mapped\n");
eeCons = -1;
} else {
eeCons = ((struct eeprom *)eeprom_va)->eeConsole;
}
/* Hack: EE_CONS_TTYA + 1 == EE_CONS_TTYB */ /* Hack: EE_CONS_TTYA + 1 == EE_CONS_TTYB */
if (eeCons == (EE_CONS_TTYA + unit)) { if (eeCons == (EE_CONS_TTYA + unit)) {
@ -427,7 +430,7 @@ zscninit(struct consdev *cn)
volatile struct zsdevice *addr; volatile struct zsdevice *addr;
unit = minor(cn->cn_dev) & 1; unit = minor(cn->cn_dev) & 1;
addr = (struct zsdevice *)zs0_va; addr = zsaddr[0];
zs_conschan = ((unit == 0) ? zs_conschan = ((unit == 0) ?
&addr->zs_chan[CHAN_A] : &addr->zs_chan[CHAN_A] :
&addr->zs_chan[CHAN_B] ); &addr->zs_chan[CHAN_B] );
@ -450,10 +453,15 @@ zscngetc(dev)
return (0); return (0);
s = splhigh(); s = splhigh();
/* Wait for a character to arrive. */
while ((zc->zc_csr & ZSRR0_RX_READY) == 0) while ((zc->zc_csr & ZSRR0_RX_READY) == 0)
ZS_DELAY(); ZS_DELAY();
ZS_DELAY(); ZS_DELAY();
c = zc->zc_data; c = zc->zc_data;
ZS_DELAY();
splx(s); splx(s);
return (c); return (c);
} }
@ -475,11 +483,13 @@ zscnputc(dev, c)
splx(s); splx(s);
return (0); return (0);
} }
s = splhigh(); s = splhigh();
/* Wait for transmitter to become ready. */
while ((zc->zc_csr & ZSRR0_TX_READY) == 0) while ((zc->zc_csr & ZSRR0_TX_READY) == 0)
ZS_DELAY(); ZS_DELAY();
ZS_DELAY(); ZS_DELAY();
zc->zc_data = c; zc->zc_data = c;
ZS_DELAY(); ZS_DELAY();
splx(s); splx(s);
@ -1356,6 +1366,7 @@ zs_write(zc, reg, val)
#ifdef KGDB #ifdef KGDB
/* /*
* Get a character from the given kgdb channel. Called at splhigh(). * Get a character from the given kgdb channel. Called at splhigh().
* XXX - Add delays, or combine with zscngetc()...
*/ */
static int static int
zs_kgdb_getc(void *arg) zs_kgdb_getc(void *arg)
@ -1403,9 +1414,10 @@ zs_kgdb_init()
} }
zs = unit >> 1; zs = unit >> 1;
unit &= 1; unit &= 1;
if ((addr = zs0_va) == NULL) if (zsaddr[0] == NULL)
panic("kbdb_attach: zs0 not yet mapped"); panic("kbdb_attach: zs0 not yet mapped");
addr = zsaddr[0];
zc = unit == 0 ? &addr->zs_chan[CHAN_A] : &addr->zs_chan[CHAN_B]; zc = unit == 0 ? &addr->zs_chan[CHAN_A] : &addr->zs_chan[CHAN_B];
zs_kgdb_savedspeed = zs_getspeed(zc); zs_kgdb_savedspeed = zs_getspeed(zc);