Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sparc64 Fix things up so they compile again.
details: https://anonhg.NetBSD.org/src/rev/8d5e127ba507
branches: trunk
changeset: 473498:8d5e127ba507
user: eeh <eeh%NetBSD.org@localhost>
date: Sat Jun 05 20:38:24 1999 +0000
description:
Fix things up so they compile again.
diffstat:
sys/arch/sparc64/conf/GENERIC | 45 +++++++++++++++++++++++++++----------
sys/arch/sparc64/conf/NONPLUS | 4 +-
sys/arch/sparc64/include/bus.h | 4 +-
sys/arch/sparc64/include/conf.h | 11 +++-----
sys/arch/sparc64/include/cpu.h | 4 +-
sys/arch/sparc64/include/psl.h | 7 +++++-
sys/arch/sparc64/sparc64/machdep.c | 8 +++---
7 files changed, 52 insertions(+), 31 deletions(-)
diffs (250 lines):
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/conf/GENERIC Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.15 1999/04/26 04:25:38 ad Exp $
+# $NetBSD: GENERIC,v 1.16 1999/06/05 20:38:24 eeh Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -65,7 +65,7 @@
## intercept. DDB_HISTORY_SIZE adds up/down arrow command history.
# we enable DDB in GENERIC for now.
options DDB # kernel dynamic debugger
-#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options DDB_ONPANIC # see also sysctl(8): `ddb.onpanic'
## You may also use gdb, on another computer connected to this machine over
@@ -94,6 +94,7 @@
## Make SCSI error messages more verbose when explaining their meanings.
options SCSIVERBOSE
+options PCIVERBOSE
## `INSECURE' turns off the kernel security level (securelevel = 0 always).
## This allows writing to /dev/mem, loading kernel modules while multi-user,
@@ -181,8 +182,11 @@
sbus0 at mainbus0 # Ultra 1
#upa0 at mainbus0 # Ultra 1E, Ultra 2, Ex0000
-#pci0 at mainbus0 # Darwin
-#ebus* at pci? # ebus devices
+psycho* at mainbus0 # Darwin, Ultra5
+pci* at psycho?
+pci* at simba?
+simba* at pci? dev ? function ? # `APB' support.
+ebus* at pci? # ebus devices
#### Standard system devices -- all required for a given architecture
@@ -193,11 +197,12 @@
# We also need:
# bpp0 at sbus0 # parallel port
# ecpp0 at pci0 # parallel port ?
+lpt* at ebus? # parallel port
## Mostek clock found on 4/300, sun4c, sun4m and sun4u systems.
## The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
clock0 at sbus0 slot ? offset ?
-#clock0 at pci0
+clock0 at ebus?
## Timer chip found on 4/300, sun4c, sun4m and sun4u systems.
timer0 at mainbus0 # sun4c
@@ -215,16 +220,21 @@
ms0 at zs1 channel 1 # mouse
## PCI machines apparently have serial ports
-## called `se' and `su'
+## Siemens SAB82532 controller: ttya and ttyb (sab)
+## Part of NS PC87332VLJ Super I/O controller: kbd/mouse (com)
+
+## These are two SAB82532 controllers
+#sab0 at ebus? # ttya/ttyb
+#sabtty0 at sab0 channel 0 # ttya
+#sabtty1 at sab0 channel 1 # ttyb
## Part of a PC87332VLJ?
-#se0 at ebus? #
-#kbd0 at su1 channel 0 # keyboard
-#ms0 at su1 channel 1 # mouse
-
-## These are two SAB82532 controllers
-#su0 at ebus? # ttya
-#su1 at ebus? # ttyb
+#ucom0 at ebus? addr 0x3083f8 # `com' driver
+#ucom1 at ebus? addr 0x3062f8 #
+#ucom0 at ebus? # `com' driver
+#ucom1 at ebus? #
+#kbd0 at ucom0 channel 0 # keyboard
+#ms0 at ucom1 channel 1 # mouse
#### Disk controllers and disks
@@ -270,6 +280,15 @@
ss* at scsibus? target ? lun ? # SCSI scanners
uk* at scsibus? target ? lun ? # unknown SCSI
+# PCI IDE.
+pciide* at pci ? dev ? function ? flags 0x0000
+wd* at pciide? channel ? drive ? flags 0x0000
+atapibus* at pciide? channel ?
+
+cd* at atapibus? drive ? flags 0x0000 # ATAPI CD-ROM drives
+sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
+uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
+
## Floppy controller and drive found on SPARCstations.
# need share with the sparc...uses auxreg. what is this on sparc64?
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS,v 1.13 1999/05/23 02:45:19 eeh Exp $
+# $NetBSD: NONPLUS,v 1.14 1999/06/05 20:38:24 eeh Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -134,7 +134,7 @@
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
#options EXEC_ELF64 # Exec module for SunOS 5.x binaries.
options SYSCALL_DEBUG
-#options COMPAT_AOUT # NetBSD/sparc compat support
+options COMPAT_AOUT # NetBSD/sparc compat support
options EXEC_AOUT # execve(2) support for a.out binaries
## File systems. You probably need at least one of FFS or NFS.
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/include/bus.h
--- a/sys/arch/sparc64/include/bus.h Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/include/bus.h Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.11 1999/05/22 20:28:22 eeh Exp $ */
+/* $NetBSD: bus.h,v 1.12 1999/06/05 20:38:25 eeh Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
PCI_MEMORY_BUS_SPACE,
LAST_BUS_SPACE
};
-extern int bus_type_asi[LAST_BUS_SPACE];
+extern int bus_type_asi[];
/* For backwards compatibility */
#define SPARC_BUS_SPACE UPA_BUS_SPACE
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/include/conf.h
--- a/sys/arch/sparc64/include/conf.h Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/include/conf.h Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.h,v 1.4 1998/11/13 04:47:09 oster Exp $ */
+/* $NetBSD: conf.h,v 1.5 1999/06/05 20:38:25 eeh Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -85,12 +85,6 @@
cdev_decl(cgfourteen);
-bdev_decl(xd);
-cdev_decl(xd);
-
-bdev_decl(xy);
-cdev_decl(xy);
-
bdev_decl(sw);
cdev_decl(sw);
@@ -101,3 +95,6 @@
cdev_decl(md);
cdev_decl(scsibus);
+
+bdev_decl(wd);
+cdev_decl(wd);
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/include/cpu.h Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.7 1999/05/30 19:13:33 eeh Exp $ */
+/* $NetBSD: cpu.h,v 1.8 1999/06/05 20:38:25 eeh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -180,7 +180,7 @@
struct fpstate;
void savefpstate __P((struct fpstate *));
void loadfpstate __P((struct fpstate *));
-int probeget __P((caddr_t, int));
+int probeget __P((int, paddr_t, int));
#if 0
void write_all_windows __P((void));
void write_user_windows __P((void));
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/include/psl.h
--- a/sys/arch/sparc64/include/psl.h Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/include/psl.h Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.7 1999/03/26 04:29:21 eeh Exp $ */
+/* $NetBSD: psl.h,v 1.8 1999/06/05 20:38:25 eeh Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -84,6 +84,7 @@
#define PIL_BIO 5
#define PIL_VIDEO 5
#define PIL_TTY 6
+#define PIL_LPT 6
#define PIL_NET 6
#define PIL_IMP 7
#define PIL_CLOCK 10
@@ -365,6 +366,9 @@
/* tty input runs at software level 6 */
SPLHOLD(spltty, PIL_TTY)
+/* parallel port runs at software level 6 */
+SPLHOLD(spllpt, PIL_LPT)
+
/*
* Memory allocation (must be as high as highest network, tty, or disk device)
*/
@@ -410,6 +414,7 @@
#define splbio() splbioX(__FILE__, __LINE__)
#define splnet() splnetX(__FILE__, __LINE__)
#define spltty() splttyX(__FILE__, __LINE__)
+#define spllpt() spllptX(__FILE__, __LINE__)
#define splimp() splimpX(__FILE__, __LINE__)
#define splpmap() splpmapX(__FILE__, __LINE__)
#define splclock() splclockX(__FILE__, __LINE__)
diff -r fc359231f3ac -r 8d5e127ba507 sys/arch/sparc64/sparc64/machdep.c
--- a/sys/arch/sparc64/sparc64/machdep.c Sat Jun 05 20:17:38 1999 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c Sat Jun 05 20:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.44 1999/06/05 05:35:41 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.45 1999/06/05 20:38:25 eeh Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -163,19 +163,19 @@
/*
* Bypass access
*/
-int bus_type_asi[LAST_BUS_SPACE+1] = {
+int bus_type_asi[] = {
ASI_PHYS_NON_CACHED, /* UPA */
ASI_PHYS_NON_CACHED, /* SBUS */
ASI_PHYS_NON_CACHED_LITTLE, /* PCI configuration space */
ASI_PHYS_NON_CACHED_LITTLE, /* PCI memory space */
- ASI_PHYS_CACHED_LITTLE, /* PCI I/O space */
+ ASI_PHYS_NON_CACHED_LITTLE, /* PCI I/O space */
0
};
#else
/*
* MMU access - we want to use the MMU for all this..
*/
-int bus_type_asi[LAST_BUS_SPACE+1] = {
+int bus_type_asi[] = {
ASI_PRIMARY,
ASI_PRIMARY,
ASI_PRIMARY,
Home |
Main Index |
Thread Index |
Old Index