Various changes to allow mixing of ofw drivers and real drivers.

NCR driver seems to work.
Major changes are isa can be child of pci or mainbus.
ofroot is child of mainbus not root.
ofw bus configured before pci bus
Note that if a pci device configures accessing of driver will crash
the system. they need to be exclusive.

2 files changed, 108 insertions, 9 deletions

diff --git a/sys/arch/powerpc/conf/OFWTST b/sys/arch/powerpc/conf/OFWTST
new file mode 100644
index 00000000000..49d92fb9930
--- /dev/null
+++ b/sys/arch/powerpc/conf/OFWTST
@@ -0,0 +1,97 @@
+#
+# First try for PPC GENERIC config file
+#
+
+machine		powerpc
+
+maxusers	32
+
+# Standard system options (should go into std.powerpc?)
+options		SWAPPAGER, VNODEPAGER, DEVPAGER
+options		EXEC_ELF
+options		SYS_TYPE=OFWMACH
+
+# various hacks due to bugs in Openfirmware implementation
+options		FIREPOWERBUGS
+
+#options		IPKDBUSERHACK
+#makeoptions	DEBUG="-g"
+
+options		DDB
+options		KTRACE
+options		SYSCALL_DEBUG
+options		TCP_COMPAT_42
+options		COMPAT_43
+#options		COMPAT_09
+#options		COMPAT_10
+#options		COMPAT_12
+
+options		FFS
+options		MFS
+
+options		NFSCLIENT
+options		NFSSERVER
+
+options		CD9660
+options		MSDOSFS
+options		FDESC
+options		FIFO
+options		KERNFS
+options		NULLFS
+options		PORTAL
+options		PROCFS
+options		UMAPFS
+options		UNION
+
+options		INET
+options		NMBCLUSTERS=1024
+
+# System V options                 
+option		SYSVMSG         # System V-like message queues
+option		SYSVSEM         # System V-like semaphores
+option		SYSVSHM         # System V-like memory sharing       
+#option		SHMMAXPGS=1024  # 1024 pages is the default
+
+#options		MAXUSERS=20
+#options		TARGET_ELF
+
+config		bsd	swap generic
+
+mainbus0	at root
+cpu*		at mainbus0
+ofroot*		at mainbus0
+mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
+isabr*		at pci?	# ISA dev bridge.
+
+pci*		at mpcpcibr?
+
+isa*		at isabr?
+#com0		at isa? port 0x2f8 irq 3
+#com1		at isa? port 0x3f8 irq 4
+
+ncr*		at pci? dev ? function ?
+#de*		at pci? dev ? function ?
+
+scsibus*	at ncr?
+sd*		at scsibus? target ? lun ?
+st*		at scsibus? target ? lun ?            
+cd*		at scsibus? target ? lun ?
+
+
+ofbus*		at openfirm?
+
+#ofdisk*		at openfirm?
+
+ofnet*		at openfirm?
+#ipkdbif0	at ofnet?
+
+ofcons*		at openfirm?
+
+ofrtc*		at openfirm?
+
+pseudo-device	loop
+pseudo-device	pty	64
+pseudo-device	random	1
+pseudo-device	rd
+pseudo-device	vnd	2
+pseudo-device   bpfilter 8              # packet filter
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 32e9cf193d6..00276b4b694 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -45,6 +45,10 @@ file    arch/powerpc/powerpc/db_trace.c                 ddb
 
 file    arch/powerpc/powerpc/ofwreal.S
 
+#
+# Openfirmware support
+#
+
 define	mainbus {}
 device	mainbus
 attach	mainbus at root
@@ -54,34 +58,32 @@ device	cpu
 attach	cpu at mainbus
 file	arch/powerpc/powerpc/cpu.c
 
+include "../../../dev/ofw/files.ofw"
+file	arch/powerpc/powerpc/opendev.c ofcons | ofnet | ofdisk
+major	{ ofdisk = 4 }
+
 pseudo-device rd
 file dev/ramdisk.c			rd needs-flag
 file arch/powerpc/powerpc/rd_root.c	ramdisk_hooks
 major   {rd = 17}
 
+include	"../../../dev/pci/files.pci"
+
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at mainbus
 file	arch/powerpc/pci/mpcpcibus.c	mpcpcibr
 
 device	isabr {} : isabus
-attach	isabr at mainbus
+attach	isabr at mainbus, pci
 file	arch/powerpc/isa/isabus.c	isabr
 include "../../../scsi/files.scsi"
 major	{sd = 2}		# hey this was 0 but at slot 2 in bdevsw XXX
 major	{cd = 3}
 
 define	pcmcia {}			# XXX dummy decl...
-include	"../../../dev/pci/files.pci"
 include	"../../../dev/isa/files.isa"
 major	{ wd = 5 }		# Not even in bdevsw XXX
 
 include "../../../dev/isa/files.isapnp"
 file    arch/arc/isa/isapnp_machdep.c   isapnp   
 
-#
-# Openfirmware support
-#
-
-include "../../../dev/ofw/files.ofw"
-file	arch/powerpc/powerpc/opendev.c ofcons | ofnet | ofdisk
-major	{ ofdisk = 4 }