Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/netwinder More changes to get the netwinder to mult...
details: https://anonhg.NetBSD.org/src/rev/2b1c5e3b5096
branches: trunk
changeset: 508828:2b1c5e3b5096
user: matt <matt%NetBSD.org@localhost>
date: Fri Apr 20 16:09:48 2001 +0000
description:
More changes to get the netwinder to multiuser. Hack the initarm code
to reserve the first 2MB for the kernel. Use the netwinder specific
files. Add pci_attach_hook for init the pci devices. Add and alternate
id for the PCI ISA bridge.
diffstat:
sys/arch/netwinder/conf/files.netwinder | 346 +----------------------
sys/arch/netwinder/netwinder/netwinder_machdep.c | 17 +-
sys/arch/netwinder/netwinder/nwmmu.S | 10 +-
sys/arch/netwinder/pci/pci_machdep.c | 108 +++++++
sys/arch/netwinder/pci/pcib.c | 9 +-
5 files changed, 145 insertions(+), 345 deletions(-)
diffs (truncated from 660 to 300 lines):
diff -r 2113e8b952fd -r 2b1c5e3b5096 sys/arch/netwinder/conf/files.netwinder
--- a/sys/arch/netwinder/conf/files.netwinder Fri Apr 20 16:08:46 2001 +0000
+++ b/sys/arch/netwinder/conf/files.netwinder Fri Apr 20 16:09:48 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.netwinder,v 1.1 2001/04/19 07:01:11 matt Exp $
+# $NetBSD: files.netwinder,v 1.2 2001/04/20 16:09:48 matt Exp $
#
# First try for arm-specific configuration info
#
@@ -44,27 +44,6 @@
include "dev/ata/files.ata"
major {wd = 16}
-# PIOC (Peripheral IO Controller) device
-# parent to wdc, fdc, com and lpt
-device pioc { [offset = -1], [dack = -1], [irq = -1] }
-attach pioc at mainbus
-file arch/arm32/mainbus/pioc.c pioc
-
-# Standard NetBSD wdc driver
-attach wdc at pioc with wdc_pioc
-file arch/arm32/mainbus/wdc_pioc.c wdc_pioc
-
-# Standard parallel driver
-attach lpt at pioc with lpt_pioc
-file arch/arm32/mainbus/lpt_pioc.c lpt_pioc
-
-# Common OFW files
-include "dev/ofw/files.ofw"
-attach ofbus at root with ofbus_root
-file arch/arm32/ofw/ofw.c ofw
-file arch/arm32/ofw/openfirm.c ofw
-file arch/arm32/ofw/oftodclock.c ofw & (shark | ofwgencfg)
-
# ISA DMA glue
file arch/arm32/isa/isadma_machdep.c isadma
@@ -76,39 +55,6 @@
attach joy at isapnp with joy_isapnp
file arch/arm32/isa/joy_isapnp.c joy_isapnp
-# OFW ISA bus driver.
-include "dev/ofisa/files.ofisa"
-file arch/arm32/ofw/ofisa_machdep.c ofisa
-file arch/arm32/ofw/com_ofisa_machdep.c com_ofisa
-file arch/arm32/ofw/com_ofisa_consolehack.c com_ofisa # XXX
-file arch/arm32/ofw/if_cs_ofisa_machdep.c cs_ofisa
-file arch/arm32/ofw/lpt_ofisa_machdep.c lpt_ofisa
-file arch/arm32/ofw/wdc_ofisa_machdep.c wdc_ofisa
-
-# Glue for OFW ISA device attachment
-device ofisapc {}
-attach ofisapc at ofbus
-file arch/arm32/ofw/ofisapc.c pc & ofw
-device ofisascr {}
-attach ofisascr at ofisa
-file arch/arm32/ofw/ofisascr.c scr & ofw
-
-device ofrom
-attach ofrom at ofbus
-file arch/arm32/ofw/ofrom.c ofrom needs-flag
-
-# Standard NetBSD fd driver
-device fdc {drive = -1}
-attach fdc at pioc
-device fd: disk
-attach fd at fdc
-file arch/arm32/mainbus/fd.c fdc needs-flag
-major {fd = 17}
-
-# Standard serial driver
-attach com at pioc with com_pioc
-file arch/arm32/mainbus/com_pioc.c com_pioc
-
# Memory disk driver
file arch/arm32/dev/md_hooks.c md & memory_disk_hooks
major {md = 18}
@@ -116,150 +62,10 @@
# RAIDframe
major {raid = 71}
-# IOMD device
-# parent to kbd, qms, pms, iic
-# also provides irq and timer services
-device iomd {}
-attach iomd at mainbus
-file arch/arm32/iomd/iomd.c iomd needs-flag
-file arch/arm32/iomd/iomd_io.c iomd
-file arch/arm32/iomd/iomd_io_asm.S iomd
-file arch/arm32/iomd/iomd_irq.S iomd
-file arch/arm32/iomd/iomd_irqhandler.c iomd
-file arch/arm32/iomd/iomd_fiq.S iomd
-file arch/arm32/iomd/iomd_dma.c iomd
-
-# IOMD mouse devices
-# clock device
-device clock
-attach clock at iomd
-file arch/arm32/iomd/iomd_clock.c iomd
-
-# quadmouse device
-device qms
-file arch/arm32/dev/qms.c qms needs-flag
-
-attach qms at iomd with qms_iomd
-file arch/arm32/iomd/qms_iomd.c qms_iomd
-
-# wscons quadmouse device
-device wsqms : wsmousedev
-file arch/arm32/dev/wsqms.c wsqms needs-flag
-
-attach wsqms at iomd with wsqms_iomd
-file arch/arm32/iomd/wsqms_iomd.c wsqms_iomd
-
-# attribute used to represent the "keyboard controller" on the shark
-# XXX should be a real device
-define spckbd { [irq = -1], [port = -1] }
-
-# PS/2 mouse device
-device opms: tty
-file arch/arm32/dev/pms.c opms & opms_iomd needs-flag
-file arch/arm32/shark/pms.c opms & ofw needs-flag
-
-attach opms at spckbd with opms
-attach opms at iomd with opms_iomd
-file arch/arm32/iomd/pms_iomd.c opms_iomd
-
-# Standard keyboard driver
-device kbd
-file arch/arm32/dev/kbd.c kbd needs-flag
-
-attach kbd at iomd with kbd_iomd
-file arch/arm32/iomd/kbd_iomd.c kbd_iomd
-
-# RPC wscons keyboard driver
-device rpckbd : wskbddev
-file arch/arm32/dev/rpckbd.c rpckbd needs-flag
-file arch/arm32/dev/wskbdmap_mfii.c rpckbd
-
-attach rpckbd at iomd with rpckbd_iomd
-file arch/arm32/iomd/rpckbd_iomd.c rpckbd_iomd
-
-# IIC device
-device iic { addr = -1 }
-file arch/arm32/dev/iic.c iic needs-flag
-
-attach iic at iomd with iic_iomd
-file arch/arm32/iomd/iic_iomd.c iic_iomd
-file arch/arm32/iomd/iomd_iic.S iic_iomd
-
-# IIC based RTC
-device rtc : todservice
-attach rtc at iic
-file arch/arm32/dev/rtc.c rtc needs-flag
-
device todclock
attach todclock at todservice
file arch/arm32/dev/todclock.c todclock needs-count
-# VIDC device
-# parent to vidcconsole, vidcaudio, beep
-device vidc { [base = -1], [dack = -1], [irq = -1] }
-attach vidc at mainbus
-file arch/arm32/vidc/vidc20.c vidc needs-count
-
-# VIDC video wscons device
-device vidcvideo: rasops4, rasops8, rasops16, rasops32, wsemuldisplaydev
-attach vidcvideo at vidc
-file arch/arm32/vidc/vidc20config.c vidcvideo needs-flag
-file arch/arm32/vidc/vidcvideo.c vidcvideo needs-flag
-
-# Audio devices
-device beep
-attach beep at vidc
-file arch/arm32/vidc/beep.c beep needs-flag
-
-device vidcaudio: audio
-attach vidcaudio at vidc
-file arch/arm32/vidc/vidcaudio.c vidcaudio needs-flag
-
-device lmcaudio: audio
-attach lmcaudio at vidc
-file arch/arm32/vidc/lmcaudio.c lmcaudio needs-flag
-file arch/arm32/vidc/lmc1982.S lmcaudio
-
-# Podule bus device
-device podulebus { [slot = -1] }
-attach podulebus at root
-file arch/arm32/podulebus/podulebus.c podulebus needs-flag
-file arch/arm32/podulebus/podulebus_io.c podulebus
-file arch/arm32/podulebus/podulebus_io_asm.S podulebus
-
-include "dev/podulebus/files.podulebus"
-
-# Ethernet devices
-
-# Novell NE1000 and NE2000 clones (EtherM, EtherH)
-attach ne at podulebus with ne_pbus
-file arch/arm32/podulebus/if_ne_pbus.c ne_pbus
-
-device oea: ether, ifnet, arp
-attach oea at podulebus
-file arch/arm32/podulebus/if_ea.c oea
-
-device oeb: ether, ifnet, arp
-attach oeb at podulebus
-file arch/arm32/podulebus/if_eb.c oeb
-
-device ie: ether, ifnet, arp
-attach ie at podulebus
-file arch/arm32/podulebus/if_ie.c ie
-
-device es: ether, ifnet, arp
-attach es at mainbus
-file arch/arm32/rc7500/if_es.c es & rc7500
-
-#define ipkdb
-
-#device kie: ipkdb
-#attach kie at podule
-#file arch/arm32/podulebus/ipkdb_ie.c kie
-
-#file arch/arm32/arm32/ipkdb_glue.c ipkdb
-#file arch/arm32/arm32/ipkdb_step.c ipkdb
-
#
# Machine-independent SCSI drivers
#
@@ -268,84 +74,6 @@
major {sd = 24}
major {cd = 26}
-# Generic sbic (WD3393) driver
-define sbic
-file arch/arm32/podulebus/sbic.c sbic
-
-# Acorn SCSI I specific layer for sbic
-device asc: scsi, sbic
-attach asc at podulebus
-file arch/arm32/podulebus/asc.c asc needs-flag
-
-# Generic AMD AM53C94 driver
-define esc
-file arch/arm32/podulebus/esc.c esc
-
-# Connect32 specific layer for esc
-device cosc: scsi, esc
-attach cosc at podulebus
-file arch/arm32/podulebus/cosc.c cosc
-
-# Generic fas216 + esp216 driver
-define sfas
-file arch/arm32/podulebus/sfas.c sfas
-
-device ptsc: scsi, sfas
-attach ptsc at podulebus
-file arch/arm32/podulebus/ptsc.c ptsc
-
-device csc: scsi, sfas
-attach csc at podulebus
-file arch/arm32/podulebus/csc.c csc
-
-# Oak specific layer for ncr5380
-device oak: scsi, ncr5380sbc
-attach oak at podulebus
-file arch/arm32/podulebus/oak.c oak
-
-# Cumana SCSI1 specific layer for ncr5380
-device csa: scsi, ncr5380sbc
-attach csa at podulebus
-file arch/arm32/podulebus/csa.c csa
-
-# ICS IDE driver
-device icside {[channel = -1]}: wdc_base, ata, atapi
-attach icside at podulebus
-file arch/arm32/podulebus/icside.c icside
-file arch/arm32/podulebus/icside_io_asm.S icside
-
-# Yellowstone RapIDE driver
-device rapide {[channel = -1]}: wdc_base, ata, atapi
-attach rapide at podulebus
-file arch/arm32/podulebus/rapide.c rapide
-file arch/arm32/podulebus/rapide_io_asm.S rapide
-
-# Simtec IDE driver
-device simide {[channel = -1]}: wdc_base, ata, atapi
-attach simide at podulebus
-file arch/arm32/podulebus/simide.c simide
-file arch/arm32/podulebus/simide_io_asm.S simide
-
-# Atomwide Multi-Port Serial driver
-device amps {}
-attach amps at podulebus
-attach com at amps with com_amps
-file arch/arm32/podulebus/amps.c amps
-
-device vidcconsole
-attach vidcconsole at vidc
-file arch/arm32/vidc/console/vidcconsole.c vidcconsole needs-count
-device vt: tty
Home |
Main Index |
Thread Index |
Old Index