Update commandline arguments for readmode and add audiomode

Author: LouDnl

README.md

@@ -2,6 +2,15 @@
 This fork has built-in support for USBSID-Pico. \
 USBSID-Pico is a RPi Pico based board for interfacing one or two MOS SID chips and/or hardware SID emulators with your PC over USB.
 
+# Usage
+Use `-usreadmode 1` with to enable readmode for FPGASID, default is disabled.  
+Use `-usaudiomode 1` to enable Stereo mode, default is Mono mode. Works on PCB v1.3 only!
+```shell
+   # Examples
+   x64sc -usreadmode 1 -usaudiomode 1
+   vsid -usreadmode 1 -usaudiomode 1
+```
+
 # Linux Building and installing
 For building you can mostly follow the instructions in the [Linux-GTK3-Howto](vice/doc/building/Linux-GTK3-Howto.txt) \
 add `--enable-usbsid` to `./configure` for [USBSID-Pico](https://github.com/LouDnl/USBSID-Pico) support
@@ -59,7 +68,6 @@ libsdl-image1.2
     ../../vice/configure \
        --prefix=/usr \
        --enable-option-checking=fatal \
-       --enable-gtk3ui \
        --enable-usbsid \
        --disable-arch \
        --disable-html-docs \
@@ -153,13 +161,3 @@ After installing docker follow the following steps to create win32 or win64 bina
     # depending on the container type you created this will create a zip file in the current directory
     ./dock-run.sh $(pwd)
 ```
-
-
-# VICE GitHub Mirror
-This is the official git mirror of the [VICE subversion repo](https://sourceforge.net/p/vice-emu/code/HEAD/tree/).
-
-For news, documentation, developer information, [visit the VICE website](https://vice-emu.sourceforge.io/).
-
-## Download VICE
-* [Official Releases](https://vice-emu.sourceforge.io/#download)
-* [Snapshot builds of the latest code](https://github.com/VICE-Team/svn-mirror/releases)

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

@@ -66,7 +66,9 @@
 #pragma GCC optimize ("O3")
 #endif
 
-static int rc = -1, sids_found = -1, no_sids = -1, soc_audio = -1, r_readmode = -1, readmode = -1;
+static int rc = -1, sids_found = -1, no_sids = -1;
+static int r_audiomode = -1, audiomode = -1;
+static int r_readmode = -1, readmode = -1;
 static uint8_t sidbuf[0x20 * US_MAXSID];
 
 static CLOCK usid_main_clk;
@@ -118,23 +120,29 @@ int us_device_open(void)
         usbsid = create_USBSID();
         if (usbsid) {
             resources_get_int("SidUSBSIDReadMode", &r_readmode);
-            log_message(usbsid_log, "SidUSBSIDReadMode: %d, readmode: %d\r", r_readmode, readmode);
+            // log_message(usbsid_log, "SidUSBSIDReadMode: %d, readmode: %d\r", r_readmode, readmode);
             readmode = r_readmode;
+            resources_get_int("SidUSBSIDAudioMode", &r_audiomode);
+            // log_message(usbsid_log, "SidUSBSIDAudioMode: %d, readmode: %d\r", r_audiomode, audiomode);
+            audiomode = r_audiomode;
         }
-          /* 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) {
+
+        if (readmode == 1) {
             log_message(usbsid_log, "Starting in read mode\r");
             rc = init_USBSID(usbsid, false, false);  /* threading and cycles disabled */
+        } else {  /*  (readmode == 0 || readmode == -1) */
+            /* NOTICE: Digitunes only play with threaded cycles */
+            log_message(usbsid_log, "Starting in normal mode\r");
+            rc = init_USBSID(usbsid, true, true);  /* threading and cycles enabled */
         }
-
         if (rc < 0) {
             return -1;
         }
     }
 
+    log_message(usbsid_log, "Set audio mode to %s\r", (audiomode == 1 ? "Stereo" : "Mono"));
+    setstereo_USBSID(usbsid, (audiomode == 1 ? audiomode : 0));
+
     usid_alarm = alarm_new(maincpu_alarm_context, "usbsid", usbsid_alarm_handler, NULL);
     sids_found = getnumsids_USBSID(usbsid);
     no_sids = 0;
@@ -224,30 +232,6 @@ unsigned int us_device_available(void)
     return sids_found;
 }
 
-void us_set_audio(int val)
-{   /* Gets set by x64sc from SID settings and by VSID at SID file change */
-    resources_get_int("SoundOutput", &soc_audio);
-    log_message(usbsid_log, "Global audio type is '%s'\r", (soc_audio == 2 ? "Stereo" : soc_audio == 1 ? "Mono" : "System"));
-
-
-    int stereo = 0;
-    no_sids = val+1; /* Number of SIDs requested +1 (val = 0 if 1 single SID is requested) */
-
-    log_message(usbsid_log, "Set requested audio type for no. SIDs %d (No. SIDs available: %d)\r", no_sids, sids_found);
-
-    stereo
-        /* Number of requested SIDs equals no. available SIDs */
-        = (no_sids == sids_found && soc_audio != 1)
-        ? (no_sids == 2 || no_sids == 4)  /* 2 or 4 SIDs requested */
-        ? 1  /* then Stereo */
-        : 0  /* else Mono */
-        /* else number of requested SIDs does not equal no. available SIDs */
-        : 0; /* fallback to Mono */
-
-    log_message(usbsid_log, "Audio type set to '%s' for %d requested SIDs\r", (stereo == 1 ? "Stereo" : "Mono"), no_sids);
-    setstereo_USBSID(usbsid, stereo);
-}
-
 void us_set_readmode(int val)
 {
     resources_get_int("SidUSBSIDReadMode", &r_readmode);
@@ -260,6 +244,15 @@ void us_set_readmode(int val)
     return;
 }
 
+void us_set_audiomode(int val)
+{   /* Gets set by x64sc from SID settings and by VSID at SID file change */
+    resources_get_int("SidUSBSIDAudioMode", &r_audiomode);
+    log_message(usbsid_log, "Audio mode is '%s'\r", (r_audiomode == 1 ? "Stereo" : "Mono"));
+    audiomode = r_audiomode;
+
+    setstereo_USBSID(usbsid, audiomode);
+}
+
 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

@@ -54,10 +54,10 @@ void us_set_machine_parameter(long cycles_per_sec);
 
 unsigned int us_device_available(void);
 
-void us_set_audio(int val);
-
 void us_set_readmode(int val);
 
+void us_set_audiomode(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

@@ -101,17 +101,17 @@ int usbsid_drv_available(void)
     return 0;
 }
 
-void usbsid_drv_set_audio(int val)
+void usbsid_drv_set_readmode(int val)
 {
     if (use_us_device) {
-        us_set_audio(val);
+        us_set_readmode(val);
     }
 }
 
-void usbsid_drv_set_readmode(int val)
+void usbsid_drv_set_audiomode(int val)
 {
     if (use_us_device) {
-        us_set_readmode(val);
+        us_set_audiomode(val);
     }
 }
 

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

@@ -240,9 +240,12 @@ static const cmdline_option_t hardsid_cmdline_options[] =
 #ifdef HAVE_USBSID
 static const cmdline_option_t usbsid_cmdline_options[] =
 {
-    { "-usbsidreadmode", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+    { "-usreadmode", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
       NULL, NULL, "SidUSBSIDReadMode", NULL,
       "<1 or 0>", "Enable USBSID read mode (disables cycled writing & digiplay)" },
+    { "-usaudiomode", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
+      NULL, NULL, "SidUSBSIDAudioMode", NULL,
+      "<1 or 0>", "Set audio to Stereo(1) or Mono(0) (Default)" },
     CMDLINE_LIST_END
 };
 #endif

vice/src/sid/sid-resources.c

@@ -89,6 +89,7 @@ static int sid_hardsid_right;
 #endif
 #ifdef HAVE_USBSID
 static int sid_usbsid_readmode;
+static int sid_usbsid_audiomode;
 #endif
 
 static int set_sid_engine(int set_engine, void *param)
@@ -182,9 +183,9 @@ static int set_sid_stereo(int val, void *param)
             machine_sid2_enable(val);
         }
     }
-#ifdef HAVE_USBSID
-    usbsid_set_audio(val);  /* Set mono or stereo by no. sids */
-#endif
+// #ifdef HAVE_USBSID
+//     usbsid_set_audio(val);  /* Set mono or stereo by no. sids */
+// #endif
     return 0;
 }
 
@@ -367,13 +368,21 @@ static int set_sid_hardsid_right(int val, void *param)
 #endif
 
 #ifdef HAVE_USBSID
-static int set_sid_usbsid_main(int val, void *param)
+static int set_sid_usbsid_readmode(int val, void *param)
 {
     sid_usbsid_readmode = (unsigned int)val;
     usbsid_set_readmode(sid_usbsid_readmode);
 
     return 0;
 }
+
+static int set_sid_usbsid_audiomode(int val, void *param)
+{
+    sid_usbsid_audiomode = (unsigned int)val;
+    usbsid_set_audiomode(sid_usbsid_readmode);
+
+    return 0;
+}
 #endif
 
 
@@ -462,7 +471,9 @@ static const resource_int_t hardsid_resources_int[] = {
 #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 },
+      &sid_usbsid_readmode, set_sid_usbsid_readmode, NULL },
+    { "SidUSBSIDAudioMode", 0, RES_EVENT_NO, NULL,
+      &sid_usbsid_audiomode, set_sid_usbsid_audiomode, NULL },
     RESOURCE_INT_LIST_END
 };
 #endif
@@ -508,9 +519,11 @@ int sid_common_resources_init(void)
 #endif
 
 #ifdef HAVE_USBSID
+    // if (usbsid_available()) {
     if (resources_register_int(usbsid_resources_int) < 0) {
         return -1;
     }
+    // }
 #endif
 
     return resources_register_int(common_resources_int);

vice/src/sid/usbsid.c

@@ -142,20 +142,21 @@ int usbsid_available(void)
     return usbsid_is_open;
 }
 
-void usbsid_set_audio(int val)
+void usbsid_set_readmode(int val)
 {
     if (!usbsid_is_open) {
-        usbsid_drv_set_audio(val);
+        usbsid_drv_set_readmode(val);
     }
 }
 
-void usbsid_set_readmode(int val)
+void usbsid_set_audiomode(int val)
 {
     if (!usbsid_is_open) {
-        usbsid_drv_set_readmode(val);
+        usbsid_drv_set_audiomode(val);
     }
 }
 
+
 /* ---------------------------------------------------------------------*/
 
 void usbsid_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state)

vice/src/usbsid.h

@@ -41,7 +41,7 @@ int usbsid_read(uint16_t addr, int chipno);
 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_audiomode(int val);
 void usbsid_set_readmode(int val);
 
 int usbsid_drv_open(void);
@@ -51,7 +51,7 @@ int usbsid_drv_read(uint16_t addr, int chipno);
 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_audiomode(int val);
 void usbsid_drv_set_readmode(int val);
 
 void usbsid_state_read(int chipno, struct sid_us_snapshot_state_s *sid_state);