Skip to content

Commit 34a41bb

Browse files
committed
Added new Aros Roms (Feb. 2025 edition)
1 parent 5925f72 commit 34a41bb

File tree

7 files changed

+55
-28
lines changed

7 files changed

+55
-28
lines changed

GUI/Defaults.swift

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ extension UserDefaults {
216216
return romUrl(name: String(format: "%08x", fingerprint) + ".rom")
217217
}
218218

219+
static func romUrl(crc32: UInt32) -> URL? {
220+
221+
return romUrl(fingerprint: Int(crc32))
222+
}
223+
219224
static func mediaUrl(name: String) -> URL? {
220225

221226
let folder = try? URL.appSupportFolder("Media")
@@ -265,7 +270,7 @@ extension Preferences {
265270

266271
func applyUserDefaults() {
267272

268-
debug(.defaults, "Applying user defaults")
273+
debug(.defaults)
269274

270275
applyGeneralUserDefaults()
271276
applyCapturesUserDefaults()
@@ -735,20 +740,17 @@ extension Configuration {
735740

736741
do {
737742

738-
if amiga.mem.info.hasRom {
739-
740-
url = UserDefaults.romUrl
741-
if url == nil { throw CoreError(.FILE_CANT_WRITE) }
742-
try? fm.removeItem(at: url!)
743-
try amiga.mem.saveRom(url!)
744-
}
745-
if amiga.mem.info.hasExt {
746-
747-
url = UserDefaults.extUrl
748-
if url == nil { throw CoreError(.FILE_CANT_WRITE) }
749-
try? fm.removeItem(at: url!)
750-
try amiga.mem.saveExt(url!)
751-
}
743+
// Kickstart
744+
url = UserDefaults.romUrl
745+
if url == nil { throw CoreError(.FILE_CANT_WRITE) }
746+
try? fm.removeItem(at: url!)
747+
if amiga.mem.info.hasRom { try amiga.mem.saveRom(url!) }
748+
749+
// Kickstart extension
750+
url = UserDefaults.extUrl
751+
if url == nil { throw CoreError(.FILE_CANT_WRITE) }
752+
try? fm.removeItem(at: url!)
753+
if amiga.mem.info.hasExt { try amiga.mem.saveExt(url!) }
752754

753755
} catch {
754756

GUI/Dialogs/Configuration/RomConf.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extension ConfigurationController {
133133

134134
switch UInt32(item.tag) {
135135

136-
case vamiga.CRC32_AROS_54705, vamiga.CRC32_AROS_55696,
136+
case vamiga.CRC32_AROS_54705, vamiga.CRC32_AROS_55696, vamiga.CRC32_AROS_20250219,
137137
vamiga.CRC32_DIAG121, vamiga.CRC32_DIAG13,
138138
vamiga.CRC32_EMUTOS13:
139139

@@ -178,14 +178,11 @@ extension ConfigurationController {
178178

179179
@IBAction func installRomAction(_ sender: NSButton!) {
180180

181-
let crc32 = sender.selectedTag()
181+
let crc32 = UInt32(sender.selectedTag())
182182

183-
switch UInt32(crc32) {
184-
case vamiga.CRC32_AROS_54705: // Taken from UAE
185-
installAros(rom: "aros-svn54705-rom", ext: "aros-svn54705-ext")
186-
187-
case vamiga.CRC32_AROS_55696: // Taken from SAE
188-
installAros(rom: "aros-svn55696-rom", ext: "aros-svn55696-ext")
183+
switch crc32 {
184+
case vamiga.CRC32_AROS_54705, vamiga.CRC32_AROS_55696, vamiga.CRC32_AROS_20250219:
185+
installAros(crc32: crc32)
189186

190187
case vamiga.CRC32_EMUTOS13:
191188
install(rom: "emutos-13")
@@ -197,7 +194,7 @@ extension ConfigurationController {
197194
install(rom: "diagrom-13")
198195

199196
default:
200-
if let url = UserDefaults.romUrl(fingerprint: crc32) {
197+
if let url = UserDefaults.romUrl(crc32: crc32) {
201198
try? emu.mem.loadRom(url)
202199
}
203200
}
@@ -219,19 +216,22 @@ extension ConfigurationController {
219216

220217
func installAros() {
221218

222-
installAros(crc32: vamiga.CRC32_AROS_55696)
219+
installAros(crc32: vamiga.CRC32_AROS_20250219)
223220
}
224221

225222
func installAros(crc32: UInt32) {
226223

227224
switch crc32 {
228225

229-
case vamiga.CRC32_AROS_54705: // Taken from UAE
226+
case vamiga.CRC32_AROS_54705: // Taken from UAE
230227
installAros(rom: "aros-svn54705-rom", ext: "aros-svn54705-ext")
231228

232-
case vamiga.CRC32_AROS_55696: // Taken from SAE
229+
case vamiga.CRC32_AROS_55696: // Taken from SAE
233230
installAros(rom: "aros-svn55696-rom", ext: "aros-svn55696-ext")
234231

232+
case vamiga.CRC32_AROS_20250219: // 2025 version
233+
installAros(rom: "aros-20250219-rom", ext: "aros-20250219-ext")
234+
235235
default:
236236
fatalError()
237237
}

GUI/XIB files/Configuration.xib

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,8 @@ DQ
550550
<modifierMask key="keyEquivalentModifierMask"/>
551551
</menuItem>
552552
<menuItem isSeparatorItem="YES" id="zIK-wc-oAf"/>
553-
<menuItem title="Aros Kickstart Replacement SVN 54705" image="chipTemplate" tag="2631987209" id="Yyq-YL-spr"/>
553+
<menuItem title="Aros Kickstart Replacement Feb. 2025" image="chipTemplate" tag="2736990563" id="Yyq-YL-spr"/>
554+
<menuItem title="Aros Kickstart Replacement SVN 54705" image="chipTemplate" tag="2631987209" id="yPF-KG-H8h"/>
554555
<menuItem title="Aros Kickstart Replacement SVN 55696" image="chipTemplate" tag="1062194186" id="uLi-3n-N3S"/>
555556
<menuItem isSeparatorItem="YES" id="eoN-df-wHj"/>
556557
<menuItem title="emuTOS 1.3" image="chipTemplate" tag="1898168769" id="1j5-LX-FNu"/>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"data" : [
3+
{
4+
"filename" : "aros-20250219-ext.bin",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Binary file not shown.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"data" : [
3+
{
4+
"filename" : "aros-20250219-rom.bin",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}
Binary file not shown.

0 commit comments

Comments
 (0)