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

Switch pica to jazzio. 

Split shared MD portion between algor and jazzio.
This commit is contained in:
ur 2000-12-24 09:25:24 +00:00
parent be1e7e391c
commit 459f2585f4
37 changed files with 804 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2000/01/23 21:01:48 soda Exp $ # $NetBSD: Makefile,v 1.7 2000/12/24 09:25:24 ur Exp $
# $OpenBSD: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $ # $OpenBSD: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/16/93 # from: @(#)Makefile 8.1 (Berkeley) 6/16/93
@ -10,11 +10,11 @@
TARC= ../arc/tags TARC= ../arc/tags
SARC= ../arc/algor/*.[ch] ../arc/arc/*.[ch] ../arc/dev/*.[ch] \ SARC= ../arc/algor/*.[ch] ../arc/arc/*.[ch] ../arc/dev/*.[ch] \
../arc/dti/*.[ch] ../arc/include/*.h ../arc/isa/*.[ch] \ ../arc/dti/*.[ch] ../arc/include/*.h ../arc/isa/*.[ch] \
../arc/pci/*.[ch] ../arc/pica/*.[ch] ../arc/pci/*.[ch] ../arc/jazz/*.[ch]
AARC= ../arc/arc/*.S AARC= ../arc/arc/*.S
# Directories in which to place tags links # Directories in which to place tags links
DARC= algor arc dev dti include isa pci pica DARC= algor arc dev dti include isa pci jazz
.include "../../kern/Make.tags.inc" .include "../../kern/Make.tags.inc"

17
sys/arch/arc/dev/com_lbus.c → sys/arch/arc/algor/com_algor.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_lbus.c,v 1.10 2000/02/22 11:26:00 soda Exp $ */ /* $NetBSD: com_algor.c,v 1.1 2000/12/24 09:25:24 ur Exp $ */
/* $OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $ */ /* $OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $ */
/* NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp */ /* NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp */
@ -91,20 +91,15 @@
extern struct arc_bus_space *arc_bus_com; /* XXX */ extern struct arc_bus_space *arc_bus_com; /* XXX */
extern int com_freq; extern int com_freq;
int com_localbus_probe __P((struct device *, struct cfdata *, void *)); int com_algor_probe __P((struct device *, struct cfdata *, void *));
void com_localbus_attach __P((struct device *, struct device *, void *)); void com_algor_attach __P((struct device *, struct device *, void *));
struct cfattach com_pica_ca = {
sizeof(struct com_softc), com_localbus_probe, com_localbus_attach
};
struct cfattach com_algor_ca = { struct cfattach com_algor_ca = {
sizeof(struct com_softc), com_localbus_probe, com_localbus_attach sizeof(struct com_softc), com_algor_probe, com_algor_attach
}; };
int int
com_localbus_probe(parent, match, aux) com_algor_probe(parent, match, aux)
struct device *parent; struct device *parent;
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
@ -133,7 +128,7 @@ com_localbus_probe(parent, match, aux)
} }
void void
com_localbus_attach(parent, self, aux) com_algor_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {

6
sys/arch/arc/dev/lpt_lbus.c → sys/arch/arc/algor/lpt_algor.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_lbus.c,v 1.10 2000/06/09 05:42:00 soda Exp $ */ /* $NetBSD: lpt_algor.c,v 1.1 2000/12/24 09:25:24 ur Exp $ */
/* $OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $ */ /* $OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $ */
/* /*
@ -70,10 +70,6 @@ extern struct arc_bus_space arc_bus_io;
int lpt_localbus_probe __P((struct device *, struct cfdata *, void *)); int lpt_localbus_probe __P((struct device *, struct cfdata *, void *));
void lpt_localbus_attach __P((struct device *, struct device *, void *)); void lpt_localbus_attach __P((struct device *, struct device *, void *));
struct cfattach lpt_pica_ca = {
sizeof(struct lpt_softc), lpt_localbus_probe, lpt_localbus_attach
};
struct cfattach lpt_algor_ca = { struct cfattach lpt_algor_ca = {
sizeof(struct lpt_softc), lpt_localbus_probe, lpt_localbus_attach sizeof(struct lpt_softc), lpt_localbus_probe, lpt_localbus_attach
}; };

6
sys/arch/arc/arc/arc_trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arc_trap.c,v 1.16 2000/10/05 02:36:44 cgd Exp $ */ /* $NetBSD: arc_trap.c,v 1.17 2000/12/24 09:25:24 ur Exp $ */
/* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */ /* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */
/* /*
@ -55,8 +55,8 @@
#include <machine/intr.h> #include <machine/intr.h>
#include <machine/pio.h> #include <machine/pio.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
int arc_hardware_intr __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t)); int arc_hardware_intr __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));

32
sys/arch/arc/arc/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.12 2000/06/09 05:41:57 soda Exp $ */ /* $NetBSD: clock.c,v 1.13 2000/12/24 09:25:24 ur Exp $ */
/* $OpenBSD: clock.c,v 1.6 1998/10/15 21:30:15 imp Exp $ */ /* $OpenBSD: clock.c,v 1.6 1998/10/15 21:30:15 imp Exp $ */
/* /*
@ -69,10 +69,6 @@ struct cfattach aclock_isa_ca = {
sizeof(struct clock_softc), clockmatch, clockattach sizeof(struct clock_softc), clockmatch, clockattach
}; };
struct cfattach aclock_pica_ca = {
sizeof(struct clock_softc), clockmatch, clockattach
};
struct cfattach aclock_algor_ca = { struct cfattach aclock_algor_ca = {
sizeof(struct clock_softc), clockmatch, clockattach sizeof(struct clock_softc), clockmatch, clockattach
}; };
@ -93,23 +89,8 @@ clockmatch(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux;
/* See how many clocks this system has */ /* See how many clocks this system has */
switch (cputype) { switch (cputype) {
case ACER_PICA_61:
case MAGNUM:
case NEC_R94:
case NEC_RAx94:
case NEC_RD94:
case NEC_R96:
/* make sure that we're looking for this type of device. */
if (!BUS_MATCHNAME(ca, "dallas_rtc"))
return (0);
break;
case DESKSTATION_RPC44: case DESKSTATION_RPC44:
case DESKSTATION_TYNE: case DESKSTATION_TYNE:
case ALGOR_P4032: case ALGOR_P4032:
@ -145,22 +126,11 @@ clockattach(parent, self, aux)
mcclock_attach(parent, self, aux); mcclock_attach(parent, self, aux);
switch (cputype) { switch (cputype) {
case ACER_PICA_61:
case ALGOR_P4032: case ALGOR_P4032:
case NEC_R94:
case NEC_RAx94:
case NEC_RD94:
case NEC_R96:
BUS_INTR_ESTABLISH((struct confargs *)aux, BUS_INTR_ESTABLISH((struct confargs *)aux,
(intr_handler_t)hardclock, self); (intr_handler_t)hardclock, self);
break; break;
case MAGNUM:
BUS_INTR_ESTABLISH((struct confargs *)aux,
(intr_handler_t)clockintr, self);
break;
case DESKSTATION_RPC44: case DESKSTATION_RPC44:
case DESKSTATION_TYNE: case DESKSTATION_TYNE:
(void)isa_intr_establish(ia->ia_ic, (void)isa_intr_establish(ia->ia_ic,

6
sys/arch/arc/arc/clock_mc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock_mc.c,v 1.9 2000/08/03 23:58:23 soda Exp $ */ /* $NetBSD: clock_mc.c,v 1.10 2000/12/24 09:25:24 ur Exp $ */
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */ /* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */ /* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
@ -58,8 +58,8 @@
#include <arc/arc/clockvar.h> #include <arc/arc/clockvar.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <arc/algor/algor.h> #include <arc/algor/algor.h>
#include <machine/isa_machdep.h> #include <machine/isa_machdep.h>
#include <arc/isa/timerreg.h> #include <arc/isa/timerreg.h>

6
sys/arch/arc/arc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.46 2000/11/27 05:57:25 soren Exp $ */ /* $NetBSD: machdep.c,v 1.47 2000/12/24 09:25:25 ur Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */ /* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/* /*
@ -97,8 +97,8 @@
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/arc/arcbios.h> #include <arc/arc/arcbios.h>
#include <arc/arc/wired_map.h> #include <arc/arc/wired_map.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <arc/dti/desktech.h> #include <arc/dti/desktech.h>
#include <arc/algor/algor.h> #include <arc/algor/algor.h>

4
sys/arch/arc/arc/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.12 2000/06/09 05:41:58 soda Exp $ */ /* $NetBSD: mainbus.c,v 1.13 2000/12/24 09:25:25 ur Exp $ */
/* $OpenBSD: mainbus.c,v 1.4 1998/10/15 21:30:15 imp Exp $ */ /* $OpenBSD: mainbus.c,v 1.4 1998/10/15 21:30:15 imp Exp $ */
/* NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp */ /* NetBSD: mainbus.c,v 1.3 1995/06/28 02:45:10 cgd Exp */
@ -109,7 +109,7 @@ mbattach(parent, self, aux)
case NEC_RAx94: case NEC_RAx94:
case NEC_RD94: case NEC_RD94:
case NEC_R96: case NEC_R96:
nca.ca_name = "pica"; nca.ca_name = "jazzio";
nca.ca_slot = 0; nca.ca_slot = 0;
nca.ca_offset = 0; nca.ca_offset = 0;
nca.ca_bus = &sc->sc_bus; nca.ca_bus = &sc->sc_bus;

32
sys/arch/arc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.40 2000/12/19 10:42:03 bouyer Exp $ # $NetBSD: GENERIC,v 1.41 2000/12/24 09:25:25 ur Exp $
# $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
# #
# GENERIC -- everything that's currently supported # GENERIC -- everything that's currently supported
@ -6,7 +6,7 @@
include "arch/arc/conf/std.arc" include "arch/arc/conf/std.arc"
#ident "GENERIC-$Revision: 1.40 $" #ident "GENERIC-$Revision: 1.41 $"
maxusers 32 # estimated number of users maxusers 32 # estimated number of users
@ -121,26 +121,26 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
#pc0 at pica? #pc0 at jazzio?
#opms0 at pica? #opms0 at jazzio?
vga0 at pica? # Jazz localbus VGA vga0 at jazzio? # Jazz localbus VGA
pckbc0 at pica? # PC keyboard controller pckbc0 at jazzio? # PC keyboard controller
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at pica? asc0 at jazzio?
scsibus* at asc? scsibus* at asc?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### ISA bus devices #### ISA bus devices

30
sys/arch/arc/conf/M403
View File

@ -1,4 +1,4 @@
# $NetBSD: M403,v 1.10 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: M403,v 1.11 2000/12/24 09:25:25 ur Exp $
# #
# configuration file for MIPS Magnum 4000 system # configuration file for MIPS Magnum 4000 system
# #
@ -116,27 +116,27 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
#pc0 at pica? #pc0 at jazzio?
#opms0 at pica? #opms0 at jazzio?
vga0 at pica? # Jazz localbus VGA vga0 at jazzio? # Jazz localbus VGA
pckbc0 at pica? # PC keyboard controller pckbc0 at jazzio? # PC keyboard controller
options COM_FREQ_MAGNUM=8192000 # 8.192 MHz - NEC M403 options COM_FREQ_MAGNUM=8192000 # 8.192 MHz - NEC M403
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at pica? asc0 at jazzio?
scsibus* at asc? scsibus* at asc?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### ISA bus devices #### ISA bus devices

28
sys/arch/arc/conf/MIMORI
View File

@ -1,4 +1,4 @@
# $NetBSD: MIMORI,v 1.3 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: MIMORI,v 1.4 2000/12/24 09:25:25 ur Exp $
# NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp # NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
# #
# MIMORI -- My NEC RISCstation 2250 (ur) # MIMORI -- My NEC RISCstation 2250 (ur)
@ -118,23 +118,23 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
#pc0 at pica? #pc0 at jazzio?
#opms0 at pica? #opms0 at jazzio?
#vga0 at pica? # Jazz localbus VGA #vga0 at jazzio? # Jazz localbus VGA
pckbc0 at pica? # PC keyboard controller pckbc0 at jazzio? # PC keyboard controller
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### PCI bus devices #### PCI bus devices

26
sys/arch/arc/conf/PCCONS
View File

@ -1,4 +1,4 @@
# $NetBSD: PCCONS,v 1.4 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: PCCONS,v 1.5 2000/12/24 09:25:25 ur Exp $
# $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
# #
# PCCONS -- generic but pccons rather than wscons # PCCONS -- generic but pccons rather than wscons
@ -119,24 +119,24 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
pc0 at pica? pc0 at jazzio?
opms0 at pica? opms0 at jazzio?
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at pica? asc0 at jazzio?
scsibus* at asc? scsibus* at asc?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### ISA bus devices #### ISA bus devices

30
sys/arch/arc/conf/PICA
View File

@ -1,4 +1,4 @@
# $NetBSD: PICA,v 1.23 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: PICA,v 1.24 2000/12/24 09:25:25 ur Exp $
# #
# configuration file for ACER PICA system # configuration file for ACER PICA system
# #
@ -116,26 +116,26 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
#pc0 at pica? #pc0 at jazzio?
#opms0 at pica? #opms0 at jazzio?
vga0 at pica? # Jazz localbus VGA vga0 at jazzio? # Jazz localbus VGA
pckbc0 at pica? # PC keyboard controller pckbc0 at jazzio? # PC keyboard controller
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at pica? asc0 at jazzio?
scsibus* at asc? scsibus* at asc?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### ISA bus devices #### ISA bus devices

30
sys/arch/arc/conf/RAMDISK
View File

@ -1,4 +1,4 @@
# $NetBSD: RAMDISK,v 1.11 2000/09/24 15:59:28 jdolecek Exp $ # $NetBSD: RAMDISK,v 1.12 2000/12/24 09:25:25 ur Exp $
# $OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $ # $OpenBSD: RAMDISK,v 1.9 1999/08/29 12:14:03 niklas Exp $
# #
# memory disk based configuration file for MIPS R4x00 ARC Systems # memory disk based configuration file for MIPS R4x00 ARC Systems
@ -125,26 +125,26 @@ config netbsd root on ? type ?
mainbus0 at root mainbus0 at root
cpu* at mainbus0 cpu* at mainbus0
#### Pica bus devices #### Jazz-Internal bus devices
pica* at mainbus0 # ACER Pica systems local bus. jazzio* at mainbus0 # Jazz-Internal bus.
aclock0 at pica? aclock0 at jazzio?
#pc0 at pica? #pc0 at jazzio?
#opms0 at pica? #opms0 at jazzio?
vga0 at pica? # Jazz localbus VGA vga0 at jazzio? # Jazz localbus VGA
pckbc0 at pica? # PC keyboard controller pckbc0 at jazzio? # PC keyboard controller
com0 at pica? com0 at jazzio?
com1 at pica? com1 at jazzio?
lpt0 at pica? lpt0 at jazzio?
sn0 at pica? sn0 at jazzio?
fdc0 at pica? fdc0 at jazzio?
fd* at fdc? drive ? fd* at fdc? drive ?
asc0 at pica? asc0 at jazzio?
scsibus* at asc? scsibus* at asc?
#siop0 at pica? #siop0 at jazzio?
#scsibus* at siop? #scsibus* at siop?
#### ISA bus devices #### ISA bus devices

71
sys/arch/arc/conf/files.arc
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arc,v 1.24 2000/11/08 19:48:51 ad Exp $ # $NetBSD: files.arc,v 1.25 2000/12/24 09:25:25 ur Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $ # $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
# #
# maxpartitions must be first item in files.${ARCH} # maxpartitions must be first item in files.${ARCH}
@ -12,7 +12,6 @@ maxusers 2 8 64
file arch/arc/arc/autoconf.c file arch/arc/arc/autoconf.c
file arch/arc/arc/conf.c file arch/arc/arc/conf.c
file arch/arc/arc/disksubr.c file arch/arc/arc/disksubr.c
file arch/arc/dev/dma.c
file arch/arc/arc/machdep.c file arch/arc/arc/machdep.c
#file arch/arc/arc/minidebug.c #file arch/arc/arc/minidebug.c
file arch/arc/arc/arc_trap.c file arch/arc/arc/arc_trap.c
@ -54,13 +53,14 @@ attach cpu at mainbus
file arch/arc/arc/cpu.c cpu file arch/arc/arc/cpu.c cpu
# #
# Magnum and PICA bus autoconfiguration devices # Magnum and Jazz-Internal bus autoconfiguration devices
# #
device pica {} device jazzio {}
attach pica at mainbus # optional attach jazzio at mainbus # optional
file arch/arc/pica/picabus.c pica file arch/arc/jazz/jazzio.c jazzio
file arch/arc/jazz/jazzdmatlb.c # XXX pica file arch/arc/jazz/dma.c # XXX jazzio
file arch/arc/jazz/bus_dma_jazz.c # XXX pica file arch/arc/jazz/jazzdmatlb.c # XXX jazzio
file arch/arc/jazz/bus_dma_jazz.c # XXX jazzio
# #
# ALGOR bus autoconfiguration devices # ALGOR bus autoconfiguration devices
@ -91,10 +91,10 @@ device necpb: pcibus
attach necpb at mainbus # optional attach necpb at mainbus # optional
file arch/arc/pci/necpb.c necpb file arch/arc/pci/necpb.c necpb
# Ethernet chip on PICA bus # Ethernet chip on Jazz-Internal bus
device sn: ifnet, ether, arp device sn: ifnet, ether, arp
attach sn at pica attach sn at jazzio
file arch/arc/dev/if_sn.c sn file arch/arc/jazz/if_sn.c sn
# #
# Machine-independent MII/PHY drivers. # Machine-independent MII/PHY drivers.
@ -111,33 +111,33 @@ include "dev/scsipi/files.scsipi"
major {sd = 0} major {sd = 0}
major {cd = 3} major {cd = 3}
# Symbios 53C94 SCSI interface driver on PICA bus # Symbios 53C94 SCSI interface driver on Jazz-Internal bus
device asc: scsi device asc: scsi
attach asc at pica attach asc at jazzio
file arch/arc/dev/asc.c asc file arch/arc/jazz/asc.c asc
# Floppy disk controller on PICA bus # Floppy disk controller on Jazz-internal bus
device fdc {drive = -1} device fdc {drive = -1}
attach fdc at pica attach fdc at jazzio
device fd: disk device fd: disk
attach fd at fdc attach fd at fdc
file arch/arc/dev/fd.c fdc needs-flag file arch/arc/jazz/fd.c fdc needs-flag
major {fd = 7} major {fd = 7}
# bus independent raster console glue # bus independent raster console glue
device rasdisplay: wsemuldisplaydev, pcdisplayops device rasdisplay: wsemuldisplaydev, pcdisplayops
file arch/arc/dev/rasdisplay.c rasdisplay file arch/arc/dev/rasdisplay.c rasdisplay
# raster console glue on PICA bus # raster console glue on Jazz-Internal bus
attach rasdisplay at pica with rasdisplay_jazzio attach rasdisplay at jazzio with rasdisplay_jazzio
file arch/arc/jazz/rasdisplay_jazzio.c rasdisplay_jazzio needs-flag file arch/arc/jazz/rasdisplay_jazzio.c rasdisplay_jazzio needs-flag
# VGA display driver on PICA bus # VGA display driver on Jazz-Internal bus
attach vga at pica with vga_jazzio attach vga at jazzio with vga_jazzio
file arch/arc/jazz/vga_jazzio.c vga_jazzio needs-flag file arch/arc/jazz/vga_jazzio.c vga_jazzio needs-flag
# PC keyboard controller on PICA bus # PC keyboard controller on Jazz-Internal bus
attach pckbc at pica with pckbc_jazzio attach pckbc at jazzio with pckbc_jazzio
file arch/arc/jazz/pckbc_jazzio.c pckbc_jazzio needs-flag file arch/arc/jazz/pckbc_jazzio.c pckbc_jazzio needs-flag
# #
@ -152,19 +152,20 @@ file arch/arc/pci/pciide_machdep.c pciide
# Real time clock, must have one.. # Real time clock, must have one..
device aclock device aclock
attach aclock at pica with aclock_pica attach aclock at jazzio with aclock_jazzio
attach aclock at isa with aclock_isa attach aclock at isa with aclock_isa
attach aclock at algor with aclock_algor attach aclock at algor with aclock_algor
file arch/arc/arc/clock.c aclock & (aclock_isa | aclock_pica | aclock_algor) needs-flag file arch/arc/arc/clock.c aclock needs-flag
file arch/arc/arc/clock_mc.c aclock & (aclock_isa | aclock_pica | aclock_algor) needs-flag file arch/arc/arc/clock_mc.c aclock needs-flag
file arch/arc/jazz/clock_jazzio.c aclock & aclock_jazzio needs-flag
# Console driver on PC-style graphics # Console driver on PC-style graphics
device pc: tty device pc: tty
attach pc at pica with pc_pica attach pc at jazzio with pc_jazzio
attach pc at isa with pc_isa attach pc at isa with pc_isa
device opms: tty device opms: tty
attach opms at pica attach opms at jazzio
file arch/arc/dev/pccons.c pc & (pc_pica | pc_isa | opms) needs-flag file arch/arc/dev/pccons.c pc & (pc_jazzio | pc_isa | opms) needs-flag
# BusLogic BT-445C VLB SCSI Controller. Special on TYNE local bus. # BusLogic BT-445C VLB SCSI Controller. Special on TYNE local bus.
device btl: scsi device btl: scsi
@ -172,9 +173,11 @@ attach btl at isa
file arch/arc/dti/btl.c btl file arch/arc/dti/btl.c btl
# NS16450/16550 Serial line driver # NS16450/16550 Serial line driver
attach com at pica with com_pica attach com at jazzio with com_jazzio
file arch/arc/jazz/com_jazzio.c com & com_jazzio
attach com at algor with com_algor attach com at algor with com_algor
file arch/arc/dev/com_lbus.c com & (com_pica | com_algor) file arch/arc/algor/com_algor.c com & com_algor
# Game adapter (joystick) # Game adapter (joystick)
device joy device joy
@ -191,9 +194,11 @@ file arch/arc/isa/joy.c joy needs-flag
#file dev/isa/if_ed.c ed & (ed_isa | ed_pcmcia) needs-flag #file dev/isa/if_ed.c ed & (ed_isa | ed_pcmcia) needs-flag
# Parallel printer port driver # Parallel printer port driver
attach lpt at pica with lpt_pica attach lpt at jazzio with lpt_jazzio
file arch/arc/jazz/lpt_jazzio.c lpt & lpt_jazzio
attach lpt at algor with lpt_algor attach lpt at algor with lpt_algor
file arch/arc/dev/lpt_lbus.c lpt & (lpt_pica | lpt_algor) file arch/arc/algor/lpt_algor.c lpt & lpt_algor
# #

15
sys/arch/arc/dev/pccons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccons.c,v 1.22 2000/11/02 00:29:17 eeh Exp $ */ /* $NetBSD: pccons.c,v 1.23 2000/12/24 09:25:27 ur Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */ /* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */ /* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */ /* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@ -79,8 +79,9 @@
#include <machine/pccons.h> #include <machine/pccons.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/arc/arcbios.h> #include <arc/arc/arcbios.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/dti/desktech.h> #include <arc/dti/desktech.h>
#include <arc/jazz/jazziovar.h>
#include <dev/isa/isavar.h> #include <dev/isa/isavar.h>
#include <machine/isa_machdep.h> #include <machine/isa_machdep.h>
@ -182,7 +183,7 @@ void pccnpollc __P((dev_t, int));
extern struct cfdriver pc_cd; extern struct cfdriver pc_cd;
struct cfattach pc_pica_ca = { struct cfattach pc_jazzio_ca = {
sizeof(struct pc_softc), pcprobe, pcattach sizeof(struct pc_softc), pcprobe, pcattach
}; };
@ -548,12 +549,12 @@ pcprobe(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
u_int i; u_int i;
/* Make shure we're looking for this type of device */ /* Make shure we're looking for this type of device */
if(!strcmp((parent)->dv_cfdata->cf_driver->cd_name, "pica")) { if(!strcmp((parent)->dv_cfdata->cf_driver->cd_name, "pica")) {
if(!BUS_MATCHNAME(ca, "pckbd")) if (strcmp(ja->ja_name, "pckbd") != 0)
return(0); return(0);
switch (cputype) { /* XXX ick */ switch (cputype) { /* XXX ick */
@ -652,7 +653,7 @@ pcattach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
struct isa_attach_args *ia = aux; struct isa_attach_args *ia = aux;
struct pc_softc *sc = (void *)self; struct pc_softc *sc = (void *)self;
@ -662,7 +663,7 @@ pcattach(parent, self, aux)
switch (cputype) { switch (cputype) {
case ACER_PICA_61: case ACER_PICA_61:
case NEC_R96: case NEC_R96:
BUS_INTR_ESTABLISH(ca, pcintr, (void *)(long)sc); jazzio_intr_establish(ja->ja_intr, pcintr, (void *)(long)sc);
break; break;
case DESKSTATION_RPC44: /* XXX ick */ case DESKSTATION_RPC44: /* XXX ick */
case DESKSTATION_TYNE: case DESKSTATION_TYNE:

6
sys/arch/arc/isa/isabus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isabus.c,v 1.13 2000/06/29 08:34:11 mrg Exp $ */ /* $NetBSD: isabus.c,v 1.14 2000/12/24 09:25:27 ur Exp $ */
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */ /* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
/* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */ /* NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp */
@ -106,8 +106,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <machine/intr.h> #include <machine/intr.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <dev/isa/isareg.h> #include <dev/isa/isareg.h>
#include <dev/isa/isavar.h> #include <dev/isa/isavar.h>

29
sys/arch/arc/dev/asc.c → sys/arch/arc/jazz/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.23 2000/06/29 08:34:11 mrg Exp $ */ /* $NetBSD: asc.c,v 1.1 2000/12/24 09:25:27 ur Exp $ */
/* $OpenBSD: asc.c,v 1.9 1998/03/16 09:38:39 pefo Exp $ */ /* $OpenBSD: asc.c,v 1.9 1998/03/16 09:38:39 pefo Exp $ */
/* NetBSD: asc.c,v 1.10 1994/12/05 19:11:12 dean Exp */ /* NetBSD: asc.c,v 1.10 1994/12/05 19:11:12 dean Exp */
@ -140,12 +140,13 @@
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <arc/jazz/jazziovar.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/dev/dma.h> #include <arc/jazz/dma.h>
#include <arc/dev/scsi.h> #include <arc/jazz/scsi.h>
#include <arc/dev/ascreg.h> #include <arc/jazz/ascreg.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
@ -497,11 +498,11 @@ ascmatch(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
if(!BUS_MATCHNAME(ca, "asc")) if(strcmp(ja->ja_name, "asc") != 0)
return(0); return (0);
return(1); return (1);
} }
void void
@ -510,16 +511,16 @@ ascattach(parent, self, aux)
struct device *self; struct device *self;
void *aux; void *aux;
{ {
register struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
register asc_softc_t asc = (void *)self; asc_softc_t asc = (void *)self;
register asc_regmap_t *regs; asc_regmap_t *regs;
int id, s, i; int id, s, i;
int bufsiz; int bufsiz;
/* /*
* Initialize hw descriptor, cache some pointers * Initialize hw descriptor, cache some pointers
*/ */
asc->regs = (asc_regmap_t *)BUS_CVTADDR(ca); asc->regs = (asc_regmap_t *)ja->ja_addr; /* XXX */
/* /*
* Set up machine dependencies. * Set up machine dependencies.
@ -617,7 +618,7 @@ ascattach(parent, self, aux)
/* /*
* Set up interrupt handler. * Set up interrupt handler.
*/ */
BUS_INTR_ESTABLISH(ca, asc_intr, (void *)asc); jazzio_intr_establish(ja->ja_intr, asc_intr, (void *)asc);
printf(": %s, target %d\n", asc->is24bit ? "NCR53CF9X-2" : "NCR53C94", printf(": %s, target %d\n", asc->is24bit ? "NCR53CF9X-2" : "NCR53C94",
id); id);

2
sys/arch/arc/dev/ascreg.h → sys/arch/arc/jazz/ascreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ascreg.h,v 1.6 2000/01/23 21:01:53 soda Exp $ */ /* $NetBSD: ascreg.h,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: ascreg.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */ /* $OpenBSD: ascreg.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */
/*- /*-

142
sys/arch/arc/jazz/clock_jazzio.c Normal file
View File

@ -0,0 +1,142 @@
/* $NetBSD: clock_jazzio.c,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: clock.c,v 1.6 1998/10/15 21:30:15 imp Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom.
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* the Systems Programming Group of the University of Utah Computer
* Science Department and Ralph Campbell.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: Utah Hdr: clock.c 1.18 91/01/21
*
* from: @(#)clock.c 8.1 (Berkeley) 6/10/93
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
#include <machine/cpu.h>
#include <arc/arc/clockvar.h>
#include <arc/arc/arctype.h>
#include <arc/jazz/jazziovar.h>
#include <dev/isa/isavar.h>
#include <machine/isa_machdep.h>
int clock_found = 0;
extern int clock_started;
/* Definition of the driver for autoconfig. */
static int clock_jazzio_match(struct device *, struct cfdata *, void *);
static void clock_jazzio_attach(struct device *, struct device *, void *);
extern struct cfdriver aclock_cd;
struct cfattach aclock_jazzio_ca = {
sizeof(struct clock_softc), clock_jazzio_match, clock_jazzio_attach
};
void mcclock_attach(struct device *, struct device *, void *);
int clockintr(void *);
static int
clock_jazzio_match(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct jazzio_attach_args *ja = aux;
/* See how many clocks this system has */
switch (cputype) {
case ACER_PICA_61:
case MAGNUM:
case NEC_R94:
case NEC_RAx94:
case NEC_RD94:
case NEC_R96:
/* make sure that we're looking for this type of device. */
if (strcmp(ja->ja_name, "dallas_rtc") != 0)
return (0);
break;
default:
panic("unknown CPU");
}
if (clock_found)
return (0);
return (1);
}
static void
clock_jazzio_attach(parent, self, aux)
struct device *parent;
struct device *self;
void *aux;
{
struct jazzio_attach_args *ja = aux;
mcclock_attach(parent, self, aux);
switch (cputype) {
case ACER_PICA_61:
case NEC_R94:
case NEC_RAx94:
case NEC_RD94:
case NEC_R96:
jazzio_intr_establish(ja->ja_intr,
(intr_handler_t)hardclock, self);
break;
case MAGNUM:
jazzio_intr_establish(ja->ja_intr,
(intr_handler_t)clockintr, self);
break;
default:
panic("clockattach: it didn't get here. really.");
}
printf("\n");
clock_found = 1;
}

155
sys/arch/arc/jazz/com_jazzio.c Normal file
View File

@ -0,0 +1,155 @@
/* $NetBSD: com_jazzio.c,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: com_lbus.c,v 1.7 1998/03/16 09:38:41 pefo Exp $ */
/* NetBSD: com_isa.c,v 1.12 1998/08/15 17:47:17 mycroft Exp */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Charles M. Hannum.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/*-
* Copyright (c) 1991 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)com.c 7.5 (Berkeley) 5/16/91
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <arc/jazz/jazziovar.h>
#include <dev/isa/isavar.h> /* XXX for isa_chipset_tag_t in com_softc */
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
#include <dev/ic/ns16550reg.h>
extern int com_freq;
int com_jazzio_probe __P((struct device *, struct cfdata *, void *));
void com_jazzio_attach __P((struct device *, struct device *, void *));
struct cfattach com_jazzio_ca = {
sizeof(struct com_softc), com_jazzio_probe, com_jazzio_attach
};
int
com_jazzio_probe(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct jazzio_attach_args *ja = aux;
bus_space_tag_t iot;
bus_space_handle_t ioh;
int iobase;
int rv = 1;
if(strcmp(ja->ja_name, "com") != 0)
return (0);
iot = ja->ja_bust;
iobase = ja->ja_addr;
/* if it's in use as console, it's there. */
if (!com_is_console(iot, iobase, 0)) {
if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
return 0;
}
rv = comprobe1(iot, ioh);
bus_space_unmap(iot, ioh, COM_NPORTS);
}
return (rv);
}
void
com_jazzio_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct jazzio_attach_args *ja = aux;
struct com_softc *sc = (void *)self;
int iobase;
bus_space_tag_t iot;
sc->sc_iobase = iobase = ja->ja_addr;
sc->sc_iot = iot = ja->ja_bust;
if (!com_is_console(iot, iobase, &sc->sc_ioh) &&
bus_space_map(iot, iobase, COM_NPORTS, 0, &sc->sc_ioh)) {
printf(": can't map i/o space\n");
return;
}
sc->sc_frequency = com_freq;
SET(sc->sc_hwflags, COM_HW_TXFIFO_DISABLE); /* XXX - NEC M403 */
jazzio_intr_establish(ja->ja_intr, comintr, sc);
com_attach_subr(sc);
}

56
sys/arch/arc/dev/dma.c → sys/arch/arc/jazz/dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.17 2000/06/29 08:34:11 mrg Exp $ */ /* $NetBSD: dma.c,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */ /* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */
/* /*
@ -60,12 +60,12 @@
#include <dev/scsipi/scsipi_all.h> #include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h> #include <dev/scsipi/scsiconf.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h> #include <arc/jazz/jazzdmatlbvar.h>
#include <arc/dev/dma.h> #include <arc/jazz/dma.h>
void picaDmaReset __P((dma_softc_t *sc)); void picaDmaReset __P((dma_softc_t *sc));
void picaDmaEnd __P((dma_softc_t *sc)); void picaDmaEnd __P((dma_softc_t *sc));
@ -115,24 +115,6 @@ picaDmaTLBFree(dma_softc_t *dma)
/*XXX Wakeup waiting */ /*XXX Wakeup waiting */
} }
/*
* Map up a viritual address space in dma space given by
* the dma control structure and invalidate dma TLB cache.
*/
void
picaDmaTLBMap(dma_softc_t *sc)
{
vaddr_t va;
jazz_dma_pte_t *dma_pte;
va = sc->next_va - sc->dma_va;
dma_pte = sc->pte_base + (va / JAZZ_DMA_PAGE_SIZE);
jazz_dmatlb_map_va(NULL, sc->req_va, sc->next_size, dma_pte);
}
/* /*
* Start local dma channel. * Start local dma channel.
*/ */
@ -144,6 +126,8 @@ picaDmaStart(sc, addr, size, datain)
int datain; int datain;
{ {
pDmaReg regs = sc->dma_reg; pDmaReg regs = sc->dma_reg;
vaddr_t va;
jazz_dma_pte_t *dma_pte;
/* Halt DMA */ /* Halt DMA */
regs->dma_enab = 0; regs->dma_enab = 0;
@ -151,17 +135,15 @@ picaDmaStart(sc, addr, size, datain)
/* Remap request space va into dma space va */ /* Remap request space va into dma space va */
sc->req_va = (int)addr;
sc->next_va = sc->dma_va + jazz_dma_page_offs(addr);
sc->next_size = size;
/* Map up the request viritual dma space */ /* Map up the request viritual dma space */
picaDmaTLBMap(sc); va = jazz_dma_page_offs(addr);
dma_pte = sc->pte_base + (va / JAZZ_DMA_PAGE_SIZE);
jazz_dmatlb_map_va(NULL, (vaddr_t)addr, size, dma_pte);
jazz_dmatlb_flush(); jazz_dmatlb_flush();
/* Load new transfer parameters */ /* Load new transfer parameters */
regs->dma_addr = sc->next_va; regs->dma_addr = sc->dma_va + va;
regs->dma_count = sc->next_size;
regs->dma_mode = sc->mode & R4030_DMA_MODE; regs->dma_mode = sc->mode & R4030_DMA_MODE;
sc->sc_active = 1; sc->sc_active = 1;
@ -187,14 +169,17 @@ picaDmaMap(sc, addr, size, offset)
size_t size; size_t size;
int offset; int offset;
{ {
vaddr_t va;
jazz_dma_pte_t *dma_pte;
/* Remap request space va into dma space va */ /* Remap request space va into dma space va */
sc->req_va = (vaddr_t)addr;
sc->next_va = sc->dma_va + jazz_dma_page_offs(addr) + offset;
sc->next_size = size;
/* Map up the request viritual dma space */ /* Map up the request viritual dma space */
picaDmaTLBMap(sc);
va = jazz_dma_page_offs(addr) + offset;
dma_pte = sc->pte_base + (va / JAZZ_DMA_PAGE_SIZE);
jazz_dmatlb_map_va(NULL, (vaddr_t)addr, size, dma_pte);
} }
/* /*
@ -231,9 +216,6 @@ void
picaDmaEnd(dma_softc_t *sc) picaDmaEnd(dma_softc_t *sc)
{ {
pDmaReg regs = sc->dma_reg; pDmaReg regs = sc->dma_reg;
int res;
res = regs->dma_count = sc->next_size;
/* Halt DMA */ /* Halt DMA */
regs->dma_enab = 0; regs->dma_enab = 0;

8
sys/arch/arc/dev/dma.h → sys/arch/arc/jazz/dma.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.h,v 1.7 2000/06/09 05:22:25 soda Exp $ */ /* $NetBSD: dma.h,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: dma.h,v 1.3 1997/04/19 17:19:51 pefo Exp $ */ /* $OpenBSD: dma.h,v 1.3 1997/04/19 17:19:51 pefo Exp $ */
/* /*
@ -80,16 +80,11 @@ typedef struct dma_softc {
struct device sc_dev; /* use as a device */ struct device sc_dev; /* use as a device */
struct esp_softc *sc_esp; struct esp_softc *sc_esp;
bus_addr_t dma_va; /* Viritual address for transfer */ bus_addr_t dma_va; /* Viritual address for transfer */
vaddr_t req_va; /* Original request va */
bus_addr_t next_va; /* Value to program into dma regs */
int next_size; /* Value to program into dma regs */
int mode; /* Mode register value and direction */ int mode; /* Mode register value and direction */
jazz_dma_pte_t *pte_base; /* Pointer to dma tlb array */ jazz_dma_pte_t *pte_base; /* Pointer to dma tlb array */
int pte_size; /* Size of pte allocated pte array */ int pte_size; /* Size of pte allocated pte array */
pDmaReg dma_reg; /* Pointer to dma registers */ pDmaReg dma_reg; /* Pointer to dma registers */
int sc_active; /* Active flag */ int sc_active; /* Active flag */
char **sc_dmaaddr; /* Pointer to dma address in dev */
int *sc_dmalen; /* Pointer to len counter in dev */
void (*reset)(struct dma_softc *); /* Reset routine pointer */ void (*reset)(struct dma_softc *); /* Reset routine pointer */
void (*enintr)(struct dma_softc *); /* Int enab routine pointer */ void (*enintr)(struct dma_softc *); /* Int enab routine pointer */
void (*map)(struct dma_softc *, char *, size_t, int); void (*map)(struct dma_softc *, char *, size_t, int);
@ -114,7 +109,6 @@ typedef struct dma_softc {
void picaDmaInit __P((void)); void picaDmaInit __P((void));
void picaDmaTLBAlloc __P((dma_softc_t *)); void picaDmaTLBAlloc __P((dma_softc_t *));
void picaDmaTLBFree __P((dma_softc_t *)); void picaDmaTLBFree __P((dma_softc_t *));
void picaDmaTLBMap __P((dma_softc_t *));
void picaDmaMap __P((struct dma_softc *, char *, size_t, int)); void picaDmaMap __P((struct dma_softc *, char *, size_t, int));
void picaDmaStart __P((struct dma_softc *, char *, size_t, int)); void picaDmaStart __P((struct dma_softc *, char *, size_t, int));
void picaDmaFlush __P((struct dma_softc *, char *, size_t, int)); void picaDmaFlush __P((struct dma_softc *, char *, size_t, int));

19
sys/arch/arc/dev/fd.c → sys/arch/arc/jazz/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.23 2000/06/29 08:34:11 mrg Exp $ */ /* $NetBSD: fd.c,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */ /* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */ /* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@ -100,9 +100,10 @@
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <mips/locore.h> /* for mips3_HitFlushDCache() */ #include <mips/locore.h> /* for mips3_HitFlushDCache() */
#include <arc/dev/fdreg.h> #include <arc/jazz/fdreg.h>
#include <arc/jazz/jazziovar.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/dev/dma.h> #include <arc/jazz/dma.h>
#include "locators.h" #include "locators.h"
@ -264,10 +265,10 @@ fdcprobe(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
register struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
int iobase = (long)BUS_CVTADDR(ca); int iobase = ja->ja_addr;
if (!BUS_MATCHNAME(ca, "fdc")) if (strcmp(ja->ja_name, "fdc") != 0)
return (0); return (0);
/* reset */ /* reset */
@ -317,11 +318,11 @@ fdcattach(parent, self, aux)
void *aux; void *aux;
{ {
struct fdc_softc *fdc = (void *)self; struct fdc_softc *fdc = (void *)self;
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
struct fdc_attach_args fa; struct fdc_attach_args fa;
int type; int type;
fdc->sc_iobase = (long)BUS_CVTADDR(ca); fdc->sc_iobase = ja->ja_addr;
fdc->sc_state = DEVIDLE; fdc->sc_state = DEVIDLE;
TAILQ_INIT(&fdc->sc_drives); TAILQ_INIT(&fdc->sc_drives);
@ -333,7 +334,7 @@ fdcattach(parent, self, aux)
callout_init(&fdc->sc_timo_ch); callout_init(&fdc->sc_timo_ch);
callout_init(&fdc->sc_intr_ch); callout_init(&fdc->sc_intr_ch);
BUS_INTR_ESTABLISH(ca, fdcintr, fdc); jazzio_intr_establish(ja->ja_intr, fdcintr, fdc);
/* /*
* No way yet to determine default disk types. * No way yet to determine default disk types.

2
sys/arch/arc/dev/fdreg.h → sys/arch/arc/jazz/fdreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdreg.h,v 1.2 2000/01/23 21:01:54 soda Exp $ */ /* $NetBSD: fdreg.h,v 1.1 2000/12/24 09:25:28 ur Exp $ */
/* $OpenBSD: fdreg.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */ /* $OpenBSD: fdreg.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */
/* NetBSD: fdreg.h,v 1.8 1995/06/28 04:30:57 cgd Exp */ /* NetBSD: fdreg.h,v 1.8 1995/06/28 04:30:57 cgd Exp */

18
sys/arch/arc/dev/if_sn.c → sys/arch/arc/jazz/if_sn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sn.c,v 1.22 2000/11/15 01:02:12 thorpej Exp $ */ /* $NetBSD: if_sn.c,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: if_sn.c,v 1.12 1999/05/13 15:44:48 jason Exp $ */ /* $OpenBSD: if_sn.c,v 1.12 1999/05/13 15:44:48 jason Exp $ */
/* /*
@ -66,11 +66,12 @@
#include <mips/locore.h> /* for mips3_HitFlushDCache() */ #include <mips/locore.h> /* for mips3_HitFlushDCache() */
#include <arc/jazz/jazziovar.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/dev/dma.h> #include <arc/jazz/dma.h>
#define SONICDW 32 #define SONICDW 32
#include <arc/dev/if_snreg.h> #include <arc/jazz/if_snreg.h>
#define SWR(a, x) (a) = (x) #define SWR(a, x) (a) = (x)
#define SRD(a) ((a) & 0xffff) #define SRD(a) ((a) & 0xffff)
@ -247,11 +248,10 @@ snmatch(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
/* XXX CHECK BUS */
/* make sure that we're looking for this type of device. */ /* make sure that we're looking for this type of device. */
if (!BUS_MATCHNAME(ca, "sonic")) if (strcmp(ja->ja_name, "sonic") != 0)
return (0); return (0);
return (1); return (1);
@ -268,12 +268,12 @@ snattach(parent, self, aux)
void *aux; void *aux;
{ {
struct sn_softc *sc = (void *)self; struct sn_softc *sc = (void *)self;
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
struct ifnet *ifp = &sc->sc_if; struct ifnet *ifp = &sc->sc_if;
int p, pp; int p, pp;
u_int8_t myaddr[ETHER_ADDR_LEN]; u_int8_t myaddr[ETHER_ADDR_LEN];
sc->sc_csr = (struct sonic_reg *)BUS_CVTADDR(ca); sc->sc_csr = (struct sonic_reg *)ja->ja_addr; /* XXX */
sc->dma = &sc->__dma; sc->dma = &sc->__dma;
sn_dma_init(sc->dma, FRAGMAX * NTDA sn_dma_init(sc->dma, FRAGMAX * NTDA
@ -332,7 +332,7 @@ printf("sonic buffers: rra=0x%x cda=0x%x rda=0x%x tda=0x%x rba=0x%x\n",
printf("mapped to offset 0x%x size 0x%x\n", SONICBUF - pp, p - SONICBUF); printf("mapped to offset 0x%x size 0x%x\n", SONICBUF - pp, p - SONICBUF);
#endif #endif
BUS_INTR_ESTABLISH(ca, (intr_handler_t)snintr, (void *)sc); jazzio_intr_establish(ja->ja_intr, (intr_handler_t)snintr, (void *)sc);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_softc = sc; ifp->if_softc = sc;

2
sys/arch/arc/dev/if_snreg.h → sys/arch/arc/jazz/if_snreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_snreg.h,v 1.5 2000/01/23 21:01:54 soda Exp $ */ /* $NetBSD: if_snreg.h,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: if_sn.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */ /* $OpenBSD: if_sn.h,v 1.1.1.1 1996/06/24 09:07:19 pefo Exp $ */
/* /*

3
sys/arch/arc/jazz/jazzdmatlb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jazzdmatlb.c,v 1.3 2000/11/09 06:09:59 thorpej Exp $ */ /* $NetBSD: jazzdmatlb.c,v 1.4 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */ /* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */
/*- /*-
@ -43,7 +43,6 @@
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <arc/pica/pica.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h> #include <arc/jazz/jazzdmatlbvar.h>

118
sys/arch/arc/pica/picabus.c → sys/arch/arc/jazz/jazzio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: picabus.c,v 1.14 2000/06/29 08:34:12 mrg Exp $ */ /* $NetBSD: jazzio.c,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */ /* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */ /* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@ -44,36 +44,36 @@
#include <machine/pio.h> #include <machine/pio.h>
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <arc/pica/pica.h> #include <arc/jazz/jazziovar.h>
#include <arc/pica/rd94.h> #include <arc/jazz/pica.h>
#include <arc/jazz/rd94.h>
#include <arc/arc/arctype.h> #include <arc/arc/arctype.h>
#include <arc/jazz/jazzdmatlbreg.h> #include <arc/jazz/jazzdmatlbreg.h>
#include <arc/dev/dma.h> #include <arc/jazz/dma.h>
struct pica_softc { struct jazzio_softc {
struct device sc_dv; struct device sc_dv;
struct abus sc_bus; struct abus sc_bus;
struct arc_bus_dma_tag sc_dmat;
struct pica_dev *sc_devs; struct pica_dev *sc_devs;
}; };
/* Definition of the driver for autoconfig. */ /* Definition of the driver for autoconfig. */
int picamatch(struct device *, struct cfdata *, void *); int jazziomatch(struct device *, struct cfdata *, void *);
void picaattach(struct device *, struct device *, void *); void jazzioattach(struct device *, struct device *, void *);
int picaprint(void *, const char *); int jazzioprint(void *, const char *);
struct cfattach pica_ca = { struct cfattach jazzio_ca = {
sizeof(struct pica_softc), picamatch, picaattach sizeof(struct jazzio_softc), jazziomatch, jazzioattach
}; };
extern struct cfdriver pica_cd; extern struct cfdriver jazzio_cd;
void pica_intr_establish __P((struct confargs *, int (*)(void *), void *)); void jazzio_intr_establish(int, int (*)(void *), void *);
void pica_intr_disestablish __P((struct confargs *)); void jazzio_intr_disestablish(int);
caddr_t pica_cvtaddr __P((struct confargs *)); int pica_iointr(unsigned int, struct clockframe *);
int pica_matchname __P((struct confargs *, char *)); int pica_clkintr(unsigned int, struct clockframe *);
int pica_iointr __P((unsigned int, struct clockframe *)); int rd94_iointr(unsigned int, struct clockframe *);
int pica_clkintr __P((unsigned int, struct clockframe *)); int rd94_clkintr(unsigned int, struct clockframe *);
int rd94_iointr __P((unsigned int, struct clockframe *));
int rd94_clkintr __P((unsigned int, struct clockframe *));
intr_handler_t pica_clock_handler; intr_handler_t pica_clock_handler;
@ -171,7 +171,7 @@ struct pica_dev nec_rd94_cpu[] = {
0, pica_intrnull, (void *)NULL, }, 0, pica_intrnull, (void *)NULL, },
{{ "sonic", 4, 0, }, {{ "sonic", 4, 0, },
RD94_SYS_LB_IE_SONIC, pica_intrnull, (void *)RD94_SYS_SONIC, }, RD94_SYS_LB_IE_SONIC, pica_intrnull, (void *)RD94_SYS_SONIC, },
{{ NULL, 5, NULL, }, {{ NULL, 5, 0, },
0, pica_intrnull, (void *)NULL, }, 0, pica_intrnull, (void *)NULL, },
{{ NULL, 6, NULL, }, {{ NULL, 6, NULL, },
0, pica_intrnull, (void *)NULL, }, 0, pica_intrnull, (void *)NULL, },
@ -198,10 +198,13 @@ struct pica_dev *pica_cpu_devs[] = {
}; };
int npica_cpu_devs = sizeof pica_cpu_devs / sizeof pica_cpu_devs[0]; int npica_cpu_devs = sizeof pica_cpu_devs / sizeof pica_cpu_devs[0];
int jazzio_found = 0;
int local_int_mask = 0; /* Local interrupt enable mask */ int local_int_mask = 0; /* Local interrupt enable mask */
extern struct arc_bus_space pica_bus;
int int
picamatch(parent, match, aux) jazziomatch(parent, match, aux)
struct device *parent; struct device *parent;
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
@ -209,11 +212,11 @@ picamatch(parent, match, aux)
struct confargs *ca = aux; struct confargs *ca = aux;
/* Make sure that we're looking for a PICA. */ /* Make sure that we're looking for a PICA. */
if (strcmp(ca->ca_name, pica_cd.cd_name) != 0) if (strcmp(ca->ca_name, jazzio_cd.cd_name) != 0)
return (0); return (0);
/* Make sure that unit exists. */ /* Make sure that unit exists. */
if (match->cf_unit != 0 || if (jazzio_found ||
cputype > npica_cpu_devs || pica_cpu_devs[cputype] == NULL) cputype > npica_cpu_devs || pica_cpu_devs[cputype] == NULL)
return (0); return (0);
@ -221,17 +224,19 @@ picamatch(parent, match, aux)
} }
void void
picaattach(parent, self, aux) jazzioattach(parent, self, aux)
struct device *parent; struct device *parent;
struct device *self; struct device *self;
void *aux; void *aux;
{ {
struct pica_softc *sc = (struct pica_softc *)self; struct jazzio_softc *sc = (struct jazzio_softc *)self;
struct confargs *nca; struct jazzio_attach_args ja;
int i; int i;
printf("\n"); printf("\n");
jazzio_found = 1;
/* keep our CPU device description handy */ /* keep our CPU device description handy */
sc->sc_devs = pica_cpu_devs[cputype]; sc->sc_devs = pica_cpu_devs[cputype];
@ -250,63 +255,53 @@ picaattach(parent, self, aux)
} }
sc->sc_bus.ab_dv = (struct device *)sc; sc->sc_bus.ab_dv = (struct device *)sc;
sc->sc_bus.ab_type = BUS_PICA;
sc->sc_bus.ab_intr_establish = pica_intr_establish;
sc->sc_bus.ab_intr_disestablish = pica_intr_disestablish;
sc->sc_bus.ab_cvtaddr = pica_cvtaddr;
sc->sc_bus.ab_matchname = pica_matchname;
/* Initialize PICA Dma */ /* Initialize PICA Dma */
picaDmaInit(); picaDmaInit();
/* Create bus_dma_tag */
jazz_bus_dma_tag_init(&sc->sc_dmat);
/* Try to configure each PICA attached device */ /* Try to configure each PICA attached device */
for (i = 0; sc->sc_devs[i].ps_ca.ca_slot >= 0; i++) { for (i = 0; sc->sc_devs[i].ps_ca.ca_slot >= 0; i++) {
if(sc->sc_devs[i].ps_ca.ca_name == NULL) if(sc->sc_devs[i].ps_ca.ca_name == NULL)
continue; /* Empty slot */ continue; /* Empty slot */
nca = &sc->sc_devs[i].ps_ca; ja.ja_name = sc->sc_devs[i].ps_ca.ca_name;
nca->ca_bus = &sc->sc_bus; ja.ja_bus = &sc->sc_bus;
ja.ja_bust = &pica_bus;
ja.ja_dmat = &sc->sc_dmat;
ja.ja_addr = (bus_addr_t)sc->sc_devs[i].ps_base;
ja.ja_intr = sc->sc_devs[i].ps_ca.ca_slot;
ja.ja_dma = 0;
/* Tell the autoconfig machinery we've found the hardware. */ /* Tell the autoconfig machinery we've found the hardware. */
config_found(self, nca, picaprint); config_found(self, &ja, jazzioprint);
} }
} }
int int
picaprint(aux, pnp) jazzioprint(aux, pnp)
void *aux; void *aux;
const char *pnp; const char *pnp;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
if (pnp) if (pnp)
printf("%s at %s", ca->ca_name, pnp); printf("%s at %s", ja->ja_name, pnp);
printf(" slot %d offset 0x%x", ca->ca_slot, ca->ca_offset); printf(" addr 0x%lx intr %d", ja->ja_addr, ja->ja_intr);
return (UNCONF); return (UNCONF);
} }
caddr_t
pica_cvtaddr(ca)
struct confargs *ca;
{
struct pica_softc *sc = pica_cd.cd_devs[0];
return(sc->sc_devs[ca->ca_slot].ps_base + ca->ca_offset);
}
void void
pica_intr_establish(ca, handler, val) jazzio_intr_establish(slot, handler, val)
struct confargs *ca; int slot;
intr_handler_t handler; intr_handler_t handler;
void *val; void *val;
{ {
struct pica_softc *sc = pica_cd.cd_devs[0]; struct jazzio_softc *sc = jazzio_cd.cd_devs[0];
int slot;
slot = ca->ca_slot;
if(slot == 0) { /* Slot 0 is special, clock */ if(slot == 0) { /* Slot 0 is special, clock */
pica_clock_handler = handler; pica_clock_handler = handler;
switch (cputype) { switch (cputype) {
@ -353,12 +348,9 @@ pica_intr_establish(ca, handler, val)
} }
void void
pica_intr_disestablish(ca) jazzio_intr_disestablish(slot)
struct confargs *ca;
{
int slot; int slot;
{
slot = ca->ca_slot;
if(slot != 0) { /* Slot 0 is special, clock */ if(slot != 0) { /* Slot 0 is special, clock */
local_int_mask &= ~int_table[slot].int_mask; local_int_mask &= ~int_table[slot].int_mask;
int_table[slot].int_mask = 0; int_table[slot].int_mask = 0;
@ -367,14 +359,6 @@ pica_intr_disestablish(ca)
} }
} }
int
pica_matchname(ca, name)
struct confargs *ca;
char *name;
{
return (strcmp(name, ca->ca_name) == 0);
}
int int
pica_intrnull(val) pica_intrnull(val)
void *val; void *val;

19
sys/arch/arc/jazz/jazziovar.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef __JAZZIOVAR_H
#define __JAZZIOVAR_H
#include <machine/bus.h>
struct jazzio_attach_args {
char *ja_name;
struct abus *ja_bus;
bus_space_tag_t ja_bust;
bus_dma_tag_t ja_dmat;
bus_addr_t ja_addr;
int ja_intr;
int ja_dma;
};
void jazzio_intr_establish(int, int (*)(void *), void *);
void jazzio_intr_disestablish(int);
#endif

196
sys/arch/arc/jazz/lpt_jazzio.c Normal file
View File

@ -0,0 +1,196 @@
/* $NetBSD: lpt_jazzio.c,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
* Copyright (c) 1990 William F. Jolitz, TeleMuse
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This software is a component of "386BSD" developed by
* William F. Jolitz, TeleMuse.
* 4. Neither the name of the developer nor the name "386BSD"
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS A COMPONENT OF 386BSD DEVELOPED BY WILLIAM F. JOLITZ
* AND IS INTENDED FOR RESEARCH AND EDUCATIONAL PURPOSES ONLY. THIS
* SOFTWARE SHOULD NOT BE CONSIDERED TO BE A COMMERCIAL PRODUCT.
* THE DEVELOPER URGES THAT USERS WHO REQUIRE A COMMERCIAL PRODUCT
* NOT MAKE USE OF THIS WORK.
*
* FOR USERS WHO WISH TO UNDERSTAND THE 386BSD SYSTEM DEVELOPED
* BY WILLIAM F. JOLITZ, WE RECOMMEND THE USER STUDY WRITTEN
* REFERENCES SUCH AS THE "PORTING UNIX TO THE 386" SERIES
* (BEGINNING JANUARY 1991 "DR. DOBBS JOURNAL", USA AND BEGINNING
* JUNE 1991 "UNIX MAGAZIN", GERMANY) BY WILLIAM F. JOLITZ AND
* LYNNE GREER JOLITZ, AS WELL AS OTHER BOOKS ON UNIX AND THE
* ON-LINE 386BSD USER MANUAL BEFORE USE. A BOOK DISCUSSING THE INTERNALS
* OF 386BSD ENTITLED "386BSD FROM THE INSIDE OUT" WILL BE AVAILABLE LATE 1992.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPER ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE DEVELOPER BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Device Driver for AT parallel printer port
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
#include <arc/jazz/jazziovar.h>
int lpt_jazzio_probe __P((struct device *, struct cfdata *, void *));
void lpt_jazzio_attach __P((struct device *, struct device *, void *));
struct cfattach lpt_jazzio_ca = {
sizeof(struct lpt_softc), lpt_jazzio_probe, lpt_jazzio_attach
};
/*
* XXX - copied from lpt_isa.c
* sys/arch/arm32/mainbus/lpt_pioc.c also copies this.
* sys/arch/amiga/dev/lpt_supio.c doesn't.
*/
static int lpt_port_test __P((bus_space_tag_t, bus_space_handle_t, bus_addr_t,
bus_size_t, u_char, u_char));
/*
* Internal routine to lptprobe to do port tests of one byte value.
*/
static int
lpt_port_test(iot, ioh, base, off, data, mask)
bus_space_tag_t iot;
bus_space_handle_t ioh;
bus_addr_t base;
bus_size_t off;
u_char data, mask;
{
int timeout;
u_char temp;
data &= mask;
bus_space_write_1(iot, ioh, off, data);
timeout = 1000;
do {
delay(10);
temp = bus_space_read_1(iot, ioh, off) & mask;
} while (temp != data && --timeout);
return (temp == data);
}
int
lpt_jazzio_probe(parent, match, aux)
struct device *parent;
struct cfdata *match;
void *aux;
{
struct jazzio_attach_args *ja = aux;
bus_space_tag_t iot;
bus_space_handle_t ioh;
bus_addr_t base;
u_int8_t mask, data;
int i, rv;
#ifdef DEBUG
#define ABORT \
do { \
printf("lpt_jazzio_probe: mask %x data %x failed\n", mask, \
data); \
goto out; \
} while (0)
#else
#define ABORT goto out
#endif
if(strcmp(ja->ja_name, "lpt") != 0)
return (0);
iot = ja->ja_bust;
base = ja->ja_addr;
if (bus_space_map(iot, base, LPT_NPORTS, 0, &ioh))
return 0;
rv = 0;
mask = 0xff;
data = 0x55; /* Alternating zeros */
if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
ABORT;
data = 0xaa; /* Alternating ones */
if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
ABORT;
for (i = 0; i < CHAR_BIT; i++) { /* Walking zero */
data = ~(1 << i);
if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
ABORT;
}
for (i = 0; i < CHAR_BIT; i++) { /* Walking one */
data = (1 << i);
if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
ABORT;
}
bus_space_write_1(iot, ioh, lpt_data, 0);
bus_space_write_1(iot, ioh, lpt_control, 0);
rv = 1;
out:
bus_space_unmap(iot, ioh, LPT_NPORTS);
return rv;
}
void
lpt_jazzio_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
struct lpt_softc *sc = (void *)self;
struct jazzio_attach_args *ja = aux;
bus_space_tag_t iot;
bus_space_handle_t ioh;
printf("\n");
sc->sc_state = 0;
iot = sc->sc_iot = ja->ja_bust;
if (bus_space_map(iot, ja->ja_addr, LPT_NPORTS, 0, &ioh)) {
printf("%s: can't map i/o space\n", self->dv_xname);
return;
}
sc->sc_ioh = ioh;
bus_space_write_1(iot, ioh, lpt_control, LPC_NINIT);
jazzio_intr_establish(ja->ja_intr, lptintr, sc);
}

33
sys/arch/arc/jazz/pckbc_jazzio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc_jazzio.c,v 1.1 2000/06/17 07:17:38 soda Exp $ */ /* $NetBSD: pckbc_jazzio.c,v 1.2 2000/12/24 09:25:29 ur Exp $ */
/* NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp */ /* NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp */
/* /*
@ -44,7 +44,8 @@
#include <machine/autoconf.h> #include <machine/autoconf.h>
#include <machine/bus.h> #include <machine/bus.h>
#include <arc/pica/pica.h> #include <arc/jazz/pica.h>
#include <arc/jazz/jazziovar.h>
#include <dev/ic/i8042reg.h> #include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h> #include <dev/ic/pckbcvar.h>
@ -59,7 +60,7 @@ void pckbc_jazzio_intr_establish __P((struct pckbc_softc *, pckbc_slot_t));
struct pckbc_jazzio_softc { struct pckbc_jazzio_softc {
struct pckbc_softc sc_pckbc; struct pckbc_softc sc_pckbc;
struct confargs *sc_ca[PCKBC_NSLOTS]; int sc_intr[PCKBC_NSLOTS];
}; };
struct cfattach pckbc_jazzio_ca = { struct cfattach pckbc_jazzio_ca = {
@ -67,24 +68,21 @@ struct cfattach pckbc_jazzio_ca = {
pckbc_jazzio_match, pckbc_jazzio_attach, pckbc_jazzio_match, pckbc_jazzio_attach,
}; };
extern struct arc_bus_space pica_bus; /* XXX */
int int
pckbc_jazzio_match(parent, match, aux) pckbc_jazzio_match(parent, match, aux)
struct device *parent; struct device *parent;
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
bus_space_tag_t iot = &pica_bus; bus_space_tag_t iot = ja->ja_bust;
bus_space_handle_t ioh_d, ioh_c; bus_space_handle_t ioh_d, ioh_c;
bus_addr_t addr; bus_addr_t addr = ja->ja_addr;
int res, ok = 1; int res, ok = 1;
if(!BUS_MATCHNAME(ca, "pckbd")) if (strcmp(ja->ja_name, "pckbd") != 0)
return(0); return(0);
addr = (bus_addr_t)BUS_CVTADDR(ca);
if (pckbc_is_console(iot, addr) == 0) { if (pckbc_is_console(iot, addr) == 0) {
if (bus_space_map(iot, addr + KBDATAP, 1, 0, &ioh_d)) if (bus_space_map(iot, addr + KBDATAP, 1, 0, &ioh_d))
return (0); return (0);
@ -119,14 +117,13 @@ pckbc_jazzio_attach(parent, self, aux)
struct device *parent, *self; struct device *parent, *self;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
struct pckbc_jazzio_softc *jsc = (void *)self; struct pckbc_jazzio_softc *jsc = (void *)self;
struct pckbc_softc *sc = &jsc->sc_pckbc; struct pckbc_softc *sc = &jsc->sc_pckbc;
struct pckbc_internal *t; struct pckbc_internal *t;
bus_space_tag_t iot = &pica_bus; bus_space_tag_t iot = ja->ja_bust;
bus_space_handle_t ioh_d, ioh_c; bus_space_handle_t ioh_d, ioh_c;
bus_addr_t addr; bus_addr_t addr = ja->ja_addr;
static struct confargs pms_ca = { "pms", 8, NULL, }; /* XXX */
sc->intr_establish = pckbc_jazzio_intr_establish; sc->intr_establish = pckbc_jazzio_intr_establish;
@ -135,11 +132,9 @@ pckbc_jazzio_attach(parent, self, aux)
* *
* XXX handcrafting "aux" slot... * XXX handcrafting "aux" slot...
*/ */
pms_ca.ca_bus = ca->ca_bus; jsc->sc_intr[PCKBC_KBD_SLOT] = ja->ja_intr;
jsc->sc_ca[PCKBC_KBD_SLOT] = ca; jsc->sc_intr[PCKBC_AUX_SLOT] = 8; /* XXX */
jsc->sc_ca[PCKBC_AUX_SLOT] = &pms_ca;
addr = (bus_addr_t)BUS_CVTADDR(ca);
if (pckbc_is_console(iot, addr)) { if (pckbc_is_console(iot, addr)) {
t = &pckbc_consdata; t = &pckbc_consdata;
ioh_d = t->t_ioh_d; ioh_d = t->t_ioh_d;
@ -177,5 +172,5 @@ pckbc_jazzio_intr_establish(sc, slot)
{ {
struct pckbc_jazzio_softc *jsc = (void *) sc; struct pckbc_jazzio_softc *jsc = (void *) sc;
BUS_INTR_ESTABLISH(jsc->sc_ca[slot], pckbcintr, sc); jazzio_intr_establish(jsc->sc_intr[slot], pckbcintr, sc);
} }

2
sys/arch/arc/pica/pica.h → sys/arch/arc/jazz/pica.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pica.h,v 1.4 2000/01/23 21:02:00 soda Exp $ */ /* $NetBSD: pica.h,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: pica.h,v 1.4 1996/09/14 15:58:28 pefo Exp $ */ /* $OpenBSD: pica.h,v 1.4 1996/09/14 15:58:28 pefo Exp $ */
/* /*

2
sys/arch/arc/pica/rd94.h → sys/arch/arc/jazz/rd94.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd94.h,v 1.2 2000/06/09 05:33:06 soda Exp $ */ /* $NetBSD: rd94.h,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: pica.h,v 1.4 1996/09/14 15:58:28 pefo Exp $ */ /* $OpenBSD: pica.h,v 1.4 1996/09/14 15:58:28 pefo Exp $ */
/* /*

2
sys/arch/arc/dev/scsi.h → sys/arch/arc/jazz/scsi.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi.h,v 1.4 2000/01/23 21:01:54 soda Exp $ */ /* $NetBSD: scsi.h,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $OpenBSD: scsi.h,v 1.2 1997/04/19 17:19:54 pefo Exp $ */ /* $OpenBSD: scsi.h,v 1.2 1997/04/19 17:19:54 pefo Exp $ */
/* /*

9
sys/arch/arc/jazz/vga_jazzio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_jazzio.c,v 1.3 2000/08/14 20:14:50 thorpej Exp $ */ /* $NetBSD: vga_jazzio.c,v 1.4 2000/12/24 09:25:30 ur Exp $ */
/* NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp */ /* NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp */
/* /*
@ -41,7 +41,8 @@
#include <dev/ic/pcdisplayvar.h> #include <dev/ic/pcdisplayvar.h>
#include <dev/ic/vgareg.h> #include <dev/ic/vgareg.h>
#include <dev/ic/vgavar.h> #include <dev/ic/vgavar.h>
#include <arc/pica/pica.h> #include <arc/jazz/jazziovar.h>
#include <arc/jazz/pica.h>
#include <arc/jazz/vga_jazziovar.h> #include <arc/jazz/vga_jazziovar.h>
#include <dev/wscons/wsconsio.h> #include <dev/wscons/wsconsio.h>
@ -106,10 +107,10 @@ vga_jazzio_match(parent, match, aux)
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
struct confargs *ca = aux; struct jazzio_attach_args *ja = aux;
bus_space_tag_t iot, memt; bus_space_tag_t iot, memt;
if(!BUS_MATCHNAME(ca, "vga")) if(strcmp(ja->ja_name, "vga") != 0)
return(0); return(0);
vga_jazzio_init_tag(&iot, &memt); vga_jazzio_init_tag(&iot, &memt);

4
sys/arch/arc/pci/necpb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: necpb.c,v 1.5 2000/11/09 06:15:27 thorpej Exp $ */ /* $NetBSD: necpb.c,v 1.6 2000/12/24 09:25:30 ur Exp $ */
/*- /*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -89,7 +89,7 @@
#include <dev/pci/pcivar.h> #include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h> #include <dev/pci/pcireg.h>
#include <arc/pica/rd94.h> #include <arc/jazz/rd94.h>
#include <arc/pci/necpbvar.h> #include <arc/pci/necpbvar.h>
int necpbmatch __P((struct device *, struct cfdata *, void *)); int necpbmatch __P((struct device *, struct cfdata *, void *));