Skip to content

Commit 1c491a1

Browse files
startaqstartaq
committed
amiga: Untangle CPU slot bus from Zorro-II slot
- Rewrite DMAC DMA controller. Now actually transfers data. - Add preliminary support for the A590 hard disk controller - Add preliminary support for the Action Replay freezer devices - Add support for the MegaMix 500 RAM expansion - Add preliminary support for the A2091 hard disk controller New working software list additions ----------------------------------- A590 Setup Disk 1.7 (Western Digital Harddisk) [Turran FTP] A2091 Setup Disk 1.27 [Amiga Hardware Database]
1 parent fdb90cb commit 1c491a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2517
-1961
lines changed

‎hash/amiga_hardware.xml

Lines changed: 67 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,65 @@ license:CC0-1.0
1818
</part>
1919
</software>
2020

21-
<software name="a590">
22-
<!-- For Epson SCSI (P/N: 312711-01) -->
23-
<description>A590 Setup Disk 1.1 (SCSI Harddisk)</description>
21+
<!-- For use with Epson XT drives -->
22+
<software name="a590_epson">
23+
<description>A590 Setup Disk 1.1 (Epson Hard Disk)</description>
2424
<year>1989</year>
2525
<publisher>Commodore</publisher>
2626
<part name="flop1" interface="floppy_3_5">
27-
<feature name="part_id" value="A590 Setup Disk 1.1 (SCSI Harddisk)" />
2827
<dataarea name="flop" size="901120">
29-
<rom name="317734-01_a590_scsi.adf" size="901120" crc="a560a938" sha1="9c6136c6580779a948cd1c0b50cb229512af415c"/>
28+
<rom name="317734-01_a590_epson.adf" size="901120" crc="a560a938" sha1="9c6136c6580779a948cd1c0b50cb229512af415c" />
3029
</dataarea>
3130
</part>
3231
</software>
3332

34-
<software name="a590_wd" cloneof="a590">
35-
<!-- Earlier version P/N: 317734-02? -->
36-
<!-- For WD93028-X-A (P/N: 312711-03) -->
37-
<!-- Cylinders 782 (615), Heads 2 (4), Sectors/Track 27, Precomp 784, LZone 781, Bytes/Sector 512 -->
38-
<description>A590 Setup Disk 1.23 (Western Digital Harddisk)</description>
33+
<!-- For use with Western Digital XT drives -->
34+
<!-- Modified "Drive definitions" file -->
35+
<software name="a590_wd17" cloneof="a590_epson">
36+
<description>A590 Setup Disk 1.7 (Western Digital Hard Disk)</description>
37+
<year>1989</year>
38+
<publisher>Commodore</publisher>
39+
<part name="flop1" interface="floppy_3_5">
40+
<dataarea name="flop" size="901120">
41+
<rom name="317734-02_a590_wd.adf" size="901120" crc="8337cc98" sha1="fd9f80cf6f18bc97161e867bde55724193cd2802" status="baddump" />
42+
</dataarea>
43+
</part>
44+
</software>
45+
46+
<!-- For use with Western Digital XT drives -->
47+
<software name="a590_wd123" cloneof="a590_epson">
48+
<description>A590 Setup Disk 1.23 (Western Digital Hard Disk)</description>
3949
<year>1990</year>
4050
<publisher>Commodore</publisher>
4151
<part name="flop1" interface="floppy_3_5">
42-
<feature name="part_id" value="A590 Setup Disk 1.23 (Western Digital Harddisk)" />
4352
<dataarea name="flop" size="901120">
44-
<rom name="317734-03_a590_wd.adf" size="901120" crc="a88fda41" sha1="7424f8645e1903e3e4ec8bb824186868319be1f3"/>
53+
<rom name="317734-03_a590_wd.adf" size="901120" crc="a88fda41" sha1="7424f8645e1903e3e4ec8bb824186868319be1f3" />
4554
</dataarea>
4655
</part>
4756
</software>
4857

49-
<software name="a590_seagate" cloneof="a590">
50-
<description>A590 Setup Disk 1.23 (Seagate Harddisk)</description>
51-
<year>1988</year>
58+
<!-- For use with Seagate XT drives -->
59+
<software name="a590_seagate" cloneof="a590_epson">
60+
<description>A590 Setup Disk 1.23 (Seagate Hard Disk)</description>
61+
<year>1990</year>
5262
<publisher>Commodore</publisher>
5363
<part name="flop1" interface="floppy_3_5">
5464
<dataarea name="flop" size="901120">
55-
<rom name="317734-04.adf" size="901120" crc="7f1623a7" sha1="1f3e20206eb83f60745e19538de3123089c8da24"/>
65+
<rom name="317734-04_a590_seagate.adf" size="901120" crc="7f1623a7" sha1="1f3e20206eb83f60745e19538de3123089c8da24" />
66+
</dataarea>
67+
</part>
68+
</software>
69+
70+
<!-- Missing: 317734-05 A590 Setup Disk (Western Digital Hard Disk) -->
71+
72+
<!-- For use with SCSI drives -->
73+
<software name="a590_scsi">
74+
<description>A590 Setup Disk (SCSI Hard Disk)</description>
75+
<year>1991</year>
76+
<publisher>Commodore</publisher>
77+
<part name="flop1" interface="floppy_3_5">
78+
<dataarea name="flop" size="901120">
79+
<rom name="317734-06_a590_scsi.adf" size="901120" status="nodump" />
5680
</dataarea>
5781
</part>
5882
</software>
@@ -62,9 +86,8 @@ license:CC0-1.0
6286
<year>1990</year>
6387
<publisher>Commodore</publisher>
6488
<part name="flop1" interface="floppy_3_5">
65-
<feature name="part_id" value="A590 RAM Test Software" />
6689
<dataarea name="flop" size="901120">
67-
<rom name="317830-01_a590_ram_test.adf" size="901120" crc="6583d1d0" sha1="7779b825b8555956d341ff7e909ab71d89e2321c"/>
90+
<rom name="317830-01_a590_ram_test.adf" size="901120" crc="6583d1d0" sha1="7779b825b8555956d341ff7e909ab71d89e2321c" />
6891
</dataarea>
6992
</part>
7093
</software>
@@ -74,35 +97,47 @@ license:CC0-1.0
7497
<year>1988</year>
7598
<publisher>Commodore</publisher>
7699
<part name="flop1" interface="floppy_3_5">
77-
<feature name="part_id" value="A2024 JumpStart" />
78100
<dataarea name="flop" size="901120">
79-
<rom name="317809-01_a2024_jumpstart.adf" size="901120" crc="dad46588" sha1="30c2c1f1d98bd008b2c67f3b23480181935d4b01"/>
101+
<rom name="317809-01_a2024_jumpstart.adf" size="901120" crc="dad46588" sha1="30c2c1f1d98bd008b2c67f3b23480181935d4b01" />
102+
</dataarea>
103+
</part>
104+
</software>
105+
106+
<!-- Missing: 317806-01 A2091 Setup Disk (referenced in the service manual) -->
107+
<!-- Missing: 317806-02 A2091 Setup Disk (if it exists) -->
108+
109+
<!-- Modified "Drive definitions" file -->
110+
<software name="a2091_127">
111+
<description>A2091 Setup Disk 1.27</description>
112+
<year>1990</year>
113+
<publisher>Commodore</publisher>
114+
<part name="flop1" interface="floppy_3_5">
115+
<dataarea name="flop" size="901120">
116+
<rom name="317806-03_a2091_setup.adf" size="901120" crc="1ec584cf" sha1="d3de14c860d56679e645d28ef5b30d54ec95cc07" status="baddump" />
80117
</dataarea>
81118
</part>
82119
</software>
83120

84-
<software name="a2091">
85-
<!-- From service manual: Install (US): 317806-01, Install (De): 317807-01 (earlier versions?) -->
86-
<!-- Harddisk: 313440-01 SCSI Quantum -->
121+
<software name="a2091_130" cloneof="a2091_127">
87122
<description>A2091 Setup Disk 1.30</description>
88123
<year>1991</year>
89124
<publisher>Commodore</publisher>
90125
<part name="flop1" interface="floppy_3_5">
91-
<feature name="part_id" value="A2091 Setup Disk 1.30" />
92126
<dataarea name="flop" size="901120">
93-
<rom name="317806-04_a2091_setup.adf" size="901120" crc="122c8f93" sha1="603e106c1a44a209171610af8d48bc35ad31c9bc"/>
127+
<rom name="317806-04_a2091_setup.adf" size="901120" crc="122c8f93" sha1="603e106c1a44a209171610af8d48bc35ad31c9bc" />
94128
</dataarea>
95129
</part>
96130
</software>
97131

132+
<!-- Missing: 317807-01 A2091 Setup Disk (De) (referenced in the service manual) -->
133+
98134
<software name="a2058">
99135
<description>A2058 RAM Test Disk</description>
100136
<year>1988</year>
101137
<publisher>Commodore</publisher>
102138
<part name="flop1" interface="floppy_3_5">
103-
<feature name="part_id" value="A2058 RAM Test Disk" />
104139
<dataarea name="flop" size="901120">
105-
<rom name="317719-01_a2058_ram_test.adf" size="901120" crc="5dba7fc3" sha1="76fbce4bef7df0f6042c85376d9bdfd4d4911e74"/>
140+
<rom name="317719-01_a2058_ram_test.adf" size="901120" crc="5dba7fc3" sha1="76fbce4bef7df0f6042c85376d9bdfd4d4911e74" />
106141
</dataarea>
107142
</part>
108143
</software>
@@ -112,9 +147,8 @@ license:CC0-1.0
112147
<year>1990</year>
113148
<publisher>Commodore</publisher>
114149
<part name="flop1" interface="floppy_3_5">
115-
<feature name="part_id" value="A2232 Install" />
116150
<dataarea name="flop" size="901120">
117-
<rom name="317769-01_a2232_install.adf" size="901120" crc="3caa21b7" sha1="24f47f6f88712f046303b8812a598043440a5e6d"/>
151+
<rom name="317769-01_a2232_install.adf" size="901120" crc="3caa21b7" sha1="24f47f6f88712f046303b8812a598043440a5e6d" />
118152
</dataarea>
119153
</part>
120154
</software>
@@ -124,9 +158,8 @@ license:CC0-1.0
124158
<year>1990</year>
125159
<publisher>Commodore</publisher>
126160
<part name="flop1" interface="floppy_3_5">
127-
<feature name="part_id" value="A2300 Genlock Demo" />
128161
<dataarea name="flop" size="901120">
129-
<rom name="317718-02_a2300_genlock_demo.adf" size="901120" crc="464ff0f6" sha1="26b94e8d52d35e2746b74610bb9b65eb2f899297"/>
162+
<rom name="317718-02_a2300_genlock_demo.adf" size="901120" crc="464ff0f6" sha1="26b94e8d52d35e2746b74610bb9b65eb2f899297" />
130163
</dataarea>
131164
</part>
132165
</software>
@@ -136,9 +169,8 @@ license:CC0-1.0
136169
<year>1990</year>
137170
<publisher>Commodore</publisher>
138171
<part name="flop1" interface="floppy_3_5">
139-
<feature name="part_id" value="A2232 Test / Demo" />
140172
<dataarea name="flop" size="901120">
141-
<rom name="317210-01_a2320_test_demo.adf" size="901120" crc="cff98aae" sha1="f46f7de0d908ed68abfd784d84b964cbce7dc503"/>
173+
<rom name="317210-01_a2320_test_demo.adf" size="901120" crc="cff98aae" sha1="f46f7de0d908ed68abfd784d84b964cbce7dc503" />
142174
</dataarea>
143175
</part>
144176
</software>
@@ -150,7 +182,7 @@ license:CC0-1.0
150182
<info name="usage" value="Requires FrameMaster Zorro card and FPU" />
151183
<part name="flop1" interface="floppy_3_5">
152184
<dataarea name="flop" size="901120">
153-
<rom name="rainbow2_diashow.adf" size="901120" crc="201b34eb" sha1="7d8d4e4b58f438d25b32f78106c944f7d264de17"/>
185+
<rom name="rainbow2_diashow.adf" size="901120" crc="201b34eb" sha1="7d8d4e4b58f438d25b32f78106c944f7d264de17" />
154186
</dataarea>
155187
</part>
156188
</software>
@@ -162,7 +194,7 @@ license:CC0-1.0
162194
<info name="usage" value="Requires FrameMaster Zorro card and FPU" />
163195
<part name="flop1" interface="floppy_3_5">
164196
<dataarea name="flop" size="901120">
165-
<rom name="rainbowpainter.adf" size="901120" crc="bda4991f" sha1="4b8d73487fcc92a2f8d21bf24c42ad373c28bc5f"/>
197+
<rom name="rainbowpainter.adf" size="901120" crc="bda4991f" sha1="4b8d73487fcc92a2f8d21bf24c42ad373c28bc5f" />
166198
</dataarea>
167199
</part>
168200
</software>

‎scripts/src/bus.lua

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4692,12 +4692,10 @@ if (BUSES["ZORRO"]~=null) then
46924692
MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.h",
46934693
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.cpp",
46944694
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.h",
4695+
MAME_DIR .. "src/devices/bus/amiga/zorro/a2091.cpp",
4696+
MAME_DIR .. "src/devices/bus/amiga/zorro/a2091.h",
46954697
MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp",
46964698
MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.h",
4697-
MAME_DIR .. "src/devices/bus/amiga/zorro/a590.cpp",
4698-
MAME_DIR .. "src/devices/bus/amiga/zorro/a590.h",
4699-
MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.cpp",
4700-
MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.h",
47014699
MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.cpp",
47024700
MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.h",
47034701
MAME_DIR .. "src/devices/bus/amiga/zorro/merlin.cpp",
@@ -5821,3 +5819,23 @@ if (BUSES["HEATH_TLB_CONNECTOR"]~=null) then
58215819
MAME_DIR .. "src/devices/bus/heathzenith/h19/tlb.h",
58225820
}
58235821
end
5822+
5823+
---------------------------------------------------
5824+
--
5825+
--@src/devices/bus/amiga/cpuslot/cpuslot.h,BUSES["AMIGA_CPUSLOT"] = true
5826+
---------------------------------------------------
5827+
5828+
if (BUSES["AMIGA_CPUSLOT"]~=null) then
5829+
files {
5830+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/cpuslot.cpp",
5831+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/cpuslot.h",
5832+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/cards.cpp",
5833+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/cards.h",
5834+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/a590.cpp",
5835+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/a590.h",
5836+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/action_replay.cpp",
5837+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/action_replay.h",
5838+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/megamix500.cpp",
5839+
MAME_DIR .. "src/devices/bus/amiga/cpuslot/megamix500.h",
5840+
}
5841+
end

0 commit comments

Comments
 (0)