Pull in John Kohl's [jtk@netbsd.org] most recent (15Apr96) APM and PCMCIA work

(original PCMCIA framework  by Stefan Grefen [grefen@convex.com]).

4 files changed, 190 insertions, 20 deletions

diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index b412cdfb0ad..2b91d0e76f8 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,4 +1,4 @@
-#	$OpenBSD: HELIOS_PCMCIA,v 1.3 1996/04/18 18:55:35 niklas Exp $
+#	$OpenBSD: HELIOS_PCMCIA,v 1.4 1996/04/29 14:12:01 hvozda Exp $
 #
 #	HELIOS_PCMCIA -- Eric Hvozda's notebook
 #
@@ -25,6 +25,7 @@ options		KTRACE		# system call tracing, a la ktrace(1)
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 
 options		LKM		# loadable kernel modules
@@ -48,26 +49,46 @@ options		FDSCRIPTS	# secure setuid scripts
 
 options		INET		# IP + ICMP + TCP + UDP
 
-config		bsd	root on wd0a swap on wd0b and vnd0b dumps on wd0b
+config		bsd	root on wd0a swap on wd0b dumps on wd0b
 
 mainbus0	at root
 
 isa0	at mainbus0
 pci0	at mainbus0
+#apm0	at mainbus0
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
-
-pcic0	at isa? port 0x3E0 flags 0
-pcmcia0 at pcic? iomem 0xd4000 iosiz 4096
-com2	at pcmcia? port 0x3e8 irq 12
-ed2	at pcmcia? port 0x300 iomem 0xcc000 irq 10
+#spkr0	at pckbd? port 0x61		# PC speaker
+
+# Multiple controllers need some testing.  Some laptops have multiple PCIC
+# controllers instead of two-slot controllers.
+# The i82365 (pcic) controller uses the same ports for the first two
+# controllers and for the second two controllers.
+
+# IRQ 2/9 doesn't seem to work for status change interrupts, so use one
+# of the higher ones.
+pcicmaster0	at isa? port 0x3E0 size 2
+pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
+pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
+pcicmaster1 at isa? port 0x3E2 size 2
+pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
+pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
+
+pcmcia* at pcic?
+
+#ed0     at pcmcia? port 0x300 iomem 0xd8000 iosiz 8192 	irq 10
+ed0     at pcmcia? port 0x300 size 0x20 irq 10 slot ?
+#ep0     at pcmcia? port 0x300 size 0x10 irq 10 slot ?
+#com1    at pcmcia? port 0x2f8 size 8 irq 5 slot ?
+com2    at pcmcia? port 0x3e8 size 8 irq 5 slot ?
+#com3    at pcmcia? port 0x2e8 size 8	irq 3 slot ?
 
 com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
 
-lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+lpt0	at isa? port 0x378		# standard PC parallel ports
 
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 fd0	at fdc? drive 0
@@ -75,7 +96,7 @@ fd0	at fdc? drive 0
 wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
 wd0	at wdc? drive 0
 
-sb0	at isa? port 0x240 irq 5 drq 1	# SoundBlaster
+sb0	at isa? port 0x240 irq 7 drq 1	# SoundBlaster
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index aee08091430..0edf4047ae1 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.8 1996/04/24 12:05:17 mickey Exp $
+#	$OpenBSD: Makefile.i386,v 1.9 1996/04/29 14:12:10 hvozda Exp $
 #	$NetBSD: Makefile.i386,v 1.66 1996/02/29 20:56:16 cgd Exp $
 
 # Makefile for OpenBSD
@@ -145,10 +145,14 @@ links:
 	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
+# depend on APM
+.include "${I386}/apm_init/Makefile.inc"
+locore.o: ${APMINC}
+
 SRCS=	${I386}/i386/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend: .depend
-.depend: ${SRCS} assym.h param.c
+.depend: ${SRCS} assym.h param.c ${APMINC}
 	mkdep ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
new file mode 100644
index 00000000000..2544e06c62c
--- /dev/null
+++ b/sys/arch/i386/conf/PCMCIA
@@ -0,0 +1,138 @@
+#	$Id: PCMCIA,v 1.1 1996/04/29 14:12:24 hvozda Exp $
+#	$Source: /cvs/OpenBSD/src/sys/arch/i386/conf/Attic/PCMCIA,v $
+#
+#	ATHENA-AHA	-- ATHENA kernel for Adaptec & others...
+#
+# from:	GENERIC -- everything that's currently supported
+#       NetBSD: GENERIC,v 1.12 1995/02/21 01:43:02 brezak Exp
+#
+
+machine		i386		# architecture, used by config; REQUIRED
+
+options		I586_CPU
+options		I486_CPU
+options		I386_CPU
+options		INSECURE
+options		MATH_EMULATE
+
+options		DUMMY_NOPS	# speed hack; recommanded
+options		XSERVER,UCONSOLE
+options		MACHINE_NONCONTIG
+
+maxusers	32		# estimated number of users
+options		TIMEZONE=300	# time zone to adjust RTC time by
+options		DST=1		# daylight savings time used by RTC
+
+options		SWAPPAGER	# paging; REQUIRED
+options		VNODEPAGER	# mmap() of files
+options		DEVPAGER	# mmap() of devices
+
+options		DDB		# in-kernel debugger
+#makeoptions	DEBUG="-g"	# compile full symbol table
+#options	DIAGNOSTIC	# internally consistency checks
+options		KTRACE		# system call tracing, a la ktrace(1)
+
+options		SYSVMSG		# System V-like message queues
+options		SYSVSEM		# System V-like semaphores
+options		SYSVSHM		# System V-like memory sharing
+#options	SHMMAXPGS=1024	# 1024 pages is the default
+
+options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
+options		COMPAT_09	# NetBSD 0.9,
+options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_43	# and 4.3BSD
+options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+options		COMPAT_SVR4	# binary compatibility with SVR4
+options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
+options		COMPAT_LINUX	# binary compatibility with Linux
+
+options		USER_LDT	# user-settable LDT; used by WINE
+options		LKM		# loadable kernel modules
+
+options		FFS #,QUOTA	# UFS and quotas
+#options	LFS		# log-structured file system
+options		MFS		# memory file system
+
+options		NFSCLIENT	# Network File System client
+options		NFSSERVER	# Network File System server
+options		HAS_VOPLEASE	# XXX
+
+options		APM_NOIDLE
+#options		PCIVERBOSE
+#options		PCMCIA_DEBUG
+#options		PCMCIA_ISA_DEBUG
+
+### SCSI:
+#options		CD9660		# ISO 9660 + Rock Ridge file system
+###
+options		MSDOSFS		# MS-DOS file system
+options		FIFO		# FIFOs; RECOMMENDED
+options		PROCFS		# /proc
+
+#options	GATEWAY		# packet forwarding
+options		INET		# IP + ICMP + TCP + UDP
+#options	NS		# XNS
+#options	ISO,TPIP	# OSI
+#options	EON		# OSI tunneling over IP
+#options	CCITT,LLC,HDLC	# X.25
+
+config		netbsd	swap generic
+options		GENERIC
+
+# Local Athena options
+
+options		PCVT_CTRL_ALT_DEL	# For screwed-over Linux weenies
+
+mainbus0 at root
+isa0	at mainbus0
+pci0	at mainbus0 bus 0
+
+npx0	at isa? port 0xf0 irq 13	# math coprocessor
+
+vt0	at isa? port 0x60 irq 1
+
+com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+com1	at isa? port 0x2f8 irq 3
+com2	at isa? port 0x3e8 irq 5
+
+lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+
+pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
+
+fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
+fd0	at fdc0 drive 0
+
+wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
+wd0	at wdc0 drive 0
+
+spkr0	at pckbd? port 0x61
+#apm0	at mainbus?
+
+# Multiple controllers need some testing.  Some laptops have multiple PCIC
+# controllers instead of two-slot controllers.
+# The i82365 (pcic) controller uses the same ports for the first two
+# controllers and for the second two controllers.
+
+# IRQ 2/9 doesn't seem to work for status change interrupts, so use one
+# of the higher ones.
+pcicmaster0	at isa? port 0x3E0 size 2
+pcic0	at pcicmaster0 irq 11 iomem 0xd4000 iosiz 4096
+pcic1	at pcicmaster0 irq 12 iomem 0xd5000 iosiz 4096
+pcicmaster1 at isa? port 0x3E2 size 2
+pcic2	at pcicmaster1 irq 11 iomem 0xd6000 iosiz 4096
+pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
+
+pcmcia* at pcic?
+
+#ed0     at pcmcia? port 0x300 iomem 0xd8000 iosiz 8192 	irq 10
+ed0     at pcmcia? port 0x300 size 0x20 irq 10 slot ?
+ep0     at pcmcia? port 0x300 size 0x10 irq 10 slot ?
+#com1    at pcmcia? port 0x2f8 size 8 irq 5 slot ?
+#com2    at pcmcia? port 0x3e8 size 8 irq 5 slot ?
+com3    at pcmcia? port 0x2e8 size 8	irq 3 slot ?
+
+pseudo-device	loop	1		# network loopback
+pseudo-device	bpfilter 4		# packet filter
+pseudo-device	ppp	2		# PPP
+pseudo-device	pty	64		# pseudo-terminals
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index c434f132f04..2bd8ee7cb59 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.13 1996/04/28 17:02:01 mickey Exp $
+#	$OpenBSD: files.i386,v 1.14 1996/04/29 14:12:16 hvozda Exp $
 #	$NetBSD: files.i386,v 1.72 1996/04/09 22:59:03 cgd Exp $
 #
 # new style config file for i386 architecture
@@ -52,7 +52,8 @@ major	{rd = 17}
 # System bus types
 #
 
-device	mainbus: isabus, eisabus, pcibus
+define mainbus { }
+device	mainbus: isabus, eisabus, pcibus, mainbus
 attach	mainbus at root
 file	arch/i386/i386/mainbus.c	mainbus
 
@@ -69,6 +70,12 @@ file	arch/i386/pci/pci_machdep.c	pci
 file	arch/i386/pci/pci_compat.c	pci	# XXX compatibility
 
 #
+# Pcmcia, before ISA (to define device stuff)
+#
+
+include "../../../dev/pcmcia/files.pcmcia"
+
+#
 # ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers
 #
 
@@ -77,10 +84,6 @@ major	{mcd = 7}
 major	{wd = 0}
 major	{wt = 3}
 
-#define pcic here until config issues are resolved
-#device pcic at isa: pcmciabus
-#file	dev/isa/pcmcia_pcic.c		pcic
-
 include "../../../dev/isa/files.isa"
 file	arch/i386/isa/isa_machdep.c	isabus
 
@@ -138,9 +141,9 @@ file	arch/i386/isa/spkr.c		spkr needs-flag
 # National Semiconductor DS8390/WD83C690-based boards
 # (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
 # XXX conflicts with other ports; can't be in files.isa
-device	ed: ether, ifnet
-attach	ed at isa
-file	dev/isa/if_ed.c			ed
+#device	ed: ether, ifnet
+#attach	ed at isa
+#file	dev/isa/if_ed.c			ed
 
 # AMD am7990 (Lance) -based boards
 # (BICC Isolan, NE2100, DEPCA)
@@ -183,3 +186,7 @@ file	arch/i386/i386/linux_machdep.c		compat_linux
 # FreeBSD binary compatibility (COMPAT_FREEBSD)
 include "../../../compat/freebsd/files.freebsd"
 file	arch/i386/i386/freebsd_machdep.c	compat_freebsd
+
+device apm
+attach apm at mainbus
+file	arch/i386/i386/apm.c		apm needs-count