Added FunMP3 userport cartridge support

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45796 379a1393-f5fb-40a0-bcee-ef074d9b53f7

Author: pottendo

vice/configure.ac

@@ -3148,6 +3148,11 @@ if test x"$with_mpg123" = "xyes"; then
     if test x"$USE_MPG123_SUPPORT" != "xyes"; then
         AC_MSG_ERROR([MPG123 support requested but missing])
     fi
+    if test x"$is_win32_gtk3" = "xyes"; then
+        AC_DEFINE(HAVE_GLOB_H,,)
+    else
+        AC_CHECK_HEADERS(glob.h,,)
+    fi
 fi
 
 dnl Check for libraries and header files

vice/doc/vice.texi

@@ -8782,6 +8782,9 @@ Set the device attached to the userport (see table below):
 @item 27
 @tab Userport PS/2 Mouse
 @tab x64dtv
+@item 27
+@tab Userport FunMP3
+@tab x64, x64sc, x128, xscpu64, xpet, xvic
 @end multitable
 
 @table @code
@@ -8855,6 +8858,11 @@ Integer, WiC64 trace level, 0: no trace, 1: standard, 2: verbose,
 3: debug
 (vic20, x64, x64sc, xscpu64 and x128 only).
 
+@vindex FunMP3Dir
+@item FunMP3Dir
+String specifying the path to the directory where mp3's are lookup up
+for playing
+(vic20, x64, x64sc, xscpu64, x128 and xpet only).
 @end table
 
 @c @node FIXME
@@ -8937,6 +8945,10 @@ Specify WiC64 security token
 Enable/disable automatically setting the local IP address (default: enabled)
 (vic20, x64, x64sc, xscpu64 and x128 only).
 
+@findex -funmp3dir
+@item -funmp3dir <path>
+Specify path to search for mp3 files used by the FunMP3 module
+(vic20, x64, x64sc, xscpu64, x128, xpet only).
 @end table
 
 @c -----------------------------------------------------------------------------
@@ -36712,6 +36724,7 @@ The VICE core team:
 @b{Pottendo}
 Fixed WiC64 support. Most of the former contributions (pre V3.x) have
 been taken over and/or replaced by other's contributions.
+Added FunMP3 userport cartdridge support.
 
 @item
 @b{Marco van den Heuvel}

vice/src/arch/shared/Makefile.am

@@ -87,6 +87,7 @@ libarchdep_a_SOURCES = \
 	archdep_get_vice_hotkeysdir.c \
 	archdep_get_vice_machinedir.c \
 	archdep_getcwd.c \
+	archdep_glob.c \
 	archdep_home_path.c \
 	archdep_icon_path.c \
 	archdep_is_haiku.c \
@@ -199,6 +200,7 @@ EXTRA_DIST = \
 	archdep_get_vice_hotkeysdir.h \
 	archdep_get_vice_machinedir.h \
 	archdep_getcwd.h \
+	archdep_glob.h \
 	archdep_home_path.h \
 	archdep_icon_path.h \
 	archdep_is_haiku.h \

vice/src/arch/shared/archapi.h

@@ -82,6 +82,7 @@
 #include "archdep_get_vice_hotkeysdir.h"
 #include "archdep_get_vice_machinedir.h"
 #include "archdep_getcwd.h"
+#include "archdep_glob.h"
 #include "archdep_home_path.h"
 #include "archdep_icon_path.h"
 #include "archdep_is_haiku.h"

vice/src/c128/c128.c

@@ -142,6 +142,7 @@
 #include "userport_superpad64.h"
 #include "userport_synergy_joystick.h"
 #include "userport_wic64.h"
+#include "userport_funmp3.h"
 #include "userport_woj_joystick.h"
 #include "vdc.h"
 #include "vdc-mem.h"
@@ -1149,7 +1150,9 @@ int machine_specific_init(void)
 #ifdef USE_MPG123
     clockport_mp3at64_sound_chip_init();
 #endif
-
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    userport_funmp3_sound_chip_init();
+#endif
     drive_sound_init();
     datasette_sound_init();
     video_sound_init();

vice/src/c64/c64.c

@@ -144,6 +144,7 @@
 #include "userport_synergy_joystick.h"
 #include "userport_wic64.h"
 #include "userport_woj_joystick.h"
+#include "userport_funmp3.h"
 #include "vice-event.h"
 #include "vicii.h"
 #include "vicii-mem.h"
@@ -1103,10 +1104,13 @@ int machine_specific_init(void)
     userport_dac_sound_chip_init();
     userport_digimax_sound_chip_init();
 
-    /* Initialize mp3@64 */
+    /* Initialize mp3@64, funmp3 */
 #ifdef USE_MPG123
     clockport_mp3at64_sound_chip_init();
 #endif
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    userport_funmp3_sound_chip_init();
+#endif
 
     drive_sound_init();
     datasette_sound_init();

vice/src/pet/pet.c

@@ -111,6 +111,7 @@
 #include "userport_spt_joystick.h"
 #include "userport_synergy_joystick.h"
 #include "userport_woj_joystick.h"
+#include "userport_funmp3.h"
 #include "util.h"
 #include "via.h"
 #include "vice-event.h"
@@ -431,6 +432,12 @@ int machine_resources_init(void)
         init_resource_fail("debug cart");
         return -1;
     }
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    if (userport_funmp3_resources_init() < 0) {
+        init_resource_fail("funmp3 cart");
+        return -1;
+    }
+#endif
     return 0;
 }
 
@@ -582,6 +589,12 @@ int machine_cmdline_options_init(void)
         init_cmdline_options_fail("debug cart");
         return -1;
     }
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    if (userport_funmp3_cmdline_options_init() < 0) {
+        init_cmdline_options_fail("funmp3 cart");
+        return -1;
+    }
+#endif
     return 0;
 }
 
@@ -706,6 +719,11 @@ int machine_specific_init(void)
     /* Initialize userport based sound chips */
     userport_dac_sound_chip_init();
 
+    /* Initialize funmp3 */
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    userport_funmp3_sound_chip_init();
+#endif
+
     drive_sound_init();
     datasette_sound_init();
     video_sound_init();

vice/src/userport/Makefile.am

@@ -63,6 +63,8 @@ libuserport_a_SOURCES = \
 	userport_synergy_joystick.h \
 	userport_wic64.c \
 	userport_wic64.h \
+	userport_funmp3.c \
+	userport_funmp3.h \
 	userport_woj_joystick.c \
 	userport_woj_joystick.h
 

vice/src/userport/userport.c

@@ -152,6 +152,7 @@
 #include "userport_superpad64.h"
 #include "userport_synergy_joystick.h"
 #include "userport_wic64.h"
+#include "userport_funmp3.h"
 
 #include "c64parallel.h"
 #include "plus4parallel.h"
@@ -786,6 +787,14 @@ static userport_init_t userport_devices_init[] = {
       NULL,                                     /* resources shutdown function */
       NULL                                      /* cmdline options init function */
     },
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    { USERPORT_DEVICE_FUNMP3,                /* device id */
+      UP_C64 | UP_VIC20,                     /* emulators this device works on */
+      userport_funmp3_resources_init,        /* resources init function */
+      userport_funmp3_resources_shutdown,    /* resources shutdown function */
+      userport_funmp3_cmdline_options_init   /* cmdline options init function */
+    },
+#endif
 
     { USERPORT_DEVICE_NONE, VICE_MACHINE_NONE, NULL, NULL, NULL },   /* end of the devices list */
 };
@@ -930,6 +939,10 @@ static const struct userport_opt_s id_match[] = {
 #endif
     { "space",              USERPORT_DEVICE_SPACEBALLS },
     { "spaceballs",         USERPORT_DEVICE_SPACEBALLS },
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+    { "funmp3",             USERPORT_DEVICE_FUNMP3 },
+#endif
+
     { NULL, -1 }
 };
 

vice/src/userport/userport.h

@@ -71,6 +71,7 @@ enum {
     USERPORT_DEVICE_SPT_JOYSTICK,
     USERPORT_DEVICE_DIAGNOSTIC_PIN,
     USERPORT_DEVICE_MOUSE_PS2,
+    USERPORT_DEVICE_FUNMP3,
 
     /* This item always needs to be at the end */
     USERPORT_MAX_DEVICES