diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index f98ba358f040..3adcaa2f0566 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.29 1994/12/01 17:24:44 chopps Exp $ +# $NetBSD: GENERIC,v 1.30 1994/12/28 09:13:40 chopps Exp $ # # GENERIC AMIGA @@ -110,8 +110,8 @@ options GRF_AGA # AGA Chip Set #options "KFONT_8X11" # 8x11 font grfcc0 at mainbus0 # custom chips -grfrt0 at ztwobus0 # retina II -grfrh0 at zthreebus0 # retina III +grfrt0 at zbus0 # retina II +grfrh0 at zbus0 # retina III grf0 at grfcc0 grf1 at grfrt0 @@ -121,36 +121,48 @@ ite0 at grf0 # terminal emulators for grf's ite1 at grf1 # terminal emulators for grf's ite2 at grf2 # terminal emulators for grf's -le0 at ztwobus0 # Lance ethernet. -ed0 at ztwobus0 # dp8390 ethernet +mfc0 at zbus0 # MultiFaceCard I/O board +mfcs0 at mfc0 unit 0 # MFC serial +mfcs1 at mfc0 unit 1 # MFC serial +#mfcp0 at mfc0 unit 0 # MFC parallel +#mfc1 at zbus0 # MultiFaceCard 2nd I/O board +#mfcs2 at mfc1 unit 0 +#mfcs3 at mfc1 unit 1 +#mfcp1 at mfc1 unit 0 + +le0 at zbus0 # Lance ethernet. +ed0 at zbus0 # dp8390 ethernet # scsi stuff, all possible -gvpbus0 at ztwobus0 +gvpbus0 at zbus0 gtsc0 at gvpbus0 # GVP series II scsi ahsc0 at mainbus0 # A3000 scsi -atzsc0 at ztwobus0 -wstsc0 at ztwobus0 # Wordsync II scsi -ivsc0 at ztwobus0 # IVS scsi -mlhsc0 at ztwobus0 # Hacker scsi -otgsc0 at ztwobus0 # 12 gauge scsi -zssc0 at ztwobus0 # Zeus scsi -mgnsc0 at ztwobus0 # Magnum scsi -wesc0 at zthreebus0 # Warp Engine scsi +atzsc0 at zbus0 +wstsc0 at zbus0 # Wordsync II scsi +ivsc0 at zbus0 # IVS scsi +mlhsc0 at zbus0 # Hacker scsi +otgsc0 at zbus0 # 12 gauge scsi +zssc0 at zbus0 # Zeus scsi +mgnsc0 at zbus0 # Magnum scsi +wesc0 at zbus0 # Warp Engine scsi idesc0 at mainbus0 # A4000 & A1200 IDE -afsc0 at zthreebus0 # 4091 scsi +afsc0 at zbus0 # A4091 scsi +flz3sc0 at zbus0 # FastlaneZ3 scsi + +scsibus* at gtsc0 +scsibus* at ahsc0 +scsibus* at atzsc0 +scsibus* at wstsc0 +scsibus* at ivsc0 +scsibus* at mlhsc0 +scsibus* at otgsc0 +scsibus* at zssc0 +scsibus* at mgnsc0 +scsibus* at wesc0 +scsibus* at idesc0 +scsibus* at afsc0 +scsibus* at flz3sc0 -scsibus0 at gtsc0 -scsibus1 at ahsc0 -scsibus2 at atzsc0 -scsibus3 at wstsc0 -scsibus4 at ivsc0 -scsibus5 at mlhsc0 -scsibus6 at otgsc0 -scsibus7 at zssc0 -scsibus8 at mgnsc0 -scsibus9 at wesc0 -scsibus10 at idesc0 -scsibus11 at afsc0 # each hard drive from low target to high # will configure to the next available sd unit number sd* at scsibus? target ? lun ? # scsi disks diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga index 78ee90fb8dbb..0584bfc8c70f 100644 --- a/sys/arch/amiga/conf/files.amiga +++ b/sys/arch/amiga/conf/files.amiga @@ -1,4 +1,4 @@ -# $NetBSD: files.amiga,v 1.14 1994/12/01 17:24:46 chopps Exp $ +# $NetBSD: files.amiga,v 1.15 1994/12/28 09:13:42 chopps Exp $ maxusers 2 8 64 @@ -7,8 +7,8 @@ device mainbus at root {} device cpu at mainbus # zorro II expansion bus. -device ztwobus at mainbus {} -file arch/amiga/dev/ztwobus.c ztwobus +device zbus at mainbus {} +file arch/amiga/dev/zbus.c zbus define event {} file arch/amiga/dev/event.c event @@ -63,29 +63,47 @@ file arch/amiga/dev/grfabs_cc.c grfcc view file arch/amiga/dev/grfabs_ccglb.c grfcc view # retina grf -device grfrt at ztwobus: grfbus +device grfrt at zbus: grfbus file arch/amiga/dev/grf_rt.c grfrt needs-flag file arch/amiga/dev/ite_rt.c grfrt ite -# zorro III expansion bus. -device zthreebus at mainbus {} -file arch/amiga/dev/zthreebus.c zthreebus +# cirrus grf (A2000 or Picasso) +device grfcl at zbus: grfbus +file arch/amiga/dev/grf_cl.c grfcl needs-flag # retina ZIII grf -device grfrh at zthreebus: grfbus +device grfrh at zbus: grfbus file arch/amiga/dev/grf_rh.c grfrh needs-flag file arch/amiga/dev/ite_rh.c grfrh ite +# cirrus grf (Zorro III boards) +#device grfcl at zbus: grfbus +#device grfclx at zbus: grfbus +#file arch/amiga/dev/grf_cl.c grfcl grfclx needs-flag + # handle gvp's odd autoconf info.. -device gvpbus at ztwobus {} +device gvpbus at zbus {} file arch/amiga/dev/gvpbus.c gvpbus -device le at ztwobus: ifnet, ether +device le at zbus: ifnet, ether file arch/amiga/dev/if_le.c le needs-count -device ed at ztwobus: ifnet, ether +device ed at zbus: ifnet, ether file arch/amiga/dev/if_ed.c ed needs-flag +device ex at zbus: ifnet, ether +file arch/amiga/dev/if_ex.c ex needs-count + +# Alf Data MultiFaceCard 3 +#device mfch at zbus: tty +#file arch/amiga/dev/mfch.c mfch needs-count +# bsc/Alf Data MultiFaceCard +device mfc at zbus { unit = -1 } + +device mfcs at mfc +device mfcp at mfc +file arch/amiga/dev/mfc.c mfcs mfcp needs-count + define scsi {} # wd 33c93 contrllers @@ -93,7 +111,7 @@ define sbic file arch/amiga/dev/sbic.c sbic # C= A2091 -device atzsc at ztwobus: scsi, sbic +device atzsc at zbus: scsi, sbic file arch/amiga/dev/atzsc.c atzsc needs-flag # GVP series II @@ -109,19 +127,19 @@ define siop file arch/amiga/dev/siop.c siop # PPI Zeus -device zssc at ztwobus: scsi, siop +device zssc at zbus: scsi, siop file arch/amiga/dev/zssc.c zssc needs-flag # CSA Magnum -device mgnsc at ztwobus: scsi, siop +device mgnsc at zbus: scsi, siop file arch/amiga/dev/mgnsc.c mgnsc needs-flag # MacroSystems Warp Engine -device wesc at zthreebus: scsi, siop +device wesc at zbus: scsi, siop file arch/amiga/dev/wesc.c wesc needs-flag # C= A4091 -device afsc at zthreebus: scsi, siop +device afsc at zbus: scsi, siop file arch/amiga/dev/afsc.c afsc needs-flag # ncr 5380 controllers @@ -129,21 +147,29 @@ define sci file arch/amiga/dev/sci.c sci # Supra Wordsync II -device wstsc at ztwobus: scsi, sci +device wstsc at zbus: scsi, sci file arch/amiga/dev/wstsc.c wstsc needs-flag # IVS -device ivsc at ztwobus: scsi, sci +device ivsc at zbus: scsi, sci file arch/amiga/dev/ivsc.c ivsc needs-flag # CSA twelve gauge. -device otgsc at ztwobus: scsi, sci +device otgsc at zbus: scsi, sci file arch/amiga/dev/otgsc.c otgsc needs-flag # MLH -device mlhsc at ztwobus: scsi, sci +device mlhsc at zbus: scsi, sci file arch/amiga/dev/mlhsc.c mlhsc needs-flag +# Emulex ESP216 & FAS216 controllers +define fas +file arch/amiga/dev/fas.c fas + +# FastlaneZ3 +device flz3sc at zbus: scsi, fas +file arch/amiga/dev/flz3sc.c flz3sc needs-flag + # Amiga 4000/1200 IDE masquerading as SCSI device idesc at mainbus: scsi file arch/amiga/dev/idesc.c idesc needs-flag diff --git a/sys/arch/amiga/conf/files.amiga.newconf b/sys/arch/amiga/conf/files.amiga.newconf index 64a19777c4bd..e2e4e25f8eeb 100644 --- a/sys/arch/amiga/conf/files.amiga.newconf +++ b/sys/arch/amiga/conf/files.amiga.newconf @@ -1,4 +1,4 @@ -# $NetBSD: files.amiga.newconf,v 1.14 1994/12/01 17:24:46 chopps Exp $ +# $NetBSD: files.amiga.newconf,v 1.15 1994/12/28 09:13:42 chopps Exp $ maxusers 2 8 64 @@ -7,8 +7,8 @@ device mainbus at root {} device cpu at mainbus # zorro II expansion bus. -device ztwobus at mainbus {} -file arch/amiga/dev/ztwobus.c ztwobus +device zbus at mainbus {} +file arch/amiga/dev/zbus.c zbus define event {} file arch/amiga/dev/event.c event @@ -63,29 +63,47 @@ file arch/amiga/dev/grfabs_cc.c grfcc view file arch/amiga/dev/grfabs_ccglb.c grfcc view # retina grf -device grfrt at ztwobus: grfbus +device grfrt at zbus: grfbus file arch/amiga/dev/grf_rt.c grfrt needs-flag file arch/amiga/dev/ite_rt.c grfrt ite -# zorro III expansion bus. -device zthreebus at mainbus {} -file arch/amiga/dev/zthreebus.c zthreebus +# cirrus grf (A2000 or Picasso) +device grfcl at zbus: grfbus +file arch/amiga/dev/grf_cl.c grfcl needs-flag # retina ZIII grf -device grfrh at zthreebus: grfbus +device grfrh at zbus: grfbus file arch/amiga/dev/grf_rh.c grfrh needs-flag file arch/amiga/dev/ite_rh.c grfrh ite +# cirrus grf (Zorro III boards) +#device grfcl at zbus: grfbus +#device grfclx at zbus: grfbus +#file arch/amiga/dev/grf_cl.c grfcl grfclx needs-flag + # handle gvp's odd autoconf info.. -device gvpbus at ztwobus {} +device gvpbus at zbus {} file arch/amiga/dev/gvpbus.c gvpbus -device le at ztwobus: ifnet, ether +device le at zbus: ifnet, ether file arch/amiga/dev/if_le.c le needs-count -device ed at ztwobus: ifnet, ether +device ed at zbus: ifnet, ether file arch/amiga/dev/if_ed.c ed needs-flag +device ex at zbus: ifnet, ether +file arch/amiga/dev/if_ex.c ex needs-count + +# Alf Data MultiFaceCard 3 +#device mfch at zbus: tty +#file arch/amiga/dev/mfch.c mfch needs-count +# bsc/Alf Data MultiFaceCard +device mfc at zbus { unit = -1 } + +device mfcs at mfc +device mfcp at mfc +file arch/amiga/dev/mfc.c mfcs mfcp needs-count + define scsi {} # wd 33c93 contrllers @@ -93,7 +111,7 @@ define sbic file arch/amiga/dev/sbic.c sbic # C= A2091 -device atzsc at ztwobus: scsi, sbic +device atzsc at zbus: scsi, sbic file arch/amiga/dev/atzsc.c atzsc needs-flag # GVP series II @@ -109,19 +127,19 @@ define siop file arch/amiga/dev/siop.c siop # PPI Zeus -device zssc at ztwobus: scsi, siop +device zssc at zbus: scsi, siop file arch/amiga/dev/zssc.c zssc needs-flag # CSA Magnum -device mgnsc at ztwobus: scsi, siop +device mgnsc at zbus: scsi, siop file arch/amiga/dev/mgnsc.c mgnsc needs-flag # MacroSystems Warp Engine -device wesc at zthreebus: scsi, siop +device wesc at zbus: scsi, siop file arch/amiga/dev/wesc.c wesc needs-flag # C= A4091 -device afsc at zthreebus: scsi, siop +device afsc at zbus: scsi, siop file arch/amiga/dev/afsc.c afsc needs-flag # ncr 5380 controllers @@ -129,21 +147,29 @@ define sci file arch/amiga/dev/sci.c sci # Supra Wordsync II -device wstsc at ztwobus: scsi, sci +device wstsc at zbus: scsi, sci file arch/amiga/dev/wstsc.c wstsc needs-flag # IVS -device ivsc at ztwobus: scsi, sci +device ivsc at zbus: scsi, sci file arch/amiga/dev/ivsc.c ivsc needs-flag # CSA twelve gauge. -device otgsc at ztwobus: scsi, sci +device otgsc at zbus: scsi, sci file arch/amiga/dev/otgsc.c otgsc needs-flag # MLH -device mlhsc at ztwobus: scsi, sci +device mlhsc at zbus: scsi, sci file arch/amiga/dev/mlhsc.c mlhsc needs-flag +# Emulex ESP216 & FAS216 controllers +define fas +file arch/amiga/dev/fas.c fas + +# FastlaneZ3 +device flz3sc at zbus: scsi, fas +file arch/amiga/dev/flz3sc.c flz3sc needs-flag + # Amiga 4000/1200 IDE masquerading as SCSI device idesc at mainbus: scsi file arch/amiga/dev/idesc.c idesc needs-flag diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga index 3559c91ba5da..725b6cc92288 100644 --- a/sys/arch/amiga/conf/std.amiga +++ b/sys/arch/amiga/conf/std.amiga @@ -1,4 +1,4 @@ -# $NetBSD: std.amiga,v 1.4 1994/10/26 02:02:31 cgd Exp $ +# $NetBSD: std.amiga,v 1.5 1994/12/28 09:13:45 chopps Exp $ # standard amiga information @@ -12,7 +12,7 @@ par0 at mainbus0 kbd0 at mainbus0 fdc0 at mainbus0 fd0 at fdc0 unit 0 -ztwobus0 at mainbus0 -zthreebus0 at mainbus0 +zbus0 at mainbus0 +# zthreebus0 at mainbus0 pseudo-device mouse 2