mirror of
https://github.com/garrettsworkshop/GWRAM.SYSTEM.git
synced 2025-10-24 11:50:48 -07:00
Merge branch 'RC' into release
This commit is contained in:
6
Makefile
6
Makefile
@@ -66,5 +66,7 @@ clean:
|
||||
rm -fr bin obj
|
||||
|
||||
copy: bin/GWRAM.po
|
||||
cp bin/GWRAM.po /Volumes/FLOPPYEMU/GWRAM.po
|
||||
diskutil unmount /Volumes/FLOPPYEMU/
|
||||
cp bin/GWRAM.po /Volumes/FLOPPYEMU/GWRAM.po || true
|
||||
diskutil unmount /Volumes/FLOPPYEMU/ || true
|
||||
cp bin/GWRAM.po /Volumes/A2/GWRAM.po || true
|
||||
diskutil unmount /Volumes/A2/ || true
|
||||
|
||||
BIN
bin/GWRAM.dbg.po
BIN
bin/GWRAM.dbg.po
Binary file not shown.
BIN
bin/GWRAM.po
BIN
bin/GWRAM.po
Binary file not shown.
16
ram2e.c
16
ram2e.c
@@ -61,6 +61,7 @@ int ram2e_main(void)
|
||||
|
||||
char nvm = false;
|
||||
int reset_count = 0;
|
||||
int version_count = 0;
|
||||
|
||||
ramworks_save(); // Save what will be clobbered
|
||||
if (auxram_detect()) {
|
||||
@@ -71,7 +72,7 @@ int ram2e_main(void)
|
||||
} else if (ram2e_detect(0xFD)) { // MachXO2
|
||||
type = 0xFD;
|
||||
} else { type = 0; }
|
||||
}
|
||||
} else { type = 0; }
|
||||
|
||||
if (type == 0) {
|
||||
#ifndef SKIP_RAM2E_DETECT
|
||||
@@ -151,6 +152,19 @@ int ram2e_main(void)
|
||||
ram2e_flashled(10);
|
||||
}
|
||||
}
|
||||
reset_count = 0;
|
||||
continue;
|
||||
} case 'V': {
|
||||
version_count++;
|
||||
if (version_count >= 5) {
|
||||
if (ram2e_detect(0xF1)) { gwcputsxy(34, 2, "revC"); }
|
||||
else { gwcputsxy(34, 2, "revB"); }
|
||||
if (type==0xFF) { gwcputsxy(28, 2, "typeA"); }
|
||||
else if (type==0xFE) { gwcputsxy(28, 2, "typeB"); }
|
||||
else if (type==0xFD) { gwcputsxy(28, 2, "typeC"); }
|
||||
else { gwcputsxy(28, 2, "type?"); }
|
||||
}
|
||||
reset_count = 0;
|
||||
continue;
|
||||
} case 'R': {
|
||||
reset_count++;
|
||||
|
||||
Reference in New Issue
Block a user