Update config_file.c, amiga-platform.c, and 3 more files...

[pistorm] / platforms / amiga / amiga-platform.c

diff --git a/platforms/amiga/amiga-platform.c b/platforms/amiga/amiga-platform.c
index 819dd0fdc1da7c7ded00f26818677ae3fee3eefc..266c122ac5496134e76123165b8ee671ea7fb4b1 100644 (file)
--- a/platforms/amiga/amiga-platform.c
+++ b/platforms/amiga/amiga-platform.c
@@ -11,6 +11,8 @@
 #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"
@@ -23,10 +25,8 @@
 #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;
@@ -54,9 +54,9 @@ extern unsigned char cdtv_sram[32 * SIZE_KILO];
 #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;
+uint8_t rtg_enabled = 0, piscsi_enabled = 0, pinet_enabled = 0, kick13_mode = 0, pistorm_dev_enabled = 1;
 
-extern uint32_t piscsi_base;
+extern uint32_t piscsi_base, pistorm_dev_base;
 
 extern void stop_cpu_emulation(uint8_t disasm_cur);
 
@@ -100,7 +100,12 @@ inline int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, uns
         return -1;
     }
 
-    if (addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) {
+    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 (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);
@@ -162,7 +167,12 @@ inline int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, un
         }
     }
 
-    if (addr >= piscsi_base && addr < piscsi_base + (64 * SIZE_KILO)) {
+    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;
@@ -187,20 +197,20 @@ void adjust_ranges_amiga(struct emulator_config *cfg) {
         }
     }
 
-    if (ac_z2_pic_count && (!ac_z2_done || !ac_z3_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;
@@ -260,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) {
@@ -279,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");
@@ -333,6 +344,10 @@ int setup_platform_amiga(struct emulator_config *cfg) {
         }
     }
 
+    if (pistorm_dev_enabled) {
+        add_z2_pic(ACTYPE_PISTORM_DEV, 0);
+    }
+
     return 0;
 }
 
@@ -364,7 +379,7 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) {
         cdtv_mode = 1;
     }
     if (strcmp(var, "rtg") == 0 && !rtg_enabled) {
-        if (init_rtg_data()) {
+        if (init_rtg_data(cfg)) {
             printf("[AMIGA] RTG Enabled.\n");
             rtg_enabled = 1;
             adjust_ranges_amiga(cfg);
@@ -382,8 +397,9 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) {
         printf("[AMIGA] PISCSI Interface Enabled.\n");
         piscsi_enabled = 1;
         piscsi_init();
-        ac_z2_type[ac_z2_pic_count] = ACTYPE_PISCSI;
-        ac_z2_pic_count++;
+        add_z2_pic(ACTYPE_PISCSI, 0);
+        //ac_z2_type[ac_z2_pic_count] = ACTYPE_PISCSI;
+        //ac_z2_pic_count++;
         adjust_ranges_amiga(cfg);
     }
     if (piscsi_enabled) {
@@ -418,6 +434,11 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *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) {
@@ -461,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) {