patch-2.0.21-2.1.0 linux/arch/m68k/amiga/zorro.c
Next file: linux/arch/m68k/atari/Makefile
Previous file: linux/arch/m68k/amiga/ksyms.c
Back to the patch index
Back to the overall index
- Lines: 551
- Date:
Wed Sep 25 10:47:38 1996
- Orig file:
lx2.0/v2.0.21/linux/arch/m68k/amiga/zorro.c
- Orig date:
Mon May 20 07:54:26 1996
diff -u --recursive --new-file lx2.0/v2.0.21/linux/arch/m68k/amiga/zorro.c linux/arch/m68k/amiga/zorro.c
@@ -13,9 +13,9 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <asm/setup.h>
#include <asm/bitops.h>
#include <asm/amigahw.h>
-#include <asm/bootinfo.h>
#include <asm/zorro.h>
@@ -69,12 +69,23 @@
* long (max. 80 characters per board identification line)
*/
+BEGIN_PROD(PACIFIC)
+ PROD("SE 2000 A500", SE_2000_A500)
+ PROD("HD Controller", PACIFIC_HD)
+END
+
+BEGIN_PROD(KUPKE)
+ PROD("Golem RAM Box 2MB", GOLEM_BOX_2)
+END
+
BEGIN_PROD(MEMPHIS)
PROD("Stormbringer", STORMBRINGER)
END
BEGIN_PROD(COMMODORE2)
- PROD("A2088 Bridgeboard", A2088)
+ PROD("A2088 XT Bridgeboard", A2088)
+ PROD("A2286 AT Bridgeboard", A2286)
+ PROD("A4091 SCSI Controller", A4091_2)
PROD("A2386-SX Bridgeboard", A2386SX)
END
@@ -91,22 +102,68 @@
PROD("A2620 68020/RAM Card", A2620)
PROD("A2630 68030/RAM Card", A2630)
PROD("A4091 SCSI Controller", A4091)
+ PROD("A2065 Ethernet Card", A2065_2)
PROD("Romulator Card", ROMULATOR)
PROD("A3000 Test Fixture", A3000TESTFIX)
+ PROD("A2386-SX Bridgeboard", A2386SX_2)
PROD("A2065 Ethernet Card", A2065)
END
+BEGIN_PROD(COMMODORE3)
+ PROD("A2090A Combitec/MacroSystem", A2090A_CM)
+END
+
+BEGIN_PROD(KCS)
+ PROD("KCS Power PC Board", POWER_BOARD)
+END
+
BEGIN_PROD(CARDCO)
+ PROD("Kronos 2000 SCSI Controller", KRONOS_2000_SCSI)
+ PROD("A1000 SCSI Controller", A1000_SCSI)
+ PROD("Escort SCSI Controller", ESCORT_SCSI)
PROD("Cardco A2410 Hires Graphics card", CC_A2410)
END
+BEGIN_PROD(A_SQUARED)
+ PROD("Live! 2000", LIVE_2000)
+END
+
+BEGIN_PROD(COMSPEC)
+ PROD("AX2000", AX2000)
+END
+
+BEGIN_PROD(ANAKIN)
+ PROD("Easyl Tablet", EASYL)
+END
+
BEGIN_PROD(MICROBOTICS)
+ PROD("StarBoard II", STARBOARD_II)
+ PROD("StarDrive", STARDRIVE)
+ PROD("8-Up (Rev A)", 8_UP_A)
+ PROD("8-Up (Rev Z)", 8_UP_Z)
+ PROD("VXL RAM", VXL_RAM)
PROD("VXL-30 Turbo Board", VXL_30)
+ PROD("MBX 1200", MBX_1200)
+ PROD("Hardframe 2000", HARDFRAME_2000)
+ PROD("MBX 1200", MBX_1200_2)
+END
+
+BEGIN_PROD(ACCESS)
+END
+
+BEGIN_PROD(EXPANSION_TECH)
END
BEGIN_PROD(ASDG)
+ PROD("Memory Expansion", ASDG_MEMORY)
+ PROD("Memory Expansion", ASDG_MEMORY_2)
PROD("Lan Rover Ethernet", LAN_ROVER)
- PROD("Dual Serial Card", ASDG_DUAL_SERIAL)
+ PROD("Twin-X Serial Card", TWIN_X)
+END
+
+BEGIN_PROD(IMTRONICS)
+ PROD("Hurricane 2800 68030", HURRICANE_2800)
+ PROD("Hurricane 2800 68030", HURRICANE_2800_2)
END
BEGIN_PROD(UNIV_OF_LOWELL)
@@ -120,9 +177,15 @@
END
BEGIN_PROD(SUPRA)
+ PROD("SupraDrive 4x4 SCSI Controller", SUPRADRIVE_4x4)
+ PROD("2000 DMA HD", SUPRA_2000)
+ PROD("500 HD/RAM", SUPRA_500)
+ PROD("500RX/2000 RAM", SUPRA_500RX)
+ PROD("500RX/2000 RAM", SUPRA_500RX_2)
+ PROD("2400zi Modem", SUPRA_2400ZI)
PROD("Wordsync SCSI Controller", WORDSYNC)
PROD("Wordsync II SCSI Controller", WORDSYNC_II)
- PROD("2400 Modem", SUPRA_2400MODEM)
+ PROD("2400zi+ Modem", SUPRA_2400ZIPLUS)
END
BEGIN_PROD(CSA)
@@ -130,21 +193,35 @@
PROD("12 Gauge SCSI Controller", 12GAUGE)
END
+BEGIN_PROD(GVP3)
+ PROD("Impact SCSI/Memory", IMPACT)
+END
+
+BEGIN_PROD(BYTEBOX)
+ PROD("A500", BYTEBOX_A500)
+END
+
BEGIN_PROD(POWER_COMPUTING)
- PROD("Viper II Turbo Board (DKB 1240)", DKB_1240)
+ PROD("DKB 3128 RAM", DKB_3128)
+ PROD("DKB Cobra / Viper II Turbo Board", VIPER_II_COBRA)
END
BEGIN_PROD(GVP)
+ PROD("Impact Series-I SCSI 4K", IMPACT_I_4K)
+ PROD("Impact Series-I SCSI 16K/2", IMPACT_I_16K_2)
+ PROD("Impact Series-I SCSI 16K/3", IMPACT_I_16K_3)
+ PROD("Impact 3001 IDE", IMPACT_3001_IDE)
+/* PROD("Impact 3001 RAM", IMPACT_3001_RAM) */
PROD("Generic GVP product", GVP)
PROD("Series II SCSI Controller", GVPIISCSI)
PROD("Series II SCSI Controller", GVPIISCSI_2)
PROD("Series II RAM", GVPIIRAM)
PROD("A2000 68030 Turbo Board", GVP_A2000_030)
+/* PROD("Impact 3001 IDE", IMPACT_3001_IDE_2) */
PROD("GFORCE 040 with SCSI Controller", GFORCE_040_SCSI)
PROD("IV-24 Graphics Board", GVPIV_24)
-/*
- PROD("I/O Extender", GVPIO_EXT)
-*/
+ PROD("GFORCE 040 Turbo Board", GFORCE_040)
+/* PROD("I/O Extender", GVPIO_EXT) */
END
BEGIN_GVP_PROD
@@ -164,6 +241,14 @@
GVP_PROD("SERIES-II SCSI controller", SERIESII)
END
+BEGIN_PROD(SYNERGY)
+END
+
+BEGIN_PROD(XETEC)
+ PROD("FastCard SCSI Controller", FASTCARD_SCSI)
+ PROD("FastCard RAM", FASTCARD_RAM)
+END
+
BEGIN_PROD(PPI)
PROD("Mercury Turbo Board", MERCURY)
PROD("PP&S A3000 68040 Turbo Board", PPS_A3000_040)
@@ -172,12 +257,23 @@
PROD("PP&S A500 68040 Turbo Board", PPS_A500_040)
END
+BEGIN_PROD(SPIRIT)
+ PROD("HDA 506 Harddisk", HDA_506)
+ PROD("OctaByte RAM", OCTABYTE_RAM)
+END
+
BEGIN_PROD(BSC)
PROD("ALF 3 SCSI Controller", ALF_3_SCSI)
END
+BEGIN_PROD(BSC3)
+ PROD("ALF 2 SCSI Controller", ALF_2_SCSI)
+ PROD("ALF 3 SCSI Controller", ALF_3_SCSI_2)
+END
+
BEGIN_PROD(C_LTD)
PROD("Kronos SCSI Controller", KRONOS_SCSI)
+ PROD("A1000 SCSI Controller", A1000_SCSI_2)
END
BEGIN_PROD(JOCHHEIM)
@@ -188,26 +284,29 @@
PROD("Serial Solution", SERIAL_SOLUTION)
END
-BEGIN_PROD(GOLEM)
- PROD("Golem SCSI-II Controller", GOLEM_SCSI_II)
+BEGIN_PROD(ICD)
+ PROD("Advantage 2000 SCSI Controller", ADVANTAGE_2000)
END
-BEGIN_PROD(HARDITAL_SYNTHES)
- PROD("SCSI Controller", HARDITAL_SCSI)
+BEGIN_PROD(KUPKE2)
+ PROD("Golem SCSI-II Controller", KUPKE_SCSI_II)
+ PROD("Golem Box", GOLEM_BOX)
+ PROD("Golem SCSI/AT Controller", KUPKE_SCSI_AT)
END
-BEGIN_PROD(HARDITAL2)
+BEGIN_PROD(HARDITAL)
PROD("TQM 68030+68882 Turbo Board", TQM)
END
BEGIN_PROD(BSC2)
PROD("Oktagon 2008 SCSI Controller", OKTAGON_SCSI)
- PROD("Tandem", TANDEM)
+ PROD("Tandem AT-2008/508 IDE Controller", TANDEM)
PROD("Oktagon 2008 RAM", OKTAGON_RAM)
PROD("Alfa Data MultiFace I", MULTIFACE_I)
PROD("Alfa Data MultiFace II", MULTIFACE_II)
PROD("Alfa Data MultiFace III", MULTIFACE_III)
- PROD("ISDN Master", ISDN_MASTER)
+ PROD("ISDN MasterCard", ISDN_MASTERCARD)
+ PROD("ISDN MasterCard II", ISDN_MASTERCARD_2)
END
BEGIN_PROD(ADV_SYS_SOFT)
@@ -215,13 +314,26 @@
PROD("Nexus RAM", NEXUS_RAM)
END
+BEGIN_PROD(IMPULSE)
+ PROD("FireCracker 24", FIRECRACKER_24)
+END
+
BEGIN_PROD(IVS)
- PROD("Trumpcard 500 SCSI Controller", TRUMPCARD_500)
- PROD("Trumpcard SCSI Controller", TRUMPCARD)
+ PROD("GrandSlam RAM", GRANDSLAM)
+ PROD("OverDrive HD", IVS_OVERDRIVE)
+ PROD("Trumpcard Classic SCSI Controller", TRUMPCARD_CLASSIC)
+ PROD("Trumpcard Pro SCSI Controller", TRUMPCARD_PRO)
+ PROD("Meta-4 RAM", META_4)
PROD("Vector SCSI Controller", VECTOR)
END
+BEGIN_PROD(VECTOR)
+ PROD("Connection Serial IO", CONNECTION)
+END
+
BEGIN_PROD(XPERT_PRODEV)
+ PROD("Visiona Graphics Board (RAM)", VISIONA_RAM)
+ PROD("Visiona Graphics Board (REG)", VISIONA_REG)
PROD("Merlin Graphics Board (RAM)", MERLIN_RAM)
PROD("Merlin Graphics Board (REG)", MERLIN_REG)
END
@@ -230,8 +342,27 @@
PROD("Amiganet Board", AMIGANET)
END
-BEGIN_PROD(DIG_MICRONICS)
+BEGIN_PROD(SUNRIZE)
+ PROD("AD516 Audio", AD516)
+END
+
+BEGIN_PROD(TRICERATOPS)
+ PROD("Multi I/O Board", TRICERATOPS)
+END
+
+BEGIN_PROD(APPLIED_MAGIC)
PROD("DMI Resolver Graphics Board", DMI_RESOLVER)
+ PROD("Digital Broadcaster", DIGITAL_BCASTER)
+END
+
+BEGIN_PROD(GFX_BASE)
+ PROD("GDA-1 Graphics Board (RAM)", GDA_1_RAM)
+ PROD("GDA-1 Graphics Board (REG)", GDA_1_REG)
+END
+
+BEGIN_PROD(ROCTEC)
+ PROD("RH 800C Hard Disk Controller", RH_800C)
+ PROD("RH 800C RAM", RH_800C_RAM)
END
BEGIN_PROD(HELFRICH1)
@@ -242,10 +373,23 @@
PROD("GG2+ Bus Converter", GG2PLUS)
END
+BEGIN_PROD(MASOBOSHI)
+ PROD("Master Card RAM", MASTER_CARD_RAM)
+ PROD("Master Card SCSI Controller", MASTER_CARD_SCSI)
+ PROD("MVD 819", MVD_819)
+END
+
+BEGIN_PROD(DELACOMP)
+ PROD("RAM Expansion 2000", DELACOMP_RAM_2000)
+END
+
BEGIN_PROD(VILLAGE_TRONIC)
- PROD("Ariadne Ethernet Card", ARIADNE)
+ PROD("Domino Graphics Board (RAM)", DOMINO_RAM)
+ PROD("Domino Graphics Board (REG)", DOMINO_REG)
PROD("Picasso II Graphics Board (RAM)", PICASSO_II_RAM)
PROD("Picasso II Graphics Board (REG)", PICASSO_II_REG)
+ PROD("Picasso II Graphics Board (REG)", PICASSO_II_REG_2)
+ PROD("Ariadne Ethernet Card", ARIADNE)
END
BEGIN_PROD(UTILITIES_ULTD)
@@ -253,51 +397,98 @@
PROD("Emplant Deluxe SCSI Controller", EMPLANT_DELUXE2)
END
+BEGIN_PROD(AMITRIX)
+ PROD("Multi-IO", AMITRIX_MULTI_IO)
+ PROD("CD-RAM Memory", AMITRIX_CD_RAM)
+END
+
BEGIN_PROD(MTEC)
PROD("68030 Turbo Board", MTEC_68030)
- PROD("T1230/28 Turbo Board", MTEC_T1230)
+ PROD("A1200 T68030/42 RTC Turbo Board", MTEC_T1230)
+ PROD("8MB RAM", MTEC_RAM)
END
BEGIN_PROD(GVP2)
- PROD("Spectrum Graphics Board (RAM)", SPECTRUM_RAM)
- PROD("Spectrum Graphics Board (REG)", SPECTRUM_REG)
+ PROD("EGS 28/24 Spectrum Graphics Board (RAM)", SPECTRUM_RAM)
+ PROD("EGS 28/24 Spectrum Graphics Board (REG)", SPECTRUM_REG)
END
BEGIN_PROD(HELFRICH2)
PROD("Piccolo Graphics Board (RAM)", PICCOLO_RAM)
PROD("Piccolo Graphics Board (REG)", PICCOLO_REG)
PROD("PeggyPlus MPEG Decoder Board", PEGGY_PLUS)
+ PROD("VideoCruncher", VIDEOCRUNCHER)
PROD("SD64 Graphics Board (RAM)", SD64_RAM)
PROD("SD64 Graphics Board (REG)", SD64_REG)
END
BEGIN_PROD(MACROSYSTEMS)
- PROD("Warp Engine SCSI Controller", WARP_ENGINE)
+ PROD("Warp Engine 40xx SCSI Controller", WARP_ENGINE)
+END
+
+BEGIN_PROD(ELBOX)
+ PROD("Elbox 1200/4 RAM", ELBOX_1200)
END
BEGIN_PROD(HARMS_PROF)
+ PROD("030 plus", HARMS_030_PLUS)
PROD("3500 Turbo board", 3500_TURBO)
END
+BEGIN_PROD(MICRONIK)
+ PROD("RCA 120 RAM", RCA_120)
+END
+
+BEGIN_PROD(IMTRONICS2)
+ PROD("Hurricane 2800 68030", HURRICANE_2800_3)
+ PROD("Hurricane 2800 68030", HURRICANE_2800_4)
+END
+
+BEGIN_PROD(KUPKE3)
+ PROD("Golem HD 3000", GOLEM_3000)
+END
+
+BEGIN_PROD(INFORMATION)
+ PROD("ISDN Engine I", ISDN_ENGINE_I)
+END
+
BEGIN_PROD(VORTEX)
- PROD("Golden Gate 80386 Board", GOLDEN_GATE_386)
+ PROD("Golden Gate 80386SX Board", GOLDEN_GATE_386SX)
PROD("Golden Gate RAM", GOLDEN_GATE_RAM)
PROD("Golden Gate 80486 Board", GOLDEN_GATE_486)
END
BEGIN_PROD(DATAFLYER)
- PROD("4000SX SCSI Controller", DATAFLYER_4000SX)
+ PROD("4000SX SCSI Controller", DATAFLYER_4000SXS)
+ PROD("4000SX RAM", DATAFLYER_4000SXR)
+END
+
+BEGIN_PROD(READYSOFT)
+ PROD("AMax II/IV", AMAX)
END
BEGIN_PROD(PHASE5)
+ PROD("Blizzard RAM", BLIZZARD_RAM)
+ PROD("Blizzard", BLIZZARD)
+ PROD("Blizzard 1220-IV Turbo Board", BLIZZARD_1220_IV)
PROD("FastLane RAM", FASTLANE_RAM)
- PROD("FastLane/Blizzard 1230-II SCSI Controller", FASTLANE_SCSI)
- PROD("CyberStorm Fast SCSI-II Controller", CYBERSTORM_SCSI)
+ PROD("FastLane/Blizzard 1230-II/CyberSCSI", FASTLANE_SCSI)
+ PROD("Blizzard 1220/CyberStorm", CYBERSTORM_SCSI)
PROD("Blizzard 1230-III Turbo Board", BLIZZARD_1230_III)
- PROD("Blizzard 1230-IV Turbo Board", BLIZZARD_1230_IV)
+ PROD("Blizzard 1230-IV/1260 Turbo Board", BLIZZARD_1230_IV)
+ PROD("Blizzard 2060 SCSI Controller", BLIZZARD_2060SCSI)
+ PROD("CyberStorm", CYBERSTORM)
PROD("CyberVision64 Graphics Board", CYBERVISION)
END
+BEGIN_PROD(DPS)
+ PROD("Personal Animation Recorder", DPS_PAR)
+END
+
+BEGIN_PROD(APOLLO2)
+ PROD("A620 68020 Accelerator", A620)
+END
+
BEGIN_PROD(APOLLO)
PROD("AT-Apollo", AT_APOLLO)
PROD("Turbo Board", APOLLO_TURBO)
@@ -313,52 +504,107 @@
PROD("Maestro Pro", MAESTRO_PRO)
PROD("Retina Z2 Graphics Board", RETINA_Z2)
PROD("MultiEvolution", MULTI_EVOLUTION)
+ PROD("Toccata Sound Board", TOCCATA)
PROD("Retina Z3 Graphics Board", RETINA_Z3)
+ PROD("VLab Motion", VLAB_MOTION)
PROD("Falcon '040 Turbo Board", FALCON_040)
END
+BEGIN_PROD(COMBITEC)
+END
+
+BEGIN_PROD(SKI)
+ PROD("SCSI / Dual Serial", SKI_SCSI_SERIAL)
+END
+
+BEGIN_PROD(CAMERON)
+ PROD("Scanner Interface", CAMERON_SCANNER)
+END
+
+BEGIN_PROD(REIS_WARE)
+ PROD("Handyscanner", RW_HANDYSCANNER)
+END
+
+
BEGIN_MANUF
+ MANUF("Pacific Peripherals", PACIFIC)
+ MANUF("Kupke", KUPKE)
MANUF("Memphis", MEMPHIS)
MANUF("Commodore", COMMODORE2)
MANUF("Commodore", COMMODORE)
+ MANUF("Commodore", COMMODORE3)
+ MANUF("Kolff Computer Supplies", KCS)
MANUF("Cardco", CARDCO)
+ MANUF("A-Squared", A_SQUARED)
+ MANUF("ComSpec Communications", COMSPEC)
+ MANUF("Anakin", ANAKIN)
MANUF("MicroBotics", MICROBOTICS)
+ MANUF("Access Associates", ACCESS)
+ MANUF("Expansion Technologies", EXPANSION_TECH)
MANUF("ASDG", ASDG)
+ MANUF("Imtronics", IMTRONICS)
MANUF("University of Lowell", UNIV_OF_LOWELL)
MANUF("Ameristar", AMERISTAR)
MANUF("Supra", SUPRA)
MANUF("CSA", CSA)
+ MANUF("Great Valley Products", GVP3)
+ MANUF("ByteBox", BYTEBOX)
MANUF("Power Computing", POWER_COMPUTING)
MANUF("Great Valley Products", GVP)
+ MANUF("Synergy", SYNERGY)
+ MANUF("Xetec", XETEC)
MANUF("Progressive Peripherals", PPI)
+ MANUF("Spirit", SPIRIT)
MANUF("BSC", BSC)
+ MANUF("BSC", BSC3)
MANUF("C Ltd.", C_LTD)
MANUF("Jochheim", JOCHHEIM)
MANUF("Checkpoint Technologies", CHECKPOINT)
- MANUF("Golem", GOLEM)
- MANUF("Hardital Synthesis", HARDITAL_SYNTHES)
- MANUF("Hardital Synthesis", HARDITAL2)
+ MANUF("ICD", ICD)
+ MANUF("Kupke", KUPKE2)
+ MANUF("Hardital Synthesis", HARDITAL)
MANUF("BSC", BSC2)
MANUF("Advanced Systems & Software", ADV_SYS_SOFT)
+ MANUF("Impulse", IMPULSE)
MANUF("IVS", IVS)
+ MANUF("Vector", VECTOR)
MANUF("XPert/ProDev", XPERT_PRODEV)
MANUF("Hydra Systems", HYDRA_SYSTEMS)
- MANUF("Digital Micronics", DIG_MICRONICS)
+ MANUF("Sunrize Industries", SUNRIZE)
+ MANUF("Triceratops", TRICERATOPS)
+ MANUF("Applied Magic", APPLIED_MAGIC)
+ MANUF("GFX-Base", GFX_BASE)
+ MANUF("RocTec", ROCTEC)
MANUF("Helfrich", HELFRICH1)
MANUF("Software Result Enterprises", SW_RESULT_ENTS)
+ MANUF("Masoboshi", MASOBOSHI)
+ MANUF("DelaComp", DELACOMP)
MANUF("Village Tronic", VILLAGE_TRONIC)
MANUF("Utilities Unlimited", UTILITIES_ULTD)
+ MANUF("Amitrix", AMITRIX)
MANUF("MTEC", MTEC)
MANUF("Great Valley Products", GVP2)
MANUF("Helfrich", HELFRICH2)
MANUF("MacroSystems", MACROSYSTEMS)
+ MANUF("ElBox Computer", ELBOX)
MANUF("Harms Professional", HARMS_PROF)
+ MANUF("Micronik", MICRONIK)
+ MANUF("Imtronics", IMTRONICS2)
+ MANUF("Kupke", KUPKE3)
+ MANUF("Information", INFORMATION)
MANUF("Vortex", VORTEX)
MANUF("DataFlyer", DATAFLYER)
+ MANUF("ReadySoft", READYSOFT)
MANUF("Phase5", PHASE5)
+ MANUF("DPS", DPS)
+ MANUF("Apollo", APOLLO2)
MANUF("Apollo", APOLLO)
MANUF("Uwe Gerlach", UWE_GERLACH)
MANUF("MacroSystems", MACROSYSTEMS2)
+ MANUF("Combitec", COMBITEC)
+ MANUF("SKI Peripherals", SKI)
+ MANUF("Cameron", CAMERON)
+ MANUF("Reis-Ware", REIS_WARE)
END
#define NUM_MANUF (sizeof(Manufacturers)/sizeof(struct Manufacturer))
@@ -511,7 +757,7 @@
break;
} else {
epc = *(enum GVP_ident *)ZTWO_VADDR(addr+0x8000) &
- GVP_EPCMASK;
+ GVP_PRODMASK;
for (k = 0; k < NUM_GVP_PROD; k++)
if (Ext_Prod_GVP[k].ID == epc) {
prodname = Ext_Prod_GVP[k].Name;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov