Support for imac drivers, Additional configurations for mac kernels.

Some mac drivers mentioned in the config files may not be be currently
supported.

3 files changed, 389 insertions, 3 deletions

diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
new file mode 100644
index 00000000000..371f238a01a
--- /dev/null
+++ b/sys/arch/powerpc/conf/GENERICMAC
@@ -0,0 +1,126 @@
+#	$OpenBSD: GENERICMAC,v 1.1 1999/11/08 23:53:56 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=OFWMACH
+
+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?
+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   
+
+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?
+
+#### 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/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
new file mode 100644
index 00000000000..0a7353d15ac
--- /dev/null
+++ b/sys/arch/powerpc/conf/RAMDISKMAC
@@ -0,0 +1,142 @@
+#	$OpenBSD: RAMDISKMAC,v 1.1 1999/11/08 23:53:56 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=OFWMACH
+
+option		FIREPOWERBUGS
+options		PPC_MPC106_BUG
+option		IPX		# IPX+SPX
+option		IPXIP		# IPX tunneling over IP
+
+include "../../../conf/GENERIC"
+
+config		bsd	root on rd0a swap on rd0b
+
+
+#
+#  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?
+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 ?
+
+# PCI USB Controllers
+#uhci*	at pci?				# Universal Host Controller (Intel)
+#ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+#usb*	at uhci?
+#usb*	at ohci?
+
+#nsphy*  at mii? phy ?                   # NS83840 PHYs   
+
+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
+#atapiscsi* at wdc? 
+
+# ATAPI<->SCSI
+scsibus* at atapiscsi?
+
+
+#### 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?
+
+pseudo-device	rd		 1	# ram disk
+
+# RAMDISK stuff
+option		MINIROOTSIZE=8192
+option		RAMDISK_HOOKS
+
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 2cfb08674ca..7e8a99ad199 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -42,6 +42,13 @@ file    arch/powerpc/powerpc/db_trace.c                 ddb
 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
 #
 
@@ -61,7 +68,7 @@ major	{ ofdisk = 4 }
 pseudo-device rd
 major   {rd = 17}
 
-include	"../../../dev/pci/files.pci"
+include "dev/pci/files.pci"
 
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at mainbus
@@ -76,7 +83,7 @@ major	{cd = 3}
 
 define	pcmcia {}			# XXX dummy decl...
 include	"../../../dev/isa/files.isa"
-major	{ wd = 5 }		# Not even in bdevsw XXX
+#major	{ wd = 5 }		# Not even in bdevsw XXX
 
 device	pckbc { } 
 attach	pckbc at isa
@@ -94,7 +101,118 @@ include "../../../dev/isa/files.isapnp"
 file    arch/powerpc/isa/isapnp_machdep.c   isapnp   
 
 #
-# "wprkstation cpnsole" routines
+# "workstation console" routines
 #
 
 include "dev/wscons/files.wscons"
+
+
+#device ofb: wsemuldisplaydev, wsrasteremulops
+device ofb
+attach ofb at pci
+file arch/powerpc/mac/ofb.c				ofb needs-flag
+
+
+#
+# mac peripheral pieces.
+#
+
+#file arch/powerpc/pci/bandit.c			pci
+
+# PCI bus support
+
+#PCI-Host bridge chipsets
+device pchb
+attach pchb at pci
+file arch/powerpc/pci/pchb.c			pchb
+
+
+#
+# Machine-independent ATAPI drivers
+#
+
+include "../../../dev/atapiscsi/files.atapiscsi"
+include "../../../dev/ata/files.ata"
+
+# MAC periph 
+
+device obio {} : macintr
+attach obio at pci
+file arch/powerpc/pci/macobio.c                     obio
+
+device esp: scsi, ncr53c9x
+attach esp at obio
+file arch/powerpc/mac/esp.c                      esp
+
+device mesh: scsi
+attach mesh at obio
+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
+
+device bm: ether, ifnet, ifmedia
+attach bm at obio
+file arch/powerpc/mac/if_bm.c                    bm
+
+device zsc {channel = -1}
+attach zsc at obio
+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
+
+device adb {}
+attach adb at obio
+file arch/powerpc/mac/adb.c                      adb needs-flag
+file arch/powerpc/mac/adb_direct.c               adb
+file arch/powerpc/mac/pm_direct.c                adb
+
+device aed
+attach aed at adb
+file arch/powerpc/mac/aed.c                      aed needs-flag
+
+#??
+#define wskbddev	{[console = -1]}
+#define wsmousedev {}
+#??
+
+#device akbd: wskbddev
+#attach akbd at adb
+#file arch/powerpc/mac/akbd.c                     akbd needs-flag
+
+#device ams: wsmousedev
+#attach ams at adb
+#file arch/powerpc/mac/ams.c                      ams
+
+device nvram
+attach nvram at obio
+file arch/powerpc/mac/nvram.c                    nvram needs-flag
+
+
+attach wdc at obio with wdc_obio
+file arch/powerpc/mac/wdc_obio.c                 wdc_obio
+
+define grfdev {}
+
+device grfati: grfdev
+attach grfati at pci
+file arch/powerpc/mac/grf_ati.c                  grfati needs-flag
+
+device grf {}
+attach grf at grfdev
+file arch/powerpc/mac/grf.c                      grf needs-flag
+file arch/powerpc/mac/grf_subr.c                 grf
+
+device ite: tty
+attach ite at grf
+file arch/powerpc/mac/ite.c                      ite needs-flag
+
+#
+# Machine-independent USB drivers
+#
+include "dev/usb/files.usb"