X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=platforms%2Famiga%2Famiga-platform.c;h=0b21a26ee2e43d0e706cefde47addff8a3382d79;hb=007b35ae52d617b947dd5522f1797ef49e2da9b7;hp=da302acb7655a005d0254b7c4df698fda5f231fd;hpb=04bf2f6153608c0e6b7437cbb8eb4bdafe842254;p=pistorm diff --git a/platforms/amiga/amiga-platform.c b/platforms/amiga/amiga-platform.c index da302ac..0b21a26 100644 --- a/platforms/amiga/amiga-platform.c +++ b/platforms/amiga/amiga-platform.c @@ -1,20 +1,32 @@ +// SPDX-License-Identifier: MIT + #include #include #include #include -#include "../platforms.h" #include "amiga-autoconf.h" #include "amiga-registers.h" -#include "../shared/rtc.h" -#include "piscsi/piscsi.h" -#include "piscsi/piscsi-enums.h" -#include "net/pi-net.h" +#include "hunk-reloc.h" #include "net/pi-net-enums.h" +#include "net/pi-net.h" +#include "piscsi/piscsi-enums.h" +#include "piscsi/piscsi.h" +#include "pistorm-dev/pistorm-dev-enums.h" +#include "pistorm-dev/pistorm-dev.h" +#include "platforms/platforms.h" +#include "platforms/shared/rtc.h" #include "rtg/rtg.h" +//#define DEBUG_AMIGA_PLATFORM + +#ifdef DEBUG_AMIGA_PLATFORM +#define DEBUG printf +#else +#define DEBUG(...) +#endif + int handle_register_read_amiga(unsigned int addr, unsigned char type, unsigned int *val); int handle_register_write_amiga(unsigned int addr, unsigned int value, unsigned char type); -int init_rtg_data(); extern int ac_z2_current_pic; extern int ac_z2_done; @@ -42,23 +54,36 @@ extern unsigned char cdtv_sram[32 * SIZE_KILO]; #define min(a, b) (a < b) ? a : b #define max(a, b) (a > b) ? a : b -static uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0; +uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0, kick13_mode = 0, pistorm_dev_enabled = 1; -extern uint32_t piscsi_base; -extern uint8_t piscsi_diag_read; +extern uint32_t piscsi_base, pistorm_dev_base; extern void stop_cpu_emulation(uint8_t disasm_cur); inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type) { - if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) { - if (ac_z2_pic_count == 0) { - ac_z2_done = 1; + if (kick13_mode) + ac_z3_done = 1; + + if ((!ac_z2_done || !ac_z3_done) && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) { + if (!ac_z2_done && ac_z2_current_pic < ac_z2_pic_count) { + if (type == OP_TYPE_BYTE) { + *val = autoconfig_read_memory_8(cfg, addr - AC_Z2_BASE); + return 1; + } + printf("Unexpected %s read from Z2 autoconf addr %.X\n", op_type_names[type], addr - AC_Z2_BASE); return -1; } - - if (type == OP_TYPE_BYTE) { - *val = autoconfig_read_memory_8(cfg, addr); - return 1; + if (!ac_z3_done && ac_z3_current_pic < ac_z3_pic_count) { + uint32_t addr_ = addr - AC_Z2_BASE; + if (addr_ & 0x02) { + addr_ = (addr_ - 2) + 0x100; + } + if (type == OP_TYPE_BYTE) { + *val = autoconfig_read_memory_z3_8(cfg, addr_ - AC_Z2_BASE); + return 1; + } + printf("Unexpected %s read from Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z2_BASE); + return -1; } } if (!ac_z3_done && addr >= AC_Z3_BASE && addr < AC_Z3_BASE + AC_SIZE) { @@ -68,17 +93,20 @@ inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, uns } if (type == OP_TYPE_BYTE) { - *val = autoconfig_read_memory_z3_8(cfg, addr); + *val = autoconfig_read_memory_z3_8(cfg, addr - AC_Z3_BASE); return 1; } - else { - printf("Unexpected %s read from Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z3_BASE); - //stop_emulation(); - } + printf("Unexpected %s read from Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z3_BASE); + return -1; + } + + if (pistorm_dev_enabled && addr >= pistorm_dev_base && addr < pistorm_dev_base + (64 * SIZE_KILO)) { + *val = handle_pistorm_dev_read(addr, type); + return 1; } - if (addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) { - printf("[Amiga-Custom] %s read from PISCSI base @$%.8X.\n", op_type_names[type], addr); + if (piscsi_enabled && addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) { + //printf("[Amiga-Custom] %s read from PISCSI base @$%.8X.\n", op_type_names[type], addr); //stop_cpu_emulation(1); *val = handle_piscsi_read(addr, type); return 1; @@ -88,16 +116,33 @@ inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, uns } inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type) { - if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) { - if (type == OP_TYPE_BYTE) { - if (ac_z2_pic_count == 0) { - ac_z2_done = 1; - return -1; + if (kick13_mode) + ac_z3_done = 1; + + if ((!ac_z2_done || !ac_z3_done) && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) { + if (!ac_z2_done && ac_z2_current_pic < ac_z2_pic_count) { + if (type == OP_TYPE_BYTE) { + autoconfig_write_memory_8(cfg, addr - AC_Z2_BASE, val); + return 1; } - - //printf("Write to Z2 autoconf area.\n"); - autoconfig_write_memory_8(cfg, addr, val); - return 1; + printf("Unexpected %s write to Z2 autoconf addr %.X\n", op_type_names[type], addr - AC_Z2_BASE); + return -1; + } + if (!ac_z3_done && ac_z3_current_pic < ac_z3_pic_count) { + uint32_t addr_ = addr - AC_Z2_BASE; + if (addr_ & 0x02) { + addr_ = (addr_ - 2) + 0x100; + } + if (type == OP_TYPE_BYTE) { + autoconfig_write_memory_z3_8(cfg, addr_ - AC_Z2_BASE, val); + return 1; + } + else if (type == OP_TYPE_WORD) { + autoconfig_write_memory_z3_16(cfg, addr_ - AC_Z2_BASE, val); + return 1; + } + printf("Unexpected %s write to Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z2_BASE); + return -1; } } @@ -109,11 +154,11 @@ inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, un } //printf("Write to autoconf area.\n"); - autoconfig_write_memory_z3_8(cfg, addr, val); + autoconfig_write_memory_z3_8(cfg, addr - AC_Z3_BASE, val); return 1; } else if (type == OP_TYPE_WORD) { - autoconfig_write_memory_z3_16(cfg, addr, val); + autoconfig_write_memory_z3_16(cfg, addr - AC_Z3_BASE, val); return 1; } else { @@ -122,8 +167,13 @@ inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, un } } - if (addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) { - printf("[Amiga-Custom] %s write to PISCSI base @$%.8x: %.8X\n", op_type_names[type], addr, val); + if (pistorm_dev_enabled && addr >= pistorm_dev_base && addr < pistorm_dev_base + (64 * SIZE_KILO)) { + handle_pistorm_dev_write(addr, val, type); + return 1; + } + + if (piscsi_enabled && addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) { + //printf("[Amiga-Custom] %s write to PISCSI base @$%.8x: %.8X\n", op_type_names[type], addr, val); handle_piscsi_write(addr, val, type); return 1; } @@ -138,10 +188,6 @@ void adjust_ranges_amiga(struct emulator_config *cfg) { cfg->custom_low = 0; // Set up the min/max ranges for mapped reads/writes - if (gayle_emulation_enabled) { - cfg->mapped_low = GAYLEBASE; - cfg->mapped_high = GAYLEBASE + GAYLESIZE; - } for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i++) { if (cfg->map_type[i] != MAPTYPE_NONE) { if ((cfg->map_offset[i] != 0 && cfg->map_offset[i] < cfg->mapped_low) || cfg->mapped_low == 0) @@ -151,20 +197,20 @@ void adjust_ranges_amiga(struct emulator_config *cfg) { } } - if (ac_z2_pic_count && !ac_z2_done) { + if ((ac_z2_pic_count || ac_z3_pic_count) && (!ac_z2_done || !ac_z3_done)) { if (cfg->custom_low == 0) cfg->custom_low = AC_Z2_BASE; else cfg->custom_low = min(cfg->custom_low, AC_Z2_BASE); cfg->custom_high = max(cfg->custom_high, AC_Z2_BASE + AC_SIZE); } - if (ac_z3_pic_count && !ac_z3_done) { + /*if (ac_z3_pic_count && !ac_z3_done) { if (cfg->custom_low == 0) cfg->custom_low = AC_Z3_BASE; else cfg->custom_low = min(cfg->custom_low, AC_Z3_BASE); cfg->custom_high = max(cfg->custom_high, AC_Z3_BASE + AC_SIZE); - } + }*/ if (rtg_enabled) { if (cfg->custom_low == 0) cfg->custom_low = PIGFX_RTG_BASE; @@ -224,7 +270,7 @@ int setup_platform_amiga(struct emulator_config *cfg) { cfg->map_id[index][0] = '^'; int resize_data = 0; if (cfg->map_size[index] > 8 * SIZE_MEGA) { - printf("Attempted to configure more than 8MB of Z2 Fast RAM, downsizng to 8MB.\n"); + printf("Attempted to configure more than 8MB of Z2 Fast RAM, downsizing to 8MB.\n"); resize_data = 8 * SIZE_MEGA; } else if(cfg->map_size[index] != 2 * SIZE_MEGA && cfg->map_size[index] != 4 * SIZE_MEGA && cfg->map_size[index] != 8 * SIZE_MEGA) { @@ -243,9 +289,10 @@ int setup_platform_amiga(struct emulator_config *cfg) { cfg->map_data[index] = (unsigned char *)malloc(cfg->map_size[index]); } printf("%dMB of Z2 Fast RAM configured at $%lx\n", cfg->map_size[index] / SIZE_MEGA, cfg->map_offset[index]); - ac_z2_type[ac_z2_pic_count] = ACTYPE_MAPFAST_Z2; - ac_z2_index[ac_z2_pic_count] = index; - ac_z2_pic_count++; + add_z2_pic(ACTYPE_MAPFAST_Z2, index); + //ac_z2_type[ac_z2_pic_count] = ACTYPE_MAPFAST_Z2; + //ac_z2_index[ac_z2_pic_count] = index; + //ac_z2_pic_count++; } else printf("No Z2 Fast RAM configured.\n"); @@ -253,7 +300,7 @@ int setup_platform_amiga(struct emulator_config *cfg) { index = get_named_mapped_item(cfg, z2_autoconf_id); if (index != -1) goto more_z2_fast; - + for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i ++) { // Restore any "zapped" autoconf items so they can be reinitialized if needed. if (cfg->map_id[i] && strcmp(cfg->map_id[i], z2_autoconf_zap_id) == 0) { @@ -296,7 +343,11 @@ int setup_platform_amiga(struct emulator_config *cfg) { fclose(in); } } - + + if (pistorm_dev_enabled) { + add_z2_pic(ACTYPE_PISTORM_DEV, 0); + } + return 0; } @@ -327,7 +378,7 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) { printf("[AMIGA] CDTV mode enabled.\n"); cdtv_mode = 1; } - if (strcmp(var, "rtg") == 0) { + if (strcmp(var, "rtg") == 0 && !rtg_enabled) { if (init_rtg_data()) { printf("[AMIGA] RTG Enabled.\n"); rtg_enabled = 1; @@ -336,13 +387,18 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) { else printf("[AMIGA} Failed to enable RTG.\n"); } + if (strcmp(var, "kick13") == 0) { + printf("[AMIGA] Kickstart 1.3 mode enabled, Z3 PICs will not be enumerated.\n"); + kick13_mode = 1; + } // PiSCSI stuff - if (strcmp(var, "piscsi") == 0) { + if (strcmp(var, "piscsi") == 0 && !piscsi_enabled) { printf("[AMIGA] PISCSI Interface Enabled.\n"); piscsi_enabled = 1; piscsi_init(); - //ac_z2_type[ac_z2_pic_count] = ACTYPE_PSICSI; + add_z2_pic(ACTYPE_PISCSI, 0); + //ac_z2_type[ac_z2_pic_count] = ACTYPE_PISCSI; //ac_z2_pic_count++; adjust_ranges_amiga(cfg); } @@ -371,13 +427,18 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) { } // Pi-Net stuff - if (strcmp(var, "pi-net") == 0) { + if (strcmp(var, "pi-net") == 0 && !pinet_enabled) { printf("[AMIGA] PI-NET Interface Enabled.\n"); pinet_enabled = 1; pinet_init(val); adjust_ranges_amiga(cfg); } + if (strcmp(var, "no-pistorm-dev") == 0) { + pistorm_dev_enabled = 0; + printf("[AMIGA] Disabling PiStorm interaction device.\n"); + } + // RTC stuff if (strcmp(var, "rtc_type") == 0) { if (val && strlen(val) != 0) { @@ -394,11 +455,16 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) { } void handle_reset_amiga(struct emulator_config *cfg) { - ac_z3_done = 0; - ac_z2_done = 0; + ac_z2_done = (ac_z2_pic_count == 0); + ac_z3_done = (ac_z3_pic_count == 0); ac_z2_current_pic = 0; ac_z3_current_pic = 0; - piscsi_diag_read = 0; + + DEBUG("[AMIGA] Reset handler.\n"); + DEBUG("[AMIGA] AC done - Z2: %d Z3: %d.\n", ac_z2_done, ac_z3_done); + + if (piscsi_enabled) + piscsi_refresh_drives(); adjust_ranges_amiga(cfg); } @@ -416,6 +482,25 @@ void shutdown_platform_amiga(struct emulator_config *cfg) { printf("Failed to write CDTV SRAM to disk.\n"); } } + if (cfg->platform->subsys) { + free(cfg->platform->subsys); + } + if (piscsi_enabled) { + piscsi_shutdown(); + piscsi_enabled = 0; + } + if (rtg_enabled) { + shutdown_rtg(); + rtg_enabled = 0; + } + if (pinet_enabled) { + pinet_enabled = 0; + } + + cdtv_mode = 0; + + autoconfig_reset_all(); + printf("[AMIGA] Platform shutdown completed.\n"); } void create_platform_amiga(struct platform_config *cfg, char *subsys) { @@ -433,7 +518,7 @@ void create_platform_amiga(struct platform_config *cfg, char *subsys) { if (subsys) { cfg->subsys = malloc(strlen(subsys) + 1); strcpy(cfg->subsys, subsys); - for (int i = 0; i < strlen(cfg->subsys); i++) { + for (unsigned int i = 0; i < strlen(cfg->subsys); i++) { cfg->subsys[i] = tolower(cfg->subsys[i]); } }