github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-02-11 02:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46 from beeanyew/wip-crap

Browse Source 
Make physical Zorro board detection optional
This commit is contained in:
beeanyew
2021-10-03 17:51:59 +02:00
committed by GitHub
parent adca2b1892 a6d8c793d4
commit 84d67dd4b5
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
platforms/amiga/amiga-platform.c
View File

@@ -68,7 +68,7 @@ extern int force_move_slow_to_chip;
#define min(a, b) (a < b) ? a : b
#define max(a, b) (a > b) ? a : b
uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0, kick13_mode = 0, pistorm_dev_enabled = 1, pi_ahi_enabled = 0;
uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0, kick13_mode = 0, pistorm_dev_enabled = 1, pi_ahi_enabled = 0, physical_z2_first = 0;
uint8_t a314_emulation_enabled = 0, a314_initialized = 0;
extern uint32_t piscsi_base, pistorm_dev_base;
@@ -83,31 +83,27 @@ inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, uns
ac_z3_done = 1;
if ((!ac_z2_done || !ac_z3_done) && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
if (addr == AC_Z2_BASE) {
uint8_t zchk = ps_read_8(addr);
DEBUG("[AUTOCONF] Read from AC_Z2_BASE: %.2X\n", zchk);
// This check may look a bit strange, but it appears that some boards invert the lower four nibbles
// for the boardtype bits, although this isn't required, and if it isn't "clear" in one way or the
// other (either 1111 or 0000), there's no board responding on this address.
// It apparently also isn't a reliable way to check if there's a board detected...
//if ((zchk & 0x0F) == 0x0F || (zchk & 0x0F) == 0x00) {
// Try checking if the byte comes back identifying as a Zorro II or III board instead.
if (((zchk & BOARDTYPE_Z2) == BOARDTYPE_Z2) || ((zchk & BOARDTYPE_Z3) == BOARDTYPE_Z3)) {
if (!ac_waiting_for_physical_pic) {
printf("[AUTOCONF] Found physical Zorro board, pausing processing until done.\n");
ac_waiting_for_physical_pic = 1;
}
*val = zchk;
return 1;
} else {
if (ac_waiting_for_physical_pic) {
printf("[AUTOCONF] Resuming virtual Zorro board processing.\n");
ac_waiting_for_physical_pic = 0;
if (physical_z2_first) {
if (addr == AC_Z2_BASE) {
uint8_t zchk = ps_read_8(addr);
DEBUG("[AUTOCONF] Read from AC_Z2_BASE: %.2X\n", zchk);
if (((zchk & BOARDTYPE_Z2) == BOARDTYPE_Z2) || ((zchk & BOARDTYPE_Z3) == BOARDTYPE_Z3)) {
if (!ac_waiting_for_physical_pic) {
printf("[AUTOCONF] Found physical Zorro board, pausing processing until done.\n");
ac_waiting_for_physical_pic = 1;
}
*val = zchk;
return 1;
} else {
if (ac_waiting_for_physical_pic) {
printf("[AUTOCONF] Resuming virtual Zorro board processing.\n");
ac_waiting_for_physical_pic = 0;
}
}
}
}
if (ac_waiting_for_physical_pic) {
return -1;
if (ac_waiting_for_physical_pic) {
return -1;
}
}
if (!ac_z2_done && ac_z2_current_pic < ac_z2_pic_count) {
if (type == OP_TYPE_BYTE) {
@@ -185,7 +181,7 @@ inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, un
ac_z3_done = 1;
if ((!ac_z2_done || !ac_z3_done) && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
if (ac_waiting_for_physical_pic) {
if (physical_z2_first && ac_waiting_for_physical_pic) {
return -1;
}
if (!ac_z2_done && ac_z2_current_pic < ac_z2_pic_count) {
@@ -494,6 +490,10 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) {
printf("[AMIGA] Kickstart 1.3 mode enabled, Z3 PICs will not be enumerated.\n");
kick13_mode = 1;
}
if CHKVAR("physical-z2-first") {
printf("[AMIGA] Explicitly initializing physical Z2 devices before virtual ones.\n");
physical_z2_first = 1;
}
if CHKVAR("a314") {
if (!a314_initialized) {
int32_t res = a314_init();
@@ -689,6 +689,8 @@ void shutdown_platform_amiga(struct emulator_config *cfg) {
spoof_df0_id = 0;
move_slow_to_chip = 0;
force_move_slow_to_chip = 0;
physical_z2_first = 0;
ac_waiting_for_physical_pic = 0;
autoconfig_reset_all();
printf("[AMIGA] Platform shutdown completed.\n");

6
platforms/amiga/readme.md
View File

@@ -94,3 +94,9 @@ Specifies the sample rate for the audio output on the Raspberry Pi. Defaults to
Example: `setvar swap-df0-df 1`
Swaps DF0 with DF1/2/3. Useful for Kickstart 1.x and/or Trackloader games that will only boot from DF0.
# physical-z2-first
Example: `setvar physical-z2-first`
Explicitly waits for physical (real) Zorro boards to initialize before initializing any of the virtual ones. This may be required for certain devices that are hard coded to assume that they're always in the first Z2 64KB IO memory slot range.
**Note:** Depending on what your particular computer returns when reading the AutoConfig registers, this may or may not work properly at all. Do not enable this if you're not sure what it is or does.