Add register readmode as command line argument option for FPGASID configuru

Author: LouDnl

vice/src/arch/shared/hwsiddrv/us-unixwin-device.c

@@ -66,7 +66,7 @@
 #pragma GCC optimize ("O3")
 #endif
 
-static int rc = -1, sids_found = -1, no_sids = -1, soc_audio = -1;
+static int rc = -1, sids_found = -1, no_sids = -1, soc_audio = -1, r_readmode = -1, readmode = -1;
 static uint8_t sidbuf[0x20 * US_MAXSID];
 
 static CLOCK usid_main_clk;
@@ -116,7 +116,20 @@ int us_device_open(void)
 
     if (usbsid == NULL) {
         usbsid = create_USBSID();
-        rc = init_USBSID(usbsid, true, true);  /* NOTICE: Digitunes only play with threaded cycles */
+        if (usbsid) {
+            resources_get_int("SidUSBSIDReadMode", &r_readmode);
+            log_message(usbsid_log, "SidUSBSIDReadMode: %d, readmode: %d\r", r_readmode, readmode);
+            readmode = r_readmode;
+        }
+          /* NOTICE: Digitunes only play with threaded cycles */
+        if (readmode == 0) {
+            log_message(usbsid_log, "Starting in normal mode\r");
+            rc = init_USBSID(usbsid, true, true);  /* threading and cycles enabled */
+        } else if (readmode == 1) {
+            log_message(usbsid_log, "Starting in read mode\r");
+            rc = init_USBSID(usbsid, false, false);  /* threading and cycles disabled */
+        }
+
         if (rc < 0) {
             return -1;
         }
@@ -154,9 +167,13 @@ int us_device_close(void)
 int us_device_read(uint16_t addr, int chipno)
 {   /* NOTICE: Disabled, unneeded */
     if (chipno < US_MAXSID) {
-        addr = ((addr & 0x1F) + (chipno * 0x20));
-        /* return (uint8_t)sidbuf[addr]; */
-        return 0x0;
+        if (readmode == 1) {
+            uint8_t n_addr = ((addr & 0x1F) + (chipno * 0x20));
+            sidbuf[addr] = read_USBSID(usbsid, n_addr);
+            return sidbuf[addr];
+        } else {
+            return 0x0;
+        }
     }
     return 0x0;
 }
@@ -181,8 +198,12 @@ void us_device_store(uint16_t addr, uint8_t val, int chipno) /* max chipno = 1 *
 {
     if (chipno < US_MAXSID) {  /* remove 0x20 address limitation */
         addr = ((addr & 0x1F) + (chipno * 0x20));
-        uint_fast32_t cycles = us_delay();
-        writeringcycled_USBSID(usbsid, addr, val, cycles);
+        if (readmode == 0) {
+            uint_fast32_t cycles = us_delay();
+            writeringcycled_USBSID(usbsid, addr, val, cycles);
+        } else if (readmode == 1) {
+            write_USBSID(usbsid, addr, val);
+        }
         sidbuf[addr] = val;
         return;
     }
@@ -227,6 +248,18 @@ void us_set_audio(int val)
     setstereo_USBSID(usbsid, stereo);
 }
 
+void us_set_readmode(int val)
+{
+    resources_get_int("SidUSBSIDReadMode", &r_readmode);
+    if (readmode != val) {
+        log_message(usbsid_log, "Set read mode from %d to %d (resource: %d)\r", readmode, val, r_readmode);
+        readmode = val;
+        if (val == 0) enablethread_USBSID(usbsid);
+        if (val == 1) disablethread_USBSID(usbsid);
+    }
+    return;
+}
+
 static void usbsid_alarm_handler(CLOCK offset, void *data)
 {
     CLOCK cycles = (usid_alarm_clk + offset) - usid_main_clk;

vice/src/arch/shared/hwsiddrv/us-unixwin.h

@@ -56,6 +56,8 @@ unsigned int us_device_available(void);
 
 void us_set_audio(int val);
 
+void us_set_readmode(int val);
+
 void us_device_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state);
 
 void us_device_state_write(int chipno, struct sid_us_snapshot_state_s *sid_state);

vice/src/arch/shared/hwsiddrv/usbsid-unixwin-drv.c

@@ -108,6 +108,13 @@ void usbsid_drv_set_audio(int val)
     }
 }
 
+void usbsid_drv_set_readmode(int val)
+{
+    if (use_us_device) {
+        us_set_readmode(val);
+    }
+}
+
 void usbsid_drv_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state)
 {
     if (use_us_device) {

vice/src/sid/sid-cmdline-options.c

@@ -237,6 +237,16 @@ static const cmdline_option_t hardsid_cmdline_options[] =
 };
 #endif
 
+#ifdef HAVE_USBSID
+static const cmdline_option_t usbsid_cmdline_options[] =
+{
+    { "-usbsidreadmode", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "SidUSBSIDReadMode", NULL,
+      "<1 or 0>", "Enable USBSID read mode (disables cycled writing & digiplay)" },
+    CMDLINE_LIST_END
+};
+#endif
+
 static cmdline_option_t stereo_cmdline_options[] =
 {
     { "-sidextra", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
@@ -573,6 +583,12 @@ int sid_cmdline_options_init(int sid_type)
     }
 #endif
 
+#ifdef HAVE_USBSID
+    if (cmdline_register_options(usbsid_cmdline_options) < 0) {
+        return -1;
+    }
+#endif
+
 #ifdef HAVE_HARDSID
     if (hardsid_available()) {
         if (cmdline_register_options(hardsid_cmdline_options) < 0) {

vice/src/sid/sid-resources.c

@@ -87,6 +87,9 @@ static int sid_engine;
 static int sid_hardsid_main;
 static int sid_hardsid_right;
 #endif
+#ifdef HAVE_USBSID
+static int sid_usbsid_readmode;
+#endif
 
 static int set_sid_engine(int set_engine, void *param)
 {
@@ -363,6 +366,16 @@ static int set_sid_hardsid_right(int val, void *param)
 }
 #endif
 
+#ifdef HAVE_USBSID
+static int set_sid_usbsid_main(int val, void *param)
+{
+    sid_usbsid_readmode = (unsigned int)val;
+    usbsid_set_readmode(sid_usbsid_readmode);
+
+    return 0;
+}
+#endif
+
 
 #ifdef HAVE_RESID
 static int sid_enabled = 1;
@@ -446,6 +459,14 @@ static const resource_int_t hardsid_resources_int[] = {
 };
 #endif
 
+#ifdef HAVE_USBSID
+static const resource_int_t usbsid_resources_int[] = {
+    { "SidUSBSIDReadMode", 0, RES_EVENT_NO, NULL,
+      &sid_usbsid_readmode, set_sid_usbsid_main, NULL },
+    RESOURCE_INT_LIST_END
+};
+#endif
+
 
 static const resource_int_t stereo_resources_int[] = {
     { "SidStereo", 0, RES_EVENT_SAME, NULL,
@@ -486,6 +507,12 @@ int sid_common_resources_init(void)
     }
 #endif
 
+#ifdef HAVE_USBSID
+    if (resources_register_int(usbsid_resources_int) < 0) {
+        return -1;
+    }
+#endif
+
     return resources_register_int(common_resources_int);
 }
 

vice/src/sid/usbsid.c

@@ -55,6 +55,7 @@
 #define usbsid_drv_store(addr, val, chipno) printf("[USBSID] usbsid_drv_store addr:%02x val:%02x chip:%d\n", addr, val, chipno)
 #define usbsid_drv_state_read(chipno, sid_state) printf("[USBSID] usbsid_drv_state_read chip:%d sid_state:%p\n", chipno, sid_state)
 #define usbsid_drv_state_write(chipno, sid_state) printf("[USBSID] usbsid_drv_state_write chip:%d sid_state:%p\n", chipno, sid_state)
+#define usbsid_drv_set_readmode(val) printf("[USBSID] usbsid_drv_set_readmode read_mode:%p\n", val)
 
 #endif
 
@@ -148,6 +149,13 @@ void usbsid_set_audio(int val)
     }
 }
 
+void usbsid_set_readmode(int val)
+{
+    if (!usbsid_is_open) {
+        usbsid_drv_set_readmode(val);
+    }
+}
+
 /* ---------------------------------------------------------------------*/
 
 void usbsid_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state)

vice/src/usbsid.h

@@ -42,6 +42,7 @@ void usbsid_store(uint16_t addr, uint8_t val, int chipno);
 void usbsid_set_machine_parameter(long cycles_per_sec);
 int usbsid_available(void);
 void usbsid_set_audio(int val);
+void usbsid_set_readmode(int val);
 
 int usbsid_drv_open(void);
 int usbsid_drv_close(void);
@@ -51,6 +52,7 @@ void usbsid_drv_store(uint16_t addr, uint8_t val, int chipno);
 void usbsid_drv_set_machine_parameter(long cycles_per_sec);
 int usbsid_drv_available(void);
 void usbsid_drv_set_audio(int val);
+void usbsid_drv_set_readmode(int val);
 
 void usbsid_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state);
 void usbsid_state_write(int chipno, struct sid_us_snapshot_state_s *sid_state);