Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/67001122ecd9
branches: nathanw_sa
changeset: 506701:67001122ecd9
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Jan 07 21:14:24 2003 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/prep/Makefile | 5 +-
sys/arch/prep/compile/.keep_me | 3 -
sys/arch/prep/compile/Makefile | 3 +
sys/arch/prep/include/pnp.h | 2 +-
sys/arch/sandpoint/Makefile | 4 +-
sys/arch/sandpoint/compile/Makefile | 3 +
sys/arch/sbmips/Makefile | 4 +-
sys/arch/sbmips/compile/Makefile | 3 +
sys/arch/sgimips/Makefile | 4 +-
sys/arch/sgimips/compile/.keep_me | 3 -
sys/arch/sgimips/compile/Makefile | 3 +
sys/arch/sgimips/conf/GENERIC | 6 +-
sys/arch/sgimips/dev/com_mace.c | 36 +---
sys/arch/sgimips/dev/crime.c | 114 ++++++-----
sys/arch/sgimips/dev/mace.c | 79 ++++++-
sys/arch/sgimips/dev/macevar.h | 3 +-
sys/arch/sgimips/include/types.h | 3 +-
sys/arch/sgimips/pci/macepci.c | 304 +++++++++++++++++++++++++++++----
sys/arch/sgimips/pci/pci_addr_fixup.h | 53 +++++
sys/arch/sgimips/pci/pci_machdep.c | 54 +++--
sys/arch/sgimips/sgimips/autoconf.c | 3 +-
sys/arch/sgimips/sgimips/console.c | 84 ++++++++-
sys/arch/sgimips/sgimips/cpu.c | 35 +---
sys/arch/sgimips/sgimips/ip32.c | 174 +++++++++++++-----
sys/arch/sgimips/sgimips/machdep.c | 126 +++++++++++---
sys/arch/shark/Makefile | 4 +-
sys/arch/shark/compile/.keep_me | 3 -
sys/arch/shark/compile/Makefile | 3 +
sys/arch/shark/shark/i8042.c | 6 +-
sys/arch/shark/shark/ns87307.c | 4 +-
sys/arch/shark/shark/scr.c | 4 +-
sys/arch/sparc/Makefile | 4 +-
sys/arch/sparc/compile/.keep_me | 1 -
sys/arch/sparc/compile/Makefile | 3 +
sys/arch/sparc/fpu/fpu.c | 13 +-
sys/arch/sparc/include/db_machdep.h | 23 +-
sys/arch/sparc/sparc/cache.c | 7 +-
sys/arch/sparc/sparc/cpu.c | 47 +++--
sys/arch/sparc/sparc/cpuvar.h | 18 +-
sys/arch/sparc/sparc/db_interface.c | 47 +++--
sys/arch/sparc/sparc/intr.c | 36 +--
sys/arch/sparc/sparc/locore.s | 27 +--
sys/arch/sparc/sparc/trap.c | 4 +-
sys/arch/sparc64/Makefile | 4 +-
sys/arch/sparc64/compile/.keep_me | 1 -
sys/arch/sparc64/compile/Makefile | 3 +
sys/arch/sparc64/conf/files.sparc64 | 4 +-
sys/arch/sparc64/dev/iommureg.h | 4 +-
sys/arch/sparc64/include/pte.h | 6 +-
sys/arch/sparc64/sparc64/autoconf.c | 13 +-
sys/arch/sparc64/sparc64/pmap.c | 4 +-
sys/arch/sparc64/sparc64/sysioreg.h | 4 +-
sys/arch/sun2/Makefile | 5 +
sys/arch/sun2/compile/Makefile | 3 +
sys/arch/sun3/Makefile | 4 +-
sys/arch/sun3/compile/.keep_me | 3 -
sys/arch/sun3/compile/Makefile | 3 +
sys/arch/sun3/dev/xdreg.h | 4 +-
sys/arch/sun3/sun3/isr.c | 6 +-
sys/arch/sun68k/sun68k/isr.c | 6 +-
sys/arch/vax/Makefile | 4 +-
sys/arch/vax/compile/.keep_me | 3 -
sys/arch/vax/compile/Makefile | 3 +
sys/arch/vax/include/qdreg.h | 4 +-
sys/arch/vax/vax/vm_machdep.c | 4 +-
sys/arch/x68k/Makefile | 4 +-
sys/arch/x68k/compile/Makefile | 3 +
sys/arch/x68k/stand/loadbsd/Makefile | 15 +-
68 files changed, 986 insertions(+), 496 deletions(-)
diffs (truncated from 2866 to 300 lines):
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/prep/Makefile
--- a/sys/arch/prep/Makefile Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/prep/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2000/02/29 15:21:53 nonaka Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2003/01/07 21:14:24 thorpej Exp $
# Makefile for tags file
@@ -23,6 +23,7 @@
-for i in ${DPREP}; do \
cd $$i && rm -f tags; ln -s ../tags tags; done
-SUBDIR= include stand
+
+SUBDIR= compile include stand
.include <bsd.subdir.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/prep/compile/.keep_me
--- a/sys/arch/prep/compile/.keep_me Tue Jan 07 21:13:21 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2000/02/29 15:21:20 nonaka Exp $
-
-This normally empty directory needs to be kept in the distribution.
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/prep/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/compile/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:14:26 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/prep/include/pnp.h
--- a/sys/arch/prep/include/pnp.h Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/prep/include/pnp.h Tue Jan 07 21:14:24 2003 +0000
@@ -220,7 +220,7 @@
#define L1_8_16bit_mem 0x10 /* 8- and 16-bit supported */
#define L1_Decode_Hi 0x04 /* decode supports high address */
#define L1_Cache 0x02 /* read cacheable, write-through */
-#define L1_Writeable 0x01 /* Memory is writeable */
+#define L1_Writable 0x01 /* Memory is writable */
#define L2_Packet 0x82 /* ANSI ID string */
#define L3_Packet 0x83 /* Unicode ID string */
#define L4_Packet 0x84 /* Vendor defined */
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sandpoint/Makefile
--- a/sys/arch/sandpoint/Makefile Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sandpoint/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2001/02/04 18:32:10 briggs Exp $
+# $NetBSD: Makefile,v 1.1.10.1 2003/01/07 21:14:27 thorpej Exp $
-SUBDIR= include
+SUBDIR= compile include
.include <bsd.subdir.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sandpoint/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sandpoint/compile/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:14:28 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sbmips/Makefile
--- a/sys/arch/sbmips/Makefile Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sbmips/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1.12.2 2002/11/11 22:03:11 nathanw Exp $
+# $NetBSD: Makefile,v 1.1.12.3 2003/01/07 21:14:28 thorpej Exp $
-SUBDIR= include stand
+SUBDIR= compile include stand
.include <bsd.subdir.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sbmips/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sbmips/compile/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:14:29 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/Makefile
--- a/sys/arch/sgimips/Makefile Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sgimips/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.14.1 2002/01/08 00:27:24 nathanw Exp $
+# $NetBSD: Makefile,v 1.1.14.2 2003/01/07 21:14:29 thorpej Exp $
# Makefile for sgimips tags file
@@ -26,6 +26,6 @@
-for i in ${DSGIMIPS}; do \
cd $$i && rm -f tags; ln -s ../tags tags; done
-SUBDIR= include stand
+SUBDIR= compile include stand
.include <bsd.subdir.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/compile/.keep_me
--- a/sys/arch/sgimips/compile/.keep_me Tue Jan 07 21:13:21 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2000/06/14 15:51:28 soren Exp $
-
-This normally empty directory needs to be kept in the distribution.
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/compile/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sgimips/compile/Makefile Tue Jan 07 21:14:24 2003 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile,v 1.1.2.2 2003/01/07 21:14:30 thorpej Exp $
+
+.include <bsd.prog.mk>
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/conf/GENERIC
--- a/sys/arch/sgimips/conf/GENERIC Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sgimips/conf/GENERIC Tue Jan 07 21:14:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.5.2.6 2002/12/29 19:35:31 thorpej Exp $
+# $NetBSD: GENERIC,v 1.5.2.7 2003/01/07 21:14:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.5.2.6 $"
+#ident "GENERIC-$Revision: 1.5.2.7 $"
maxusers 32
@@ -38,7 +38,6 @@
options IP32 # O2
options MIPS3 # MIPS3 support
-options MIPS3_5200
options MIPS3_L2CACHE_ABSENT
# Standard system options
@@ -177,7 +176,6 @@
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
rtk* at pci? dev ? function ? # Realtek 8129/8139
-ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
#tlp* at pci? dev ? function ? # DECchip 21x4x and clones
wm* at pci? dev ? function ? # Intel gigabit Ethernet
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/dev/com_mace.c
--- a/sys/arch/sgimips/dev/com_mace.c Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sgimips/dev/com_mace.c Tue Jan 07 21:14:24 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mace.c,v 1.2.4.3 2002/10/18 02:39:38 nathanw Exp $ */
+/* $NetBSD: com_mace.c,v 1.2.4.4 2003/01/07 21:14:31 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -80,10 +80,6 @@
return 1;
}
-extern void *crime_intr_establish(int, int, int, int (*)(void *), void *);
-
-int console = 0;
-
static void
com_mace_attach(parent, self, aux)
struct device *parent;
@@ -93,8 +89,6 @@
struct com_mace_softc *msc = (void *)self;
struct com_softc *sc = &msc->sc_com;
struct mace_attach_args *maa = aux;
- unsigned long rate;
- char *dbaud;
sc->sc_iot = maa->maa_st;
sc->sc_ioh = maa->maa_sh;
@@ -102,37 +96,13 @@
sc->sc_frequency = COM_FREQ;
- /* XXX console check */
- /* XXX map */
-#define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
-
-#if 0
-console = 1;
-#endif
-
-#if 0
- console = GetEnvironmentVariable("console");
-
- if console[0] = 'd'
-#endif
- dbaud = ARCBIOS->GetEnvironmentVariable("dbaud");
- if (dbaud != NULL)
- rate = strtoul(dbaud, NULL, 10);
- else
- rate = 9600;
-
- delay(10000);
- /* if console & dbaud */
- if (console == 0) {
- comcnattach(sc->sc_iot, sc->sc_ioh, rate, COM_FREQ, CONMODE);
- console = 1;
- }
delay(10000);
com_attach_subr(sc);
delay(10000);
- crime_intr_establish(0, 0, 0, comintr, sc);
+ mace_intr_establish(4, IPL_TTY, comintr, sc);
+ /*mace_intr_establish(maa->maa_intr, IPL_TTY, comintr, sc);*/
return;
}
diff -r 1835c0035d45 -r 67001122ecd9 sys/arch/sgimips/dev/crime.c
--- a/sys/arch/sgimips/dev/crime.c Tue Jan 07 21:13:21 2003 +0000
+++ b/sys/arch/sgimips/dev/crime.c Tue Jan 07 21:14:24 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: crime.c,v 1.4.8.3 2002/10/18 02:39:38 nathanw Exp $ */
+/* $NetBSD: crime.c,v 1.4.8.4 2003/01/07 21:14:32 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -49,20 +49,26 @@
#include <dev/pci/pcivar.h>
-#if 0
+#include <sgimips/dev/macereg.h>
#include <sgimips/dev/crimereg.h>
-#endif
#include "locators.h"
static int crime_match(struct device *, struct cfdata *, void *);
static void crime_attach(struct device *, struct device *, void *);
void * crime_intr_establish(int, int, int, int (*)(void *), void *);
-int crime_intr(void *);
+void crime_intr(u_int);
CFATTACH_DECL(crime, sizeof(struct device),
crime_match, crime_attach, NULL, NULL);
+#define CRIME_NINTR 32 /* XXX */
+
+struct {
+ int (*func)(void *);
+ void *arg;
+} crime[CRIME_NINTR];
+
static int
crime_match(parent, match, aux)
struct device *parent;
@@ -86,38 +92,54 @@
void *aux;
{
struct mainbus_attach_args *ma = aux;
- u_int32_t rev; /* really u_int64_t ! */
- int major, minor;
+ u_int64_t crm_id;
+ int id, rev;
+
+ crm_id = bus_space_read_8(ma->ma_iot, ma->ma_ioh, 0);
- rev = bus_space_read_4(ma->ma_iot, ma->ma_ioh, 4) & 0xff;
+ id = (crm_id & 0xf0) >> 4;
+ rev = crm_id & 0x0f;
+
+ aprint_naive(": system ASIC");
- major = rev >> 4;
- minor = rev & 0x0f;
+ switch (id) {
+ case 0x0b:
+ aprint_normal(": rev 1.5");
+ break;
- if (major == 0 && minor == 0)
- printf(": petty\n");
- else
- printf(": rev %d.%d\n", major, minor);
+ case 0x0a:
+ if ((crm_id >> 32) == 0)
+ aprint_normal(": rev 1.1");
+ else if ((crm_id >> 32) == 1)
+ aprint_normal(": rev 1.3");
+ else
+ aprint_normal(": rev 1.4");
+ break;
+
+ case 0x00:
+ aprint_normal(": Petty CRIME");
+ break;
-#if 0
- *(volatile u_int64_t *)0xb4000018 = 0xffffffffffffffff;
-#else
- /* enable all mace interrupts, but no crime devices */
- *(volatile u_int64_t *)0xb4000018 = 0x000000000000ffff;
-#endif
Home |
Main Index |
Thread Index |
Old Index