early support for busdma added, allows USBMAC config to attach ohci USB,

however, it claims "legacy support: unsupported" which then causes
the imac to not config USB further.

Changes to *MAC to support openpic interrupt controller, G4 (uninorth)
is almost supported, but hangs during root mount.

4 files changed, 177 insertions, 19 deletions

diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
index e6257d8b4c7..b148cdd4995 100644
--- a/sys/arch/powerpc/conf/GENERICMAC
+++ b/sys/arch/powerpc/conf/GENERICMAC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERICMAC,v 1.4 2000/01/22 16:36:00 rahnds Exp $
+#	$OpenBSD: GENERICMAC,v 1.5 2000/03/20 07:14:59 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -56,6 +56,8 @@ obio0   at pci? dev ? function ?
 
 #nsphy*  at mii? phy ?                   # NS83840 PHYs   
 
+macintr0 at obio?                        # old interrupt controller
+openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
diff --git a/sys/arch/powerpc/conf/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
index 545f9aaf83d..0dd37381d9c 100644
--- a/sys/arch/powerpc/conf/RAMDISKMAC
+++ b/sys/arch/powerpc/conf/RAMDISKMAC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKMAC,v 1.4 2000/01/23 04:28:39 rahnds Exp $
+#	$OpenBSD: RAMDISKMAC,v 1.5 2000/03/20 07:14:59 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -31,8 +31,8 @@ option		KERNFS		# /kern
 option		INET		# IP + ICMP + TCP + UDP
 pseudo-device	loop	2	# network loopback
 pseudo-device	pty	64	# pseudo-terminals
-pseudo-device	ccd	4	# concatenated disk devices
-pseudo-device	ksyms	1	# kernel symbols device
+#pseudo-device	ccd	4	# concatenated disk devices
+#pseudo-device	ksyms	1	# kernel symbols device
 
 config		bsd	root on rd0a swap on rd0b
 
@@ -80,6 +80,8 @@ obio0   at pci? dev ? function ?
 
 #nsphy*  at mii? phy ?                   # NS83840 PHYs   
 
+macintr0 at obio?                        # old interrupt controller
+openpic0 at obio?                        # openpic interrupt controller
 bm*     at obio?                        # bmac ethernet
 #mc*     at obio?                        # MACE ethernet
 #esp*    at obio? flags 0x00ff           # 53c9x SCSI
@@ -141,9 +143,9 @@ scsibus* at atapiscsi?
 sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?            
 cd*		at scsibus? target ? lun ?
-ch*		at scsibus? target ? lun ?
-ss*		at scsibus? target ? lun ?
-uk*		at scsibus? target ? lun ?
+#ch*		at scsibus? target ? lun ?
+#ss*		at scsibus? target ? lun ?
+#uk*		at scsibus? target ? lun ?
 
 #### openfirmware devices
 # mostly unused currently 
diff --git a/sys/arch/powerpc/conf/USBMAC b/sys/arch/powerpc/conf/USBMAC
new file mode 100644
index 00000000000..ab6207ef954
--- /dev/null
+++ b/sys/arch/powerpc/conf/USBMAC
@@ -0,0 +1,147 @@
+#	$OpenBSD: USBMAC,v 1.1 2000/03/20 07:15:00 rahnds Exp $
+#
+# PPC GENERIC config file
+#
+
+machine		powerpc
+
+maxusers	32
+
+# default type, instructs system to try to determin what proper type is
+# actual machine type probed via name of openfirmware root node.
+option		SYS_TYPE=APPL
+
+option		FIREPOWERBUGS
+options		PPC_MPC106_BUG
+option		IPX		# IPX+SPX
+option		IPXIP		# IPX tunneling over IP
+
+include "../../../conf/GENERIC"
+
+config		bsd	swap generic
+
+
+#
+#  Now the Machine specification
+#
+mainbus0	at root
+cpu*		at mainbus0
+
+ofroot*		at mainbus0
+mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
+#isabr*		at pci?		# ISA dev bridge.
+#isabr*		at mainbus0	# ISA dev bridge.
+
+#### PCI Bus devices.
+
+pci*		at mpcpcibr?
+ppb*		at pci? dev ? function ?	# PCI-PCI bridges
+pci*		at ppb? bus ?
+
+ncr*		at pci? dev ? function ?
+de*		at pci? dev ? function ?
+#vme*		at pci? dev ? function ?
+#vga*		at pci? dev ? function ?	# PCI VGA graphics 
+#vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
+#ep*		at pci? dev ? function ?        # 3Com 3c59x
+#ne*		at pci? dev ? function ?        # NE2000-compatible Ethernet
+#adv*	at pci? dev ? function ?        # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+#ahc*		at pci? dev ? function ?        # Adaptec 294x, aic78x0 SCSI
+#bha*		at pci? dev ? function ?        # BusLogic 9xx SCSI
+#pcscp*		at pci? dev ? function ?        # AMD Am53c974 PCscsi-PCI SCSI
+#ofb*	at pci? dev ? function ?        # Generic Open Firmware Framebuffer
+#pciide*		at pci? dev ? function ?
+#macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
+obio0   at pci? dev ? function ?
+
+#nsphy*  at mii? phy ?                   # NS83840 PHYs   
+
+macintr0 at obio?                        # old interrupt controller
+openpic0 at obio?                        # openpic interrupt controller
+bm*     at obio?                        # bmac ethernet
+#mc*     at obio?                        # MACE ethernet
+#esp*    at obio? flags 0x00ff           # 53c9x SCSI
+#mesh*   at obio? flags 0xffff           # MESH SCSI
+#nvram*  at obio?                        # nvram
+#adb*    at obio?                        # Apple Desktop Bus
+#aed*    at adb?                         # ADB Event Device
+#akbd*   at adb?                         # ADB keyboard
+#ams*    at adb?                         # ADB mouse
+#zsc*    at obio?
+#zstty*  at zsc? channel ?
+
+
+#### SCSI attachment points
+
+scsibus*	at ncr?
+#scsibus*	at adv?
+#scsibus*	at ahc?
+#scsibus*	at bha?
+#scsibus*	at esp?
+#scsibus*	at mesh?
+#scsibus*	at pcscp?
+
+wdc*    at obio? flags 0x0
+#wd*     at pciide? channel ? drive ?
+#wd*     at wdc? channel ? drive ? flags 0x0000
+wd*     at wdc? drive ? flags 0x0000
+
+atapiscsi* at wdc? channel ? flags 0x0000
+#atapibus* at wdc? 
+
+# ATAPI<->SCSI
+scsibus* at atapiscsi?
+
+# PCI USB Controllers
+ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+usb*	at ohci?
+uhub*	at usb?
+uhub*  at uhub? port ? configuration ? interface ?
+
+# USB Generic HID devices
+uhid*  at uhub? port ? configuration ? interface ?
+
+# USB Generic driver
+ugen*  at uhub? port ? configuration ? interface ?
+
+
+
+#### ISA Bus devices.
+
+#isa*		at isabr?
+
+#com0		at isa? port 0x3f8 irq 4
+#com1		at isa? port 0x2f8 irq 3
+#com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
+#com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
+
+#pckbc0		at isa?			# PC prog. periph. interface
+#pckbd0		at pckbc?			# PC keyboard (kbd port)
+#pms0		at pckbc?			# PS/2-style mouse (aux port)
+
+#vga0		at isa?			# ISA VGA
+
+#### Workstation Console attachments
+
+#wscons*		at vga?
+#wscons*		at vgafb?
+
+#### SCSI Bus devices
+ 
+sd*		at scsibus? target ? lun ?
+st*		at scsibus? target ? lun ?            
+cd*		at scsibus? target ? lun ?
+ch*		at scsibus? target ? lun ?
+ss*		at scsibus? target ? lun ?
+uk*		at scsibus? target ? lun ?
+
+#### openfirmware devices
+# mostly unused currently 
+ofbus*		at openfirm?
+ofrtc*		at openfirm?
+#ofdisk*		at openfirm?	 # used for floppy support
+#ofnet*		at openfirm?
+ofcons*	at openfirm?
+
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 3e84de324c4..f1521115815 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -21,6 +21,7 @@ file	arch/powerpc/powerpc/in_cksum.c
 file	arch/powerpc/powerpc/ipkdb_glue.c	ipkdb
 file	arch/powerpc/powerpc/machdep.c
 file	arch/powerpc/powerpc/mem.c
+file	arch/powerpc/powerpc/dma.c
 file	arch/powerpc/powerpc/ofw_machdep.c
 file	arch/powerpc/powerpc/openfirm.c
 file	arch/powerpc/powerpc/pmap.c
@@ -45,8 +46,6 @@ file    arch/powerpc/powerpc/ofwreal.S
 # MAC generic
 #
 file	arch/powerpc/mac/dbdma.c
-define macintr
-file	arch/powerpc/mac/macintr.c			macintr
 
 #
 # Openfirmware support
@@ -136,35 +135,43 @@ include "../../../dev/ata/files.ata"
 
 # MAC periph 
 
-device obio {} : macintr
+device obio {}
 attach obio at pci
-file arch/powerpc/pci/macobio.c                     obio
+file arch/powerpc/pci/macobio.c			obio
 
 device esp: scsi, ncr53c9x
 attach esp at obio
-file arch/powerpc/mac/esp.c                      esp
+file arch/powerpc/mac/esp.c			esp
 
 device mesh: scsi
 attach mesh at obio
-file arch/powerpc/mac/mesh.c                     mesh
+file arch/powerpc/mac/mesh.c			mesh
 
 device mc: ifnet, ether
 attach mc at obio
-file arch/powerpc/mac/if_mc.c                    mc
-file arch/powerpc/mac/am79c950.c                 mc
+file arch/powerpc/mac/if_mc.c			mc
+file arch/powerpc/mac/am79c950.c		mc
 
 device bm: ether, ifnet, ifmedia
 attach bm at obio
-file arch/powerpc/mac/if_bm.c                    bm
+file arch/powerpc/mac/if_bm.c			bm
+
+device macintr {}
+attach macintr at obio
+file	arch/powerpc/mac/macintr.c		macintr
+
+device openpic {}
+attach openpic at obio
+file	arch/powerpc/mac/openpic.c		openpic
 
 device zsc {channel = -1}
 attach zsc at obio
-file arch/powerpc/mac/zs.c                       zsc needs-flag
-file dev/ic/z8530sc.c                           zsc
+file arch/powerpc/mac/zs.c			zsc needs-flag
+file dev/ic/z8530sc.c				zsc
 
 device zstty: tty
 attach zstty at zsc
-file arch/powerpc/mac/z8530tty.c                 zstty needs-flag
+file dev/ic/z8530tty.c                 zstty needs-flag
 
 device adb {}
 attach adb at obio