Cleanup and docs prep for svn patch

LouDnl · LouDnl · commit 0a0b46a914cc · 2025-07-18T19:29:04.000+02:00
diff --git a/vice/configure.ac b/vice/configure.ac
@@ -96,11 +96,11 @@ VICE_ARG_WITH_LIST(lame,                    [  --with-lame             use LAME
 VICE_ARG_WITH_LIST(static-lame,             [  --with-static-lame      statically link LAME MP3])
 VICE_ARG_WITH_LIST(portaudio,               [  --with-portaudio        use PortAudio for sound input])
 VICE_ARG_ENABLE_LIST(catweasel,             [  --enable-catweasel      enables CatWeasel (PCI/Zorro/Clockport SID card) support])
-VICE_ARG_ENABLE_LIST(usbsid,                [  --enable-usbsid         enables usbsid support])
 VICE_ARG_ENABLE_LIST(hardsid,               [  --disable-hardsid       disables HardSID support])
 VICE_ARG_ENABLE_LIST(midi,                  [  --enable-midi           enable MIDI support])
 VICE_ARG_ENABLE_LIST(new8580filter,         [  --disable-new8580filter disable new 8580 filters])
 VICE_ARG_ENABLE_LIST(parsid,                [  --enable-parsid         enables ParSID support])
+VICE_ARG_ENABLE_LIST(usbsid,                [  --enable-usbsid         enables USBSID-Pico support])
 
 dnl
 dnl Graphics options
@@ -2810,7 +2810,7 @@ if test x"$is_unix" = "xyes"; then
       ;;
   *)
       enable_parsid=no
-      # enable_usbsid=no
+      enable_usbsid=no
       enable_hardsid=no
       enable_catweasel=no
       ;;
@@ -3693,11 +3693,11 @@ fi
 
 if test x"$real_arch" = "xUnix" -o x"$real_arch" = "xOSX" -o x"$real_arch" = "xWin32"; then
     echo "MIDI support                 : $HAVE_MIDI_SUPPORT (--enable/disable-midi)"
+    echo "USBSID-Pico support          : $HAVE_USBSID_SUPPORT (--enable/disable-usbsid)"
 fi
 
 if test x"$real_arch" != "xOSX" -a x"$real_arch" != "xBeOS"; then
     echo "Catweasel MK3 support        : $HAVE_CATWEASELMKIII_SUPPORT (--enable/disable-catweasel)"
-    echo "USBSID support               : $HAVE_USBSID_SUPPORT (--enable/disable-usbsid)"
     echo "HardSID support              : $HAVE_HARDSID_SUPPORT (--enable/disable-hardsid)"
 fi
 
diff --git a/vice/doc/vice.texi b/vice/doc/vice.texi
@@ -9584,7 +9584,7 @@ images are supported:
 
 @itemize @bullet
 @item
-@file{.crt} images, as used by the CCS64 emulator by Per H�kan Sundell
+@file{.crt} images, as used by the CCS64 emulator by Per H�kan Sundell
 @item
 raw @file{.bin} images, with or without load address
 @end itemize
@@ -11677,7 +11677,7 @@ choosing one of the available predefined color sets, for example:
 @item
 @file{c64s.vpl} (``C64S''), palette taken from the shareware C64S emulator by Miha Peternel.
 @item
-@file{ccs64.vpl} (``CCS64''), palette taken from the shareware CCS64 emulator by Per H�kan Sundell.
+@file{ccs64.vpl} (``CCS64''), palette taken from the shareware CCS64 emulator by Per H�kan Sundell.
 @item
 @file{frodo.vpl} (``Frodo''), palette taken from the free Frodo emulator by Christian Bauer
 (@uref{https://frodo.cebix.net/}).
@@ -12281,7 +12281,7 @@ Integer specifying what model of the SID must be emulated.
 @vindex SidEngine
 @item SidEngine
 Integer specifying what SID engine will be used.
-(0: FastSID, 1: ReSID, 2: Catweasel MKIII, 3: HardSID, 4: ParSID Port 1, 5: ParSID Port 2, 6: ParSID Port 3)
+(0: FastSID, 1: ReSID, 2: Catweasel MKIII, 3: HardSID, 4: ParSID Port 1, 5: ParSID Port 2, 6: ParSID Port 3, 7: USBSID-Pico)
 
 @vindex SidResidSampling
 @item SidResidSampling
@@ -12468,14 +12468,15 @@ DTVSID: 260/dtv/c64dtv/dtvsid,
 Catweasel MKIII: 512/catweaselmkiii/catweasel3/catweasel/cwmkiii/cw3/cw,
 HardSID: 768/hardsid/hard/hs,
 ParSID Port 1: 1024/parsid/parsid1/par1/lpt1,
-ParSID Port 2: 1280/parsid2/par2/lpt2
-ParSID Port 3: 1536/parsid3/par3/lpt3)
+ParSID Port 2: 1280/parsid2/par2/lpt2,
+ParSID Port 3: 1536/parsid3/par3/lpt3,
+USBSID-Pico: 1792/usbsid/usbs/us)
 
 @findex -sidengine
 @item -sidengine <engine>
 Specify engine for the emulated SID chip
 (@code{SidEngine}).
-(FastSID: 0, ReSID: 1, DTVSID: 2, HardSID: 3, ParSID Port 1: 4, ParSID Port 2: 5, ParSID Port 3: 6)
+(FastSID: 0, ReSID: 1, DTVSID: 2, HardSID: 3, ParSID Port 1: 4, ParSID Port 2: 5, ParSID Port 3: 6, USBSID-Pico: 7)
 
 @findex -sidmodel
 @item -sidmodel <model>
@@ -14414,7 +14415,7 @@ images are supported:
 
 @itemize @bullet
 @item
-@file{.crt} images, as originally used by the CCS64 emulator by Per H�kan Sundell
+@file{.crt} images, as originally used by the CCS64 emulator by Per H�kan Sundell
 @item
 raw @file{.bin} images, without load address
 @item
@@ -24514,7 +24515,7 @@ the file names can't have trailing spaces.
 Ettore Perazzoli.)
 
 This format was defined in 1998 as a cooperative effort between several
-emulator people, mainly Per H�kan Sundell, author of the CCS64 C64
+emulator people, mainly Per H�kan Sundell, author of the CCS64 C64
 emulator, Andreas Boose of the VICE CBM emulator team and Joe
 Forster/STA, the author of Star Commander.  It was the first real public
 attempt to create a format for the emulator community which removed
@@ -37028,7 +37029,7 @@ Implemented the SDL UI slider control and fixed some
 GP2X/Dingoo SDL UI issues.
 
 @item
-@b{Istv�n F�bi�n}
+@b{Istv�n F�bi�n}
 Contributed a initial patch with the more correct 1541 bus
 timing code and which gave us hints for to improving the 1541
 emulation.
@@ -37139,7 +37140,7 @@ driver, basic support for the OPENCBM library and some
 other patches.
 
 @item
-@b{Frank K�nig}
+@b{Frank K�nig}
 Contributed the Win32 joystick autofire feature.
 
 @item
@@ -37188,7 +37189,7 @@ CPU emulation.
 Provided some monitor fixes.
 
 @item
-@b{Marko M�kel�}
+@b{Marko M�kel�}
 Wrote lots of CPU documentation. Wrote the VIC Flash Plugin
 cartridge emulation in xvic. Wrote the Ultimem cartridge
 emulation in xvic.
@@ -37255,7 +37256,7 @@ Donated @code{findpath.c}.
 Digitalized the C64 colors used in the (old) default palette.
 
 @item
-@b{Lasse ��rni}
+@b{Lasse ��rni}
 Contributed the Windows Multimedia sound driver
 
 @item
@@ -37502,7 +37503,7 @@ thanks goes to the following people:
 
 Last but not least, a very special thank to Andreas Arens, Lutz
 Sammer, Edgar Tornig, Christian Bauer, Wolfgang Lorenz, Miha
-Peternel, Per H�kan Sundell, David Horrocks, Benjamin Rosseaux and William McCabe
+Peternel, Per H�kan Sundell, David Horrocks, Benjamin Rosseaux and William McCabe
 for writing cool emulators to compete with.  @t{:-)}
 
 @c end of file generation section.
diff --git a/vice/src/arch/shared/hwsiddrv/usbsid-macros.h b/vice/src/arch/shared/hwsiddrv/usbsid-macros.h
diff --git a/vice/src/sid/sid-cmdline-options.c b/vice/src/sid/sid-cmdline-options.c
@@ -124,7 +124,7 @@ static const struct engine_s engine_match[] = {
 #endif
 #endif
 #ifdef HAVE_USBSID  // TODO: CHECK AND FINISH
-    { "1280", SID_USBSID },
+    { "1792", SID_USBSID },
     { "usbsid", SID_USBSID },
     { "usbs", SID_USBSID },
     { "us", SID_USBSID },
@@ -135,7 +135,6 @@ static const struct engine_s engine_match[] = {
 #ifdef HAVE_USBSID
 int us_setparam(const char *param, void *extra_param)
 {
-    printf("KUT: %s %s %s\n", param, (char *)&extra_param, (char *)extra_param);
     if ((!strcmp(((char *)extra_param), "rw")) && (strlen(param) >= 1)) {
         int r = atoi(param);
         printf("R: %d\n", r);
@@ -285,19 +284,6 @@ static const cmdline_option_t usbsid_cmdline_options[] =
     { "-usbuffsize", SET_RESOURCE, CMDLINE_ATTRIB_NEED_ARGS,
       NULL, NULL, "SidUSBSIDBufferSize", NULL,
       "<n divisable by 8>", "Write buffer size (default: 8192)" },
-
-    // { "-usreadmode", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
-    //   us_setparam, "rw", "SidUSBSIDReadMode", NULL,
-    //   "<1 or 0>", "Enable USBSID read mode (disables cycled writing & digiplay)" },
-    // { "-usaudiomode", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
-    //   us_setparam, "audio", "SidUSBSIDAudioMode", NULL,
-    //   "<1 or 0>", "Set audio to Stereo(1) or Mono(0) (Default)" },
-    // { "-usbuffsize", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
-    //   us_setparam, "buff", "SidUSBSIDBufferSize", NULL,
-    //   "<n divisable by 8>", "Write buffer size (default: 8192)" },
-    // { "-usdiffsize", CALL_FUNCTION, CMDLINE_ATTRIB_NEED_ARGS,
-    //   us_setparam, "diff", "SidUSBSIDDiffSize", NULL,
-    //   "<n divisable by 8>", "Write buffer head -> tail diff size (default: 64)" },
     CMDLINE_LIST_END
 };
 #endif
@@ -469,7 +455,7 @@ static char *build_sid_cmdline_option(int sid_type)
 #ifdef HAVE_USBSID
     /* add usbsid options if available */
     if (usbsid_available()) {
-        new = util_concat(old, ", 1280: USBSID", NULL);
+        new = util_concat(old, ", 1792: USBSID-Pico", NULL);
         lib_free(old);
         old = new;
     }
@@ -547,7 +533,7 @@ static char *build_sid_engine_cmdline_option(int sid_type)
 #ifdef HAVE_USBSID
     /* add usbsid options if available */
     if (usbsid_available()) {
-        new = util_concat(old, ", 5: USBSID", NULL);
+        new = util_concat(old, ", 7: USBSID-Pico", NULL);
         lib_free(old);
         old = new;
     }
diff --git a/vice/src/sid/sid-resources.c b/vice/src/sid/sid-resources.c
@@ -124,7 +124,7 @@ static int set_sid_engine(int set_engine, void *param)
         case SID_ENGINE_PARSID:
 #endif
 #endif
-#ifdef HAVE_USBSID  // TODO: CHECK AND FINISH
+#ifdef HAVE_USBSID
         case SID_ENGINE_USBSID:
 #endif
             break;
@@ -185,9 +185,6 @@ 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
     return 0;
 }
 
diff --git a/vice/src/sid/sid.c b/vice/src/sid/sid.c
@@ -1162,12 +1162,12 @@ int sid_engine_get_max_sids(int engine)
             return SID_ENGINE_CATWEASELMKIII_NUM_SIDS;
         case SID_ENGINE_HARDSID:
             return SID_ENGINE_HARDSID_NUM_SIDS;
-        case SID_ENGINE_USBSID:
-            return SID_ENGINE_USBSID_NUM_SIDS;
 #if !defined(WINDOWS_COMPILE) || (defined(WINDOWS_COMPILE) && defined(HAVE_LIBIEEE1284))
         case SID_ENGINE_PARSID:
             return SID_ENGINE_PARSID_NUM_SIDS;
 #endif
+        case SID_ENGINE_USBSID:
+            return SID_ENGINE_USBSID_NUM_SIDS;
         default:
             /* unknow engine */
             return -1;
diff --git a/vice/src/sid/sid.h b/vice/src/sid/sid.h
@@ -45,7 +45,7 @@ enum {
     SID_ENGINE_CATWEASELMKIII,
     SID_ENGINE_HARDSID,
     SID_ENGINE_PARSID,
-    SID_ENGINE_USBSID
+    SID_ENGINE_USBSID = 7
 };
 
 #define SID_ENGINE_DEFAULT       99
@@ -99,7 +99,7 @@ enum {
 #define SID_CATWEASELMKIII        (SID_ENGINE_CATWEASELMKIII << 8)
 #define SID_HARDSID               (SID_ENGINE_HARDSID << 8)
 #define SID_PARSID                (SID_ENGINE_PARSID << 8)
-#define SID_USBSID                (SID_ENGINE_USBSID << 8)  // 1280
+#define SID_USBSID                (SID_ENGINE_USBSID << 8)
 
 #define SIDTYPE_SID       0
 #define SIDTYPE_SIDDTV    1

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ static int set_sid_engine(int set_engine, void *param)`
`124`	`124`	`case SID_ENGINE_PARSID:`
`125`	`125`	`#endif`
`126`	`126`	`#endif`
`127`		`-#ifdef HAVE_USBSID // TODO: CHECK AND FINISH`
	`127`	`+#ifdef HAVE_USBSID`
`128`	`128`	`case SID_ENGINE_USBSID:`
`129`	`129`	`#endif`
`130`	`130`	`break;`
`@@ -185,9 +185,6 @@ static int set_sid_stereo(int val, void *param)`
`185`	`185`	`machine_sid2_enable(val);`
`186`	`186`	`}`
`187`	`187`	`}`
`188`		`-// #ifdef HAVE_USBSID`
`189`		`-// usbsid_set_audio(val); /* Set mono or stereo by no. sids */`
`190`		`-// #endif`
`191`	`188`	`return 0;`
`192`	`189`	`}`
`193`	`190`