diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-04-07 16:52:03 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-04-07 16:52:03 +0000 |
commit | d74b330ab4675c04052e0562b71d13b385e9aec8 (patch) | |
tree | d8a1b559c9a526013264023d5eb20fcabbd0cee3 /sys/arch/hppa/conf | |
parent | 69ad5e1459559a1339ddeb4cc3c6010b16177547 (diff) |
move out non-gsc devices from the gsc section
Diffstat (limited to 'sys/arch/hppa/conf')
-rw-r--r-- | sys/arch/hppa/conf/GENERIC | 13 | ||||
-rw-r--r-- | sys/arch/hppa/conf/RAMDISK | 11 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index bc11086b918..5f81b15a01a 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.32 2003/04/07 16:33:41 mickey Exp $ +# $OpenBSD: GENERIC,v 1.33 2003/04/07 16:52:02 mickey Exp $ # Machine architecture; required by config(8) machine hppa @@ -46,6 +46,10 @@ sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* sti1 at mainbus0 disable irq 12 +#medusa* at mainbus? irq 4 # FDDI +#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) +#scsibus* at siop? + # internal i/o space gsc0 at asp? # Snakes, old 715, old 725, 735/755 gsc0 at lasi0 # 712,715/100,725/64,725/100,[ABCJ]* @@ -69,8 +73,6 @@ hilkbd* at hil? code ? # keyboard, knob and buttons hilms* at hil? code ? # mouse and tablets hilid* at hil? code ? # ID module -#medusa* at gsc? irq 4 # FDDI - # RS/232 serial ports com0 at gsc0 offset 0x5000 irq 5 # on lasi com1 at gsc1 offset 0x5000 irq 5 @@ -83,11 +85,8 @@ lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 ie0 at gsc0 irq 8 # 82C596DX/CA ether ie1 at gsc1 irq 8 #tms* at gsc? irq 10 # TMS380C26 Network Controller (802.3 or 802.5) -osiop0 at gsc? irq 9 # NCR 53C700/710 (Narrow SE) +osiop* at gsc? irq 9 # NCR 53C700/710 (Narrow SE) scsibus* at osiop? -#scsibus* at siop? -#siop1 at gsc? irq 3 # NCR 53C720 (Fast/Wide Diff) -#scsibus* at siop? harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) audio* at harmony? gsckbc* at gsc? irq 26 diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 577c4b2a3cb..1abe3e801ae 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.16 2003/04/07 16:33:42 mickey Exp $ +# $OpenBSD: RAMDISK,v 1.17 2003/04/07 16:52:02 mickey Exp $ # # Diskless kernel config # @@ -63,6 +63,10 @@ sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* sti1 at mainbus0 disable irq 12 +#medusa* at mainbus? irq 4 # FDDI +#siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide Diff) +#scsibus* at siop? + # internal i/o space gsc0 at asp? # Snakes, old 715, old 725, 735/755 gsc0 at lasi0 # 712,715/100,725/64,725/100,[ABCJ]* @@ -86,8 +90,6 @@ hilkbd* at hil? code ? # keyboard, knob and buttons #hilms* at hil? code ? # mouse and tablets #hilid* at hil? code ? # ID module -#medusa* at gsc? irq 4 # FDDI - # RS/232 serial ports com0 at gsc0 offset 0x5000 irq 5 # on lasi com1 at gsc1 offset 0x5000 irq 5 @@ -100,8 +102,7 @@ lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 ie0 at gsc0 irq 8 # 82C596DX/CA ether ie1 at gsc1 irq 8 #tms* at gsc? irq 10 # TMS380C26 Network Controller (802.3 or 802.5) -osiop0 at gsc? irq 9 # NCR 53C700/710 (Narrow SE) -#siop1 at gsc? irq 3 # NCR 53C720 (Fast/Wide Diff) +osiop* at gsc? irq 9 # NCR 53C700/710 (Narrow SE) scsibus* at osiop? #harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) #audio* at harmony? |