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

Clean up I/O base settings a bit.

Browse Source
This commit is contained in:
briggs 1995-06-21 03:03:13 +00:00
parent 697011742c
commit 7542473d6d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/mac68k/dev/scsi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi.c,v 1.14 1995/04/21 02:48:03 briggs Exp $ */
/* $NetBSD: scsi.c,v 1.15 1995/06/21 03:03:13 briggs Exp $ */
/*
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@ -115,6 +115,7 @@ struct ncr5380_softc {
};
/* From Guide to Mac II family hardware, p. 137 */
/* These are "adjusted" in the init routine. */
vm_offset_t SCSIBase = 0;
static volatile sci_padded_regmap_t *ncr = (sci_regmap_t *) 0x10000;
static volatile long *sci_4byte_addr = (long *) 0x6000;
static volatile u_char *sci_1byte_addr = (u_char *) 0x12000;
@ -190,13 +191,13 @@ ncrprobe(parent, match, aux)
}
if (!probed) {
/*
* Adjust values based on IOBase.
* Adjust values based on SCSIBase.
*/
ncr = (volatile sci_regmap_t *) (IOBase + (u_int) ncr);
ncr = (volatile sci_regmap_t *) (SCSIBase + (u_int) ncr);
sci_4byte_addr = (volatile long *)
(IOBase + (u_int) sci_4byte_addr);
(SCSIBase + (u_int) sci_4byte_addr);
sci_1byte_addr = (volatile u_char *)
(IOBase + (u_int) sci_1byte_addr);
(SCSIBase + (u_int) sci_1byte_addr);
probed = 1;
}
return 1;

7
sys/arch/mac68k/dev/ser.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ser.c,v 1.24 1995/06/09 02:19:47 briggs Exp $ */
/* $NetBSD: ser.c,v 1.25 1995/06/21 03:03:17 briggs Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@ -137,7 +137,7 @@ struct cfdriver sercd = {
NULL, "ser", matchbyname, serattach, DV_TTY, sizeof(struct ser_softc)
};
volatile unsigned char *sccA = (unsigned char *) 0x4000;
volatile unsigned char *sccA = 0;
static void serstart __P((register struct tty *));
static int serparam __P((register struct tty *, register struct termios *));
@ -199,7 +199,8 @@ serinit(int running_interrupts)
if (initted++)
return;
sccA = IOBase + sccA;
if (!sccA)
panic("sccA offset not set!\n");
spd = SERBRD(serdefaultrate);