diff --git a/Makefile.in b/Makefile.in
index 3bdd759..d83741a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -247,6 +247,7 @@ PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SDL2_CONFIG = @SDL2_CONFIG@
+SDL2_FRAMEWORK = @SDL2_FRAMEWORK@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
diff --git a/aclocal.m4 b/aclocal.m4
index b525be4..53df7ec 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
+dnl serial 11 (pkg-config-0.29)
 dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -63,7 +63,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -302,6 +302,9 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
 # stolen back from Frank Belew
 # stolen from Manish Singh
 # Shamelessly stolen from Owen Taylor
+#
+# Changelog:
+# * also look for SDL2.framework under Mac OS X
 
 # serial 1
 
@@ -318,6 +321,10 @@ AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL
             sdl_exec_prefix="$withval", sdl_exec_prefix="")
 AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
 		    , enable_sdltest=yes)
+AC_ARG_ENABLE(sdlframework, [  --disable-sdlframework Do not search for SDL2.framework],
+        , search_sdl_framework=yes)
+
+AC_ARG_VAR(SDL2_FRAMEWORK, [Path to SDL2.framework])
 
   min_sdl_version=ifelse([$1], ,2.0.0,$1)
 
@@ -351,14 +358,36 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
     fi
     AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH])
     PATH="$as_save_PATH"
-    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
     no_sdl=""
 
-    if test "$SDL2_CONFIG" = "no" ; then
-      no_sdl=yes
-    else
-      SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
-      SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
+    if test "$SDL2_CONFIG" = "no" -a "x$search_sdl_framework" = "xyes"; then
+      AC_MSG_CHECKING(for SDL2.framework)
+      if test "x$SDL2_FRAMEWORK" != x; then
+        sdl_framework=$SDL2_FRAMEWORK
+      else
+        for d in / ~/ /System/; do
+          if test -d "$dLibrary/Frameworks/SDL2.framework"; then
+            sdl_framework="$dLibrary/Frameworks/SDL2.framework"
+          fi
+        done
+      fi
+
+      if test -d $sdl_framework; then
+        AC_MSG_RESULT($sdl_framework)
+        sdl_framework_dir=`dirname $sdl_framework`
+        SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include"
+        SDL_LIBS="-F$sdl_framework_dir -Wl,-framework,SDL2"
+      else
+        no_sdl=yes
+      fi
+    fi
+
+    if test "$SDL2_CONFIG" != "no"; then
+      if test "x$sdl_pc" = "xno"; then
+        AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+        SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
+        SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
+      fi
 
       sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
@@ -439,12 +468,15 @@ int main (int argc, char *argv[])
         CFLAGS="$ac_save_CFLAGS"
         CXXFLAGS="$ac_save_CXXFLAGS"
         LIBS="$ac_save_LIBS"
+
+      fi
+      if test "x$sdl_pc" = "xno"; then
+        if test "x$no_sdl" = "xyes"; then
+          AC_MSG_RESULT(no)
+        else
+          AC_MSG_RESULT(yes)
+        fi
       fi
-    fi
-    if test "x$no_sdl" = x ; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
     fi
   fi
   if test "x$no_sdl" = x ; then
diff --git a/configure b/configure
index 29941e4..b5acc65 100755
--- a/configure
+++ b/configure
@@ -607,9 +607,12 @@ SDL_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+SDL2_FRAMEWORK
 allegro_LIBS
 allegro_CFLAGS
 ALLEGRO_CONFIG
+USE_ALSA_FALSE
+USE_ALSA_TRUE
 USE_NETWORKING_FALSE
 USE_NETWORKING_TRUE
 USE_WX_FALSE
@@ -727,12 +730,14 @@ enable_dependency_tracking
 enable_debug
 enable_wx
 enable_networking
+enable_alsa
 with_allegro_prefix
 with_allegro_exec_prefix
 enable_allegrotest
 with_sdl_prefix
 with_sdl_exec_prefix
 enable_sdltest
+enable_sdlframework
 with_wxdir
 with_wx_config
 with_wx_prefix
@@ -749,6 +754,7 @@ CPPFLAGS
 CXX
 CXXFLAGS
 CCC
+SDL2_FRAMEWORK
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -1392,8 +1398,10 @@ Optional Features:
   --enable-debug          build debug executable
   --enable-wx             use wxWidgets GUI
   --enable-networking     enable networking
+  --enable-alsa           use ALSA for MIDI
   --disable-allegrotest       Do not try to compile and run a test LIBallegro program
   --disable-sdltest       Do not try to compile and run a test SDL program
+  --disable-sdlframework Do not search for SDL2.framework
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1418,6 +1426,8 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  SDL2_FRAMEWORK
+              Path to SDL2.framework
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -4177,6 +4187,21 @@ else
 $as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ALSA for MIDI output" >&5
+$as_echo_n "checking whether to use ALSA for MIDI output... " >&6; }
+# Check whether --enable-alsa was given.
+if test "${enable_alsa+set}" = set; then :
+  enableval=$enable_alsa;
+fi
+
+if test "$enable_alsa" = "yes"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu" >&5
 $as_echo_n "checking for cpu... " >&6; }
 case "${host_cpu}" in
@@ -4248,6 +4273,14 @@ else
   USE_NETWORKING_FALSE=
 fi
 
+ if test "$enable_alsa" = "yes"; then
+  USE_ALSA_TRUE=
+  USE_ALSA_FALSE='#'
+else
+  USE_ALSA_TRUE='#'
+  USE_ALSA_FALSE=
+fi
+
 
 if test "$enable_wx" != "yes"; then
    # Do not run test for Allegro with Win32/MinGW version, as binary builds have
@@ -4666,6 +4699,15 @@ else
   enable_sdltest=yes
 fi
 
+# Check whether --enable-sdlframework was given.
+if test "${enable_sdlframework+set}" = set; then :
+  enableval=$enable_sdlframework;
+else
+  search_sdl_framework=yes
+fi
+
+
+
 
   min_sdl_version=$SDL_VERSION
 
@@ -4807,15 +4849,39 @@ fi
 
 
     PATH="$as_save_PATH"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
-$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
     no_sdl=""
 
-    if test "$SDL2_CONFIG" = "no" ; then
-      no_sdl=yes
-    else
-      SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
-      SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
+    if test "$SDL2_CONFIG" = "no" -a "x$search_sdl_framework" = "xyes"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL2.framework" >&5
+$as_echo_n "checking for SDL2.framework... " >&6; }
+      if test "x$SDL2_FRAMEWORK" != x; then
+        sdl_framework=$SDL2_FRAMEWORK
+      else
+        for d in / ~/ /System/; do
+          if test -d "$dLibrary/Frameworks/SDL2.framework"; then
+            sdl_framework="$dLibrary/Frameworks/SDL2.framework"
+          fi
+        done
+      fi
+
+      if test -d $sdl_framework; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sdl_framework" >&5
+$as_echo "$sdl_framework" >&6; }
+        sdl_framework_dir=`dirname $sdl_framework`
+        SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include"
+        SDL_LIBS="-F$sdl_framework_dir -Wl,-framework,SDL2"
+      else
+        no_sdl=yes
+      fi
+    fi
+
+    if test "$SDL2_CONFIG" != "no"; then
+      if test "x$sdl_pc" = "xno"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
+$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
+        SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
+        SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
+      fi
 
       sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
              sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -4907,14 +4973,17 @@ fi
         CFLAGS="$ac_save_CFLAGS"
         CXXFLAGS="$ac_save_CXXFLAGS"
         LIBS="$ac_save_LIBS"
+
       fi
-    fi
-    if test "x$no_sdl" = x ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      if test "x$sdl_pc" = "xno"; then
+        if test "x$no_sdl" = "xyes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        fi
+      fi
     fi
   fi
   if test "x$no_sdl" = x ; then
@@ -5394,6 +5463,57 @@ else
 fi
 
 
+if test "$enable_alsa" == "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
+if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lasound  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char snd_pcm_open ();
+int
+main ()
+{
+return snd_pcm_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_asound_snd_pcm_open=yes
+else
+  ac_cv_lib_asound_snd_pcm_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBASOUND 1
+_ACEOF
+
+  LIBS="-lasound $LIBS"
+
+else
+  echo "You need to install the ALSA library."
+	 exit -1
+fi
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if ${ac_cv_lib_pthread_pthread_create+:} false; then :
@@ -5639,6 +5759,10 @@ if test -z "${USE_NETWORKING_TRUE}" && test -z "${USE_NETWORKING_FALSE}"; then
   as_fn_error $? "conditional \"USE_NETWORKING\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_ALSA_TRUE}" && test -z "${USE_ALSA_FALSE}"; then
+  as_fn_error $? "conditional \"USE_ALSA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/configure.ac b/configure.ac
index 15e8fd9..93b22a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,15 @@ else
    AC_MSG_RESULT([no])
 fi
 
+AC_MSG_CHECKING([whether to use ALSA for MIDI output])
+AC_ARG_ENABLE(alsa,
+	      AC_HELP_STRING([--enable-alsa], [use ALSA for MIDI]))
+if test "$enable_alsa" = "yes"; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING([for cpu])
 case "${host_cpu}" in
 	i?86)
@@ -68,6 +77,7 @@ AM_CONDITIONAL(OS_LINUX, test "$OS" = "linux")
 
 AM_CONDITIONAL(USE_WX, test "$enable_wx" = "yes")
 AM_CONDITIONAL(USE_NETWORKING, test "$enable_networking" = "yes")
+AM_CONDITIONAL(USE_ALSA, test "$enable_alsa" = "yes")
 
 if test "$enable_wx" != "yes"; then
    # Do not run test for Allegro with Win32/MinGW version, as binary builds have
@@ -109,6 +119,13 @@ AC_CHECK_LIB([openal], [alGetError], [], \
 	[echo "You need to install the OpenAL library."
 	 exit -1])
 
+if test "$enable_alsa" == "yes"; then
+    AC_CHECK_LIB(asound, snd_pcm_open,
+        [],
+        [echo "You need to install the ALSA library."
+	 exit -1])
+fi
+
 AC_CHECK_LIB([pthread], [pthread_create])
 
 AC_OUTPUT([Makefile src/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index d8c4494..5857a44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,10 +42,16 @@ pcem_CFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
 pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config --cflags)
 pcem_LDADD = @LIBS@
 pcem_SOURCES += wx-main.cc wx-config_sel.c wx-dialogbox.cc wx-utils.cc wx-app.cc \
- wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c wx-sdl2-midi.c \
+ wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c \
  wx-sdl2.c wx-config.c wx-deviceconfig.cc wx-status.cc wx-sdl2-status.c \
  wx-resources.cpp wx-thread.c wx-common.c wx-sdl2-display.c wx-sdl2-video-renderer.c wx-sdl2-video-gl3.c \
  wx-glslp-parser.c wx-shader_man.c wx-shaderconfig.cc wx-joystickconfig.cc
+if USE_ALSA
+pcem_LDADD += -lasound
+pcem_SOURCES += midi_alsa.c
+else
+pcem_SOURCES += wx-sdl2-midi.c
+endif
 else
 pcem_CFLAGS = $(allegro_CFLAGS) -DPCEM_ALLEGRO
 pcem_CXXFLAGS = 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1cf4fdb..89d0d0a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -93,23 +93,26 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = pcem$(EXEEXT)
 @USE_WX_TRUE@am__append_1 = wx-main.cc wx-config_sel.c wx-dialogbox.cc wx-utils.cc wx-app.cc \
-@USE_WX_TRUE@ wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c wx-sdl2-midi.c \
+@USE_WX_TRUE@ wx-sdl2-joystick.c wx-sdl2-mouse.c wx-sdl2-keyboard.c wx-sdl2-video.c \
 @USE_WX_TRUE@ wx-sdl2.c wx-config.c wx-deviceconfig.cc wx-status.cc wx-sdl2-status.c \
 @USE_WX_TRUE@ wx-resources.cpp wx-thread.c wx-common.c wx-sdl2-display.c wx-sdl2-video-renderer.c wx-sdl2-video-gl3.c \
-@USE_WX_TRUE@ wx-glslp-parser.c wx-shader_man.c wx-shaderconfig.cc
+@USE_WX_TRUE@ wx-glslp-parser.c wx-shader_man.c wx-shaderconfig.cc wx-joystickconfig.cc
 
-@USE_WX_FALSE@am__append_2 = allegro-gui.c allegro-gui-config-sel.c allegro-gui-configure.c \
+@USE_ALSA_TRUE@@USE_WX_TRUE@am__append_2 = -lasound
+@USE_ALSA_TRUE@@USE_WX_TRUE@am__append_3 = midi_alsa.c
+@USE_ALSA_FALSE@@USE_WX_TRUE@am__append_4 = wx-sdl2-midi.c
+@USE_WX_FALSE@am__append_5 = allegro-gui.c allegro-gui-config-sel.c allegro-gui-configure.c \
 @USE_WX_FALSE@ allegro-gui-deviceconfig.c allegro-gui-hdconf.c allegro-joystick.c \
 @USE_WX_FALSE@ allegro-keyboard.c allegro-main.c allegro-midi.c allegro-mouse.c allegro-video.c \
 @USE_WX_FALSE@ thread-pthread.c
 
-@CPU_I386_TRUE@am__append_3 = codegen_x86.c
-@CPU_I386_TRUE@am__append_4 = -msse2
-@CPU_X86_64_TRUE@am__append_5 = codegen_x86-64.c
-@USE_NETWORKING_TRUE@am__append_6 = -DUSE_NETWORKING
-@USE_NETWORKING_TRUE@am__append_7 = -DUSE_NETWORKING
-@USE_NETWORKING_TRUE@am__append_8 = ne2000.c nethandler.c wx-hostconfig.c
-@USE_NETWORKING_TRUE@am__append_9 = slirp/libslirp.a
+@CPU_I386_TRUE@am__append_6 = codegen_x86.c
+@CPU_I386_TRUE@am__append_7 = -msse2
+@CPU_X86_64_TRUE@am__append_8 = codegen_x86-64.c
+@USE_NETWORKING_TRUE@am__append_9 = -DUSE_NETWORKING
+@USE_NETWORKING_TRUE@am__append_10 = -DUSE_NETWORKING
+@USE_NETWORKING_TRUE@am__append_11 = ne2000.c nethandler.c wx-hostconfig.c
+@USE_NETWORKING_TRUE@am__append_12 = slirp/libslirp.a
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/allegro.m4 \
@@ -123,24 +126,25 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
-	acer386sx.c ali1429.c amstrad.c cdrom-ioctl-linux.c \
+	acer386sx.c ali1429.c amstrad.c cbm_io.c cdrom-ioctl-linux.c \
 	cdrom-image.cc cdrom-null.c codegen.c codegen_ops.c \
 	codegen_timing_486.c codegen_timing_686.c \
 	codegen_timing_common.c codegen_timing_pentium.c \
-	codegen_timing_winchip.c compaq.c config.c cpu.c dac.c \
-	dells200.c device.c disc.c disc_fdi.c disc_img.c disc_sector.c \
-	dma.c esdi_at.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c \
-	hdd.c hdd_esdi.c hdd_file.c headland.c i430lx.c i430fx.c \
-	i430vx.c ide.c intel.c intel_flash.c io.c jim.c \
+	codegen_timing_winchip.c compaq.c config.c cpu.c dells200.c \
+	device.c disc.c disc_fdi.c disc_img.c disc_sector.c dma.c \
+	esdi_at.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c hdd.c \
+	hdd_esdi.c hdd_file.c headland.c i430lx.c i430fx.c i430vx.c \
+	ide.c intel.c intel_flash.c io.c jim.c \
 	joystick_ch_flightstick_pro.c joystick_standard.c \
 	joystick_sw_pad.c joystick_tm_fcs.c keyboard.c \
 	keyboard_amstrad.c keyboard_at.c keyboard_olim24.c \
-	keyboard_pcjr.c keyboard_xt.c laserxt.c lpt.c mca.c mcr.c \
-	mem.c mfm_at.c mfm_xebec.c model.c mouse.c mouse_msystems.c \
-	mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c olivetti_m24.c \
-	opti495.c paths.c pc.c pci.c pic.c piix.c pit.c ppi.c ps1.c \
-	ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c scat.c serial.c sio.c \
-	sis496.c sound.c sound_ad1848.c sound_adlib.c \
+	keyboard_pcjr.c keyboard_xt.c laserxt.c lpt.c lpt_dac.c \
+	lpt_dss.c mca.c mcr.c mem.c mfm_at.c mfm_xebec.c model.c \
+	mouse.c mouse_msystems.c mouse_ps2.c mouse_serial.c neat.c \
+	nmi.c nvr.c olivetti_m24.c opti495.c paths.c pc.c pci.c pic.c \
+	piix.c pit.c ppi.c ps1.c ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c \
+	scat.c scsi.c scsi_53c400.c scsi_aha1540.c scsi_cd.c scsi_hd.c \
+	serial.c sio.c sis496.c sound.c sound_ad1848.c sound_adlib.c \
 	sound_adlibgold.c sound_cms.c sound_emu8k.c sound_gus.c \
 	sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c \
 	sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
@@ -168,11 +172,12 @@ am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
 	resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \
 	resid-fp/wave.cc wx-main.cc wx-config_sel.c wx-dialogbox.cc \
 	wx-utils.cc wx-app.cc wx-sdl2-joystick.c wx-sdl2-mouse.c \
-	wx-sdl2-keyboard.c wx-sdl2-video.c wx-sdl2-midi.c wx-sdl2.c \
-	wx-config.c wx-deviceconfig.cc wx-status.cc wx-sdl2-status.c \
+	wx-sdl2-keyboard.c wx-sdl2-video.c wx-sdl2.c wx-config.c \
+	wx-deviceconfig.cc wx-status.cc wx-sdl2-status.c \
 	wx-resources.cpp wx-thread.c wx-common.c wx-sdl2-display.c \
 	wx-sdl2-video-renderer.c wx-sdl2-video-gl3.c wx-glslp-parser.c \
-	wx-shader_man.c wx-shaderconfig.cc allegro-gui.c \
+	wx-shader_man.c wx-shaderconfig.cc wx-joystickconfig.cc \
+	midi_alsa.c wx-sdl2-midi.c allegro-gui.c \
 	allegro-gui-config-sel.c allegro-gui-configure.c \
 	allegro-gui-deviceconfig.c allegro-gui-hdconf.c \
 	allegro-joystick.c allegro-keyboard.c allegro-main.c \
@@ -187,7 +192,6 @@ am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
 @USE_WX_TRUE@	pcem-wx-sdl2-mouse.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-sdl2-keyboard.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-sdl2-video.$(OBJEXT) \
-@USE_WX_TRUE@	pcem-wx-sdl2-midi.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-sdl2.$(OBJEXT) pcem-wx-config.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-deviceconfig.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-status.$(OBJEXT) \
@@ -199,8 +203,12 @@ am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
 @USE_WX_TRUE@	pcem-wx-sdl2-video-gl3.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-glslp-parser.$(OBJEXT) \
 @USE_WX_TRUE@	pcem-wx-shader_man.$(OBJEXT) \
-@USE_WX_TRUE@	pcem-wx-shaderconfig.$(OBJEXT)
-@USE_WX_FALSE@am__objects_2 = pcem-allegro-gui.$(OBJEXT) \
+@USE_WX_TRUE@	pcem-wx-shaderconfig.$(OBJEXT) \
+@USE_WX_TRUE@	pcem-wx-joystickconfig.$(OBJEXT)
+@USE_ALSA_TRUE@@USE_WX_TRUE@am__objects_2 = pcem-midi_alsa.$(OBJEXT)
+@USE_ALSA_FALSE@@USE_WX_TRUE@am__objects_3 =  \
+@USE_ALSA_FALSE@@USE_WX_TRUE@	pcem-wx-sdl2-midi.$(OBJEXT)
+@USE_WX_FALSE@am__objects_4 = pcem-allegro-gui.$(OBJEXT) \
 @USE_WX_FALSE@	pcem-allegro-gui-config-sel.$(OBJEXT) \
 @USE_WX_FALSE@	pcem-allegro-gui-configure.$(OBJEXT) \
 @USE_WX_FALSE@	pcem-allegro-gui-deviceconfig.$(OBJEXT) \
@@ -212,23 +220,23 @@ am__pcem_SOURCES_DIST = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
 @USE_WX_FALSE@	pcem-allegro-mouse.$(OBJEXT) \
 @USE_WX_FALSE@	pcem-allegro-video.$(OBJEXT) \
 @USE_WX_FALSE@	pcem-thread-pthread.$(OBJEXT)
-@CPU_I386_TRUE@am__objects_3 = pcem-codegen_x86.$(OBJEXT)
-@CPU_X86_64_TRUE@am__objects_4 = pcem-codegen_x86-64.$(OBJEXT)
-@USE_NETWORKING_TRUE@am__objects_5 = pcem-ne2000.$(OBJEXT) \
+@CPU_I386_TRUE@am__objects_5 = pcem-codegen_x86.$(OBJEXT)
+@CPU_X86_64_TRUE@am__objects_6 = pcem-codegen_x86-64.$(OBJEXT)
+@USE_NETWORKING_TRUE@am__objects_7 = pcem-ne2000.$(OBJEXT) \
 @USE_NETWORKING_TRUE@	pcem-nethandler.$(OBJEXT) \
 @USE_NETWORKING_TRUE@	pcem-wx-hostconfig.$(OBJEXT)
 am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-386_dynarec.$(OBJEXT) \
 	pcem-386_dynarec_ops.$(OBJEXT) pcem-808x.$(OBJEXT) \
 	pcem-acer386sx.$(OBJEXT) pcem-ali1429.$(OBJEXT) \
-	pcem-amstrad.$(OBJEXT) pcem-cdrom-ioctl-linux.$(OBJEXT) \
-	pcem-cdrom-image.$(OBJEXT) pcem-cdrom-null.$(OBJEXT) \
-	pcem-codegen.$(OBJEXT) pcem-codegen_ops.$(OBJEXT) \
-	pcem-codegen_timing_486.$(OBJEXT) \
+	pcem-amstrad.$(OBJEXT) pcem-cbm_io.$(OBJEXT) \
+	pcem-cdrom-ioctl-linux.$(OBJEXT) pcem-cdrom-image.$(OBJEXT) \
+	pcem-cdrom-null.$(OBJEXT) pcem-codegen.$(OBJEXT) \
+	pcem-codegen_ops.$(OBJEXT) pcem-codegen_timing_486.$(OBJEXT) \
 	pcem-codegen_timing_686.$(OBJEXT) \
 	pcem-codegen_timing_common.$(OBJEXT) \
 	pcem-codegen_timing_pentium.$(OBJEXT) \
 	pcem-codegen_timing_winchip.$(OBJEXT) pcem-compaq.$(OBJEXT) \
-	pcem-config.$(OBJEXT) pcem-cpu.$(OBJEXT) pcem-dac.$(OBJEXT) \
+	pcem-config.$(OBJEXT) pcem-cpu.$(OBJEXT) \
 	pcem-dells200.$(OBJEXT) pcem-device.$(OBJEXT) \
 	pcem-disc.$(OBJEXT) pcem-disc_fdi.$(OBJEXT) \
 	pcem-disc_img.$(OBJEXT) pcem-disc_sector.$(OBJEXT) \
@@ -246,54 +254,58 @@ am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-386_dynarec.$(OBJEXT) \
 	pcem-keyboard.$(OBJEXT) pcem-keyboard_amstrad.$(OBJEXT) \
 	pcem-keyboard_at.$(OBJEXT) pcem-keyboard_olim24.$(OBJEXT) \
 	pcem-keyboard_pcjr.$(OBJEXT) pcem-keyboard_xt.$(OBJEXT) \
-	pcem-laserxt.$(OBJEXT) pcem-lpt.$(OBJEXT) pcem-mca.$(OBJEXT) \
-	pcem-mcr.$(OBJEXT) pcem-mem.$(OBJEXT) pcem-mfm_at.$(OBJEXT) \
-	pcem-mfm_xebec.$(OBJEXT) pcem-model.$(OBJEXT) \
-	pcem-mouse.$(OBJEXT) pcem-mouse_msystems.$(OBJEXT) \
-	pcem-mouse_ps2.$(OBJEXT) pcem-mouse_serial.$(OBJEXT) \
-	pcem-neat.$(OBJEXT) pcem-nmi.$(OBJEXT) pcem-nvr.$(OBJEXT) \
+	pcem-laserxt.$(OBJEXT) pcem-lpt.$(OBJEXT) \
+	pcem-lpt_dac.$(OBJEXT) pcem-lpt_dss.$(OBJEXT) \
+	pcem-mca.$(OBJEXT) pcem-mcr.$(OBJEXT) pcem-mem.$(OBJEXT) \
+	pcem-mfm_at.$(OBJEXT) pcem-mfm_xebec.$(OBJEXT) \
+	pcem-model.$(OBJEXT) pcem-mouse.$(OBJEXT) \
+	pcem-mouse_msystems.$(OBJEXT) pcem-mouse_ps2.$(OBJEXT) \
+	pcem-mouse_serial.$(OBJEXT) pcem-neat.$(OBJEXT) \
+	pcem-nmi.$(OBJEXT) pcem-nvr.$(OBJEXT) \
 	pcem-olivetti_m24.$(OBJEXT) pcem-opti495.$(OBJEXT) \
 	pcem-paths.$(OBJEXT) pcem-pc.$(OBJEXT) pcem-pci.$(OBJEXT) \
 	pcem-pic.$(OBJEXT) pcem-piix.$(OBJEXT) pcem-pit.$(OBJEXT) \
 	pcem-ppi.$(OBJEXT) pcem-ps1.$(OBJEXT) pcem-ps2.$(OBJEXT) \
 	pcem-ps2_mca.$(OBJEXT) pcem-ps2_nvr.$(OBJEXT) \
 	pcem-rom.$(OBJEXT) pcem-rtc.$(OBJEXT) pcem-scat.$(OBJEXT) \
-	pcem-serial.$(OBJEXT) pcem-sio.$(OBJEXT) pcem-sis496.$(OBJEXT) \
-	pcem-sound.$(OBJEXT) pcem-sound_ad1848.$(OBJEXT) \
-	pcem-sound_adlib.$(OBJEXT) pcem-sound_adlibgold.$(OBJEXT) \
-	pcem-sound_cms.$(OBJEXT) pcem-sound_emu8k.$(OBJEXT) \
-	pcem-sound_gus.$(OBJEXT) pcem-sound_mpu401_uart.$(OBJEXT) \
-	pcem-sound_opl.$(OBJEXT) pcem-sound_pas16.$(OBJEXT) \
-	pcem-sound_ps1.$(OBJEXT) pcem-sound_pssj.$(OBJEXT) \
-	pcem-sound_sb.$(OBJEXT) pcem-sound_sb_dsp.$(OBJEXT) \
-	pcem-sound_sn76489.$(OBJEXT) pcem-sound_speaker.$(OBJEXT) \
-	pcem-sound_ssi2001.$(OBJEXT) pcem-sound_wss.$(OBJEXT) \
-	pcem-sound_ym7128.$(OBJEXT) pcem-soundopenal.$(OBJEXT) \
-	pcem-tandy_eeprom.$(OBJEXT) pcem-tandy_rom.$(OBJEXT) \
-	pcem-timer.$(OBJEXT) pcem-um8669f.$(OBJEXT) \
-	pcem-um8881f.$(OBJEXT) pcem-vid_ati_eeprom.$(OBJEXT) \
-	pcem-vid_ati_mach64.$(OBJEXT) pcem-vid_ati18800.$(OBJEXT) \
-	pcem-vid_ati28800.$(OBJEXT) pcem-vid_ati68860_ramdac.$(OBJEXT) \
-	pcem-vid_cga.$(OBJEXT) pcem-vid_cl5429.$(OBJEXT) \
-	pcem-vid_colorplus.$(OBJEXT) pcem-vid_ega.$(OBJEXT) \
-	pcem-vid_et4000.$(OBJEXT) pcem-vid_et4000w32.$(OBJEXT) \
-	pcem-vid_genius.$(OBJEXT) pcem-vid_hercules.$(OBJEXT) \
-	pcem-vid_icd2061.$(OBJEXT) pcem-vid_ics2595.$(OBJEXT) \
-	pcem-vid_incolor.$(OBJEXT) pcem-vid_mda.$(OBJEXT) \
-	pcem-vid_olivetti_m24.$(OBJEXT) pcem-vid_oti067.$(OBJEXT) \
-	pcem-vid_paradise.$(OBJEXT) pcem-vid_pc200.$(OBJEXT) \
-	pcem-vid_pc1512.$(OBJEXT) pcem-vid_pc1640.$(OBJEXT) \
-	pcem-vid_pcjr.$(OBJEXT) pcem-vid_ps1_svga.$(OBJEXT) \
-	pcem-vid_s3.$(OBJEXT) pcem-vid_s3_virge.$(OBJEXT) \
-	pcem-vid_sdac_ramdac.$(OBJEXT) pcem-vid_stg_ramdac.$(OBJEXT) \
-	pcem-vid_svga.$(OBJEXT) pcem-vid_svga_render.$(OBJEXT) \
-	pcem-vid_tandy.$(OBJEXT) pcem-vid_tandysl.$(OBJEXT) \
-	pcem-vid_tgui9440.$(OBJEXT) pcem-vid_tkd8001_ramdac.$(OBJEXT) \
-	pcem-vid_tvga.$(OBJEXT) pcem-vid_unk_ramdac.$(OBJEXT) \
-	pcem-vid_vga.$(OBJEXT) pcem-vid_voodoo.$(OBJEXT) \
-	pcem-video.$(OBJEXT) pcem-wd76c10.$(OBJEXT) \
-	pcem-vid_wy700.$(OBJEXT) pcem-x86seg.$(OBJEXT) \
-	pcem-x87.$(OBJEXT) pcem-xtide.$(OBJEXT) \
+	pcem-scsi.$(OBJEXT) pcem-scsi_53c400.$(OBJEXT) \
+	pcem-scsi_aha1540.$(OBJEXT) pcem-scsi_cd.$(OBJEXT) \
+	pcem-scsi_hd.$(OBJEXT) pcem-serial.$(OBJEXT) \
+	pcem-sio.$(OBJEXT) pcem-sis496.$(OBJEXT) pcem-sound.$(OBJEXT) \
+	pcem-sound_ad1848.$(OBJEXT) pcem-sound_adlib.$(OBJEXT) \
+	pcem-sound_adlibgold.$(OBJEXT) pcem-sound_cms.$(OBJEXT) \
+	pcem-sound_emu8k.$(OBJEXT) pcem-sound_gus.$(OBJEXT) \
+	pcem-sound_mpu401_uart.$(OBJEXT) pcem-sound_opl.$(OBJEXT) \
+	pcem-sound_pas16.$(OBJEXT) pcem-sound_ps1.$(OBJEXT) \
+	pcem-sound_pssj.$(OBJEXT) pcem-sound_sb.$(OBJEXT) \
+	pcem-sound_sb_dsp.$(OBJEXT) pcem-sound_sn76489.$(OBJEXT) \
+	pcem-sound_speaker.$(OBJEXT) pcem-sound_ssi2001.$(OBJEXT) \
+	pcem-sound_wss.$(OBJEXT) pcem-sound_ym7128.$(OBJEXT) \
+	pcem-soundopenal.$(OBJEXT) pcem-tandy_eeprom.$(OBJEXT) \
+	pcem-tandy_rom.$(OBJEXT) pcem-timer.$(OBJEXT) \
+	pcem-um8669f.$(OBJEXT) pcem-um8881f.$(OBJEXT) \
+	pcem-vid_ati_eeprom.$(OBJEXT) pcem-vid_ati_mach64.$(OBJEXT) \
+	pcem-vid_ati18800.$(OBJEXT) pcem-vid_ati28800.$(OBJEXT) \
+	pcem-vid_ati68860_ramdac.$(OBJEXT) pcem-vid_cga.$(OBJEXT) \
+	pcem-vid_cl5429.$(OBJEXT) pcem-vid_colorplus.$(OBJEXT) \
+	pcem-vid_ega.$(OBJEXT) pcem-vid_et4000.$(OBJEXT) \
+	pcem-vid_et4000w32.$(OBJEXT) pcem-vid_genius.$(OBJEXT) \
+	pcem-vid_hercules.$(OBJEXT) pcem-vid_icd2061.$(OBJEXT) \
+	pcem-vid_ics2595.$(OBJEXT) pcem-vid_incolor.$(OBJEXT) \
+	pcem-vid_mda.$(OBJEXT) pcem-vid_olivetti_m24.$(OBJEXT) \
+	pcem-vid_oti067.$(OBJEXT) pcem-vid_paradise.$(OBJEXT) \
+	pcem-vid_pc200.$(OBJEXT) pcem-vid_pc1512.$(OBJEXT) \
+	pcem-vid_pc1640.$(OBJEXT) pcem-vid_pcjr.$(OBJEXT) \
+	pcem-vid_ps1_svga.$(OBJEXT) pcem-vid_s3.$(OBJEXT) \
+	pcem-vid_s3_virge.$(OBJEXT) pcem-vid_sdac_ramdac.$(OBJEXT) \
+	pcem-vid_stg_ramdac.$(OBJEXT) pcem-vid_svga.$(OBJEXT) \
+	pcem-vid_svga_render.$(OBJEXT) pcem-vid_tandy.$(OBJEXT) \
+	pcem-vid_tandysl.$(OBJEXT) pcem-vid_tgui9440.$(OBJEXT) \
+	pcem-vid_tkd8001_ramdac.$(OBJEXT) pcem-vid_tvga.$(OBJEXT) \
+	pcem-vid_unk_ramdac.$(OBJEXT) pcem-vid_vga.$(OBJEXT) \
+	pcem-vid_voodoo.$(OBJEXT) pcem-video.$(OBJEXT) \
+	pcem-wd76c10.$(OBJEXT) pcem-vid_wy700.$(OBJEXT) \
+	pcem-x86seg.$(OBJEXT) pcem-x87.$(OBJEXT) pcem-xtide.$(OBJEXT) \
 	pcem-sound_dbopl.$(OBJEXT) pcem-sound_resid.$(OBJEXT) \
 	pcem-cdrom_image.$(OBJEXT) pcem-dbopl.$(OBJEXT) \
 	pcem-nukedopl.$(OBJEXT) pcem-vid_cga_comp.$(OBJEXT) \
@@ -306,12 +318,14 @@ am_pcem_OBJECTS = pcem-386.$(OBJEXT) pcem-386_dynarec.$(OBJEXT) \
 	pcem-wave8580_PST.$(OBJEXT) pcem-wave8580_P_T.$(OBJEXT) \
 	pcem-wave8580__ST.$(OBJEXT) pcem-wave.$(OBJEXT) \
 	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5)
+	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
+	$(am__objects_7)
 pcem_OBJECTS = $(am_pcem_OBJECTS)
 am__DEPENDENCIES_1 =
 @USE_WX_FALSE@pcem_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@USE_WX_FALSE@	$(am__append_9)
-@USE_WX_TRUE@pcem_DEPENDENCIES = $(am__append_9)
+@USE_WX_FALSE@	$(am__append_12)
+@USE_WX_TRUE@pcem_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@USE_WX_TRUE@	$(am__append_12)
 pcem_LINK = $(CXXLD) $(pcem_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SCRIPTS = $(noinst_SCRIPTS)
@@ -434,6 +448,7 @@ PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SDL2_CONFIG = @SDL2_CONFIG@
+SDL2_FRAMEWORK = @SDL2_FRAMEWORK@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_LIBS = @SDL_LIBS@
 SET_MAKE = @SET_MAKE@
@@ -510,24 +525,25 @@ top_srcdir = @top_srcdir@
 noinst_SCRIPTS = ../pcem
 CLEANFILES = $(noinst_SCRIPTS)
 pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
-	acer386sx.c ali1429.c amstrad.c cdrom-ioctl-linux.c \
+	acer386sx.c ali1429.c amstrad.c cbm_io.c cdrom-ioctl-linux.c \
 	cdrom-image.cc cdrom-null.c codegen.c codegen_ops.c \
 	codegen_timing_486.c codegen_timing_686.c \
 	codegen_timing_common.c codegen_timing_pentium.c \
-	codegen_timing_winchip.c compaq.c config.c cpu.c dac.c \
-	dells200.c device.c disc.c disc_fdi.c disc_img.c disc_sector.c \
-	dma.c esdi_at.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c \
-	hdd.c hdd_esdi.c hdd_file.c headland.c i430lx.c i430fx.c \
-	i430vx.c ide.c intel.c intel_flash.c io.c jim.c \
+	codegen_timing_winchip.c compaq.c config.c cpu.c dells200.c \
+	device.c disc.c disc_fdi.c disc_img.c disc_sector.c dma.c \
+	esdi_at.c fdc.c fdc37c665.c fdd.c fdi2raw.c gameport.c hdd.c \
+	hdd_esdi.c hdd_file.c headland.c i430lx.c i430fx.c i430vx.c \
+	ide.c intel.c intel_flash.c io.c jim.c \
 	joystick_ch_flightstick_pro.c joystick_standard.c \
 	joystick_sw_pad.c joystick_tm_fcs.c keyboard.c \
 	keyboard_amstrad.c keyboard_at.c keyboard_olim24.c \
-	keyboard_pcjr.c keyboard_xt.c laserxt.c lpt.c mca.c mcr.c \
-	mem.c mfm_at.c mfm_xebec.c model.c mouse.c mouse_msystems.c \
-	mouse_ps2.c mouse_serial.c neat.c nmi.c nvr.c olivetti_m24.c \
-	opti495.c paths.c pc.c pci.c pic.c piix.c pit.c ppi.c ps1.c \
-	ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c scat.c serial.c sio.c \
-	sis496.c sound.c sound_ad1848.c sound_adlib.c \
+	keyboard_pcjr.c keyboard_xt.c laserxt.c lpt.c lpt_dac.c \
+	lpt_dss.c mca.c mcr.c mem.c mfm_at.c mfm_xebec.c model.c \
+	mouse.c mouse_msystems.c mouse_ps2.c mouse_serial.c neat.c \
+	nmi.c nvr.c olivetti_m24.c opti495.c paths.c pc.c pci.c pic.c \
+	piix.c pit.c ppi.c ps1.c ps2.c ps2_mca.c ps2_nvr.c rom.c rtc.c \
+	scat.c scsi.c scsi_53c400.c scsi_aha1540.c scsi_cd.c scsi_hd.c \
+	serial.c sio.c sis496.c sound.c sound_ad1848.c sound_adlib.c \
 	sound_adlibgold.c sound_cms.c sound_emu8k.c sound_gus.c \
 	sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c \
 	sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
@@ -553,18 +569,19 @@ pcem_SOURCES = 386.c 386_dynarec.c 386_dynarec_ops.c 808x.c \
 	resid-fp/wave6581_P_T.cc resid-fp/wave6581__ST.cc \
 	resid-fp/wave8580_PS_.cc resid-fp/wave8580_PST.cc \
 	resid-fp/wave8580_P_T.cc resid-fp/wave8580__ST.cc \
-	resid-fp/wave.cc $(am__append_1) $(am__append_2) \
-	$(am__append_3) $(am__append_5) $(am__append_8)
+	resid-fp/wave.cc $(am__append_1) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_8) $(am__append_11)
 @USE_WX_FALSE@pcem_CFLAGS = $(allegro_CFLAGS) -DPCEM_ALLEGRO \
-@USE_WX_FALSE@	$(am__append_4) $(am__append_6)
+@USE_WX_FALSE@	$(am__append_7) $(am__append_9)
 @USE_WX_TRUE@pcem_CFLAGS = $(shell wx-config --cxxflags) $(shell \
-@USE_WX_TRUE@	sdl2-config --cflags) $(am__append_4) \
-@USE_WX_TRUE@	$(am__append_6)
-@USE_WX_FALSE@pcem_CXXFLAGS = $(am__append_7)
+@USE_WX_TRUE@	sdl2-config --cflags) $(am__append_7) \
+@USE_WX_TRUE@	$(am__append_9)
+@USE_WX_FALSE@pcem_CXXFLAGS = $(am__append_10)
 @USE_WX_TRUE@pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell \
-@USE_WX_TRUE@	sdl2-config --cflags) $(am__append_7)
-@USE_WX_FALSE@pcem_LDADD = $(allegro_LIBS) -lopenal $(am__append_9)
-@USE_WX_TRUE@pcem_LDADD = @LIBS@ $(am__append_9)
+@USE_WX_TRUE@	sdl2-config --cflags) $(am__append_10)
+@USE_WX_FALSE@pcem_LDADD = $(allegro_LIBS) -lopenal $(am__append_12)
+@USE_WX_TRUE@pcem_LDADD = @LIBS@ $(am__append_2) $(am__append_12)
 all: all-am
 
 .SUFFIXES:
@@ -669,6 +686,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-allegro-mouse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-allegro-video.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-amstrad.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-cbm_io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-cdrom-image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-cdrom-ioctl-linux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-cdrom-null.Po@am__quote@
@@ -687,7 +705,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-convolve-sse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-convolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-cpu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-dac.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-dbopl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-dells200.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-device.Po@am__quote@
@@ -729,11 +746,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-keyboard_xt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-laserxt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-lpt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-lpt_dac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-lpt_dss.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mca.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mcr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mfm_at.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mfm_xebec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-midi_alsa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mouse.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-mouse_msystems.Po@am__quote@
@@ -762,6 +782,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-rom.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-rtc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scsi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scsi_53c400.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scsi_aha1540.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scsi_cd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-scsi_hd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-serial.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-sid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-sio.Po@am__quote@
@@ -855,6 +880,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-dialogbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-glslp-parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-hostconfig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-joystickconfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-resources.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcem-wx-sdl2-display.Po@am__quote@
@@ -988,6 +1014,20 @@ pcem-amstrad.obj: amstrad.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-amstrad.obj `if test -f 'amstrad.c'; then $(CYGPATH_W) 'amstrad.c'; else $(CYGPATH_W) '$(srcdir)/amstrad.c'; fi`
 
+pcem-cbm_io.o: cbm_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-cbm_io.o -MD -MP -MF $(DEPDIR)/pcem-cbm_io.Tpo -c -o pcem-cbm_io.o `test -f 'cbm_io.c' || echo '$(srcdir)/'`cbm_io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-cbm_io.Tpo $(DEPDIR)/pcem-cbm_io.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cbm_io.c' object='pcem-cbm_io.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-cbm_io.o `test -f 'cbm_io.c' || echo '$(srcdir)/'`cbm_io.c
+
+pcem-cbm_io.obj: cbm_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-cbm_io.obj -MD -MP -MF $(DEPDIR)/pcem-cbm_io.Tpo -c -o pcem-cbm_io.obj `if test -f 'cbm_io.c'; then $(CYGPATH_W) 'cbm_io.c'; else $(CYGPATH_W) '$(srcdir)/cbm_io.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-cbm_io.Tpo $(DEPDIR)/pcem-cbm_io.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cbm_io.c' object='pcem-cbm_io.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-cbm_io.obj `if test -f 'cbm_io.c'; then $(CYGPATH_W) 'cbm_io.c'; else $(CYGPATH_W) '$(srcdir)/cbm_io.c'; fi`
+
 pcem-cdrom-ioctl-linux.o: cdrom-ioctl-linux.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-cdrom-ioctl-linux.o -MD -MP -MF $(DEPDIR)/pcem-cdrom-ioctl-linux.Tpo -c -o pcem-cdrom-ioctl-linux.o `test -f 'cdrom-ioctl-linux.c' || echo '$(srcdir)/'`cdrom-ioctl-linux.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-cdrom-ioctl-linux.Tpo $(DEPDIR)/pcem-cdrom-ioctl-linux.Po
@@ -1156,20 +1196,6 @@ pcem-cpu.obj: cpu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-cpu.obj `if test -f 'cpu.c'; then $(CYGPATH_W) 'cpu.c'; else $(CYGPATH_W) '$(srcdir)/cpu.c'; fi`
 
-pcem-dac.o: dac.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-dac.o -MD -MP -MF $(DEPDIR)/pcem-dac.Tpo -c -o pcem-dac.o `test -f 'dac.c' || echo '$(srcdir)/'`dac.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-dac.Tpo $(DEPDIR)/pcem-dac.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dac.c' object='pcem-dac.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-dac.o `test -f 'dac.c' || echo '$(srcdir)/'`dac.c
-
-pcem-dac.obj: dac.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-dac.obj -MD -MP -MF $(DEPDIR)/pcem-dac.Tpo -c -o pcem-dac.obj `if test -f 'dac.c'; then $(CYGPATH_W) 'dac.c'; else $(CYGPATH_W) '$(srcdir)/dac.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-dac.Tpo $(DEPDIR)/pcem-dac.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dac.c' object='pcem-dac.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-dac.obj `if test -f 'dac.c'; then $(CYGPATH_W) 'dac.c'; else $(CYGPATH_W) '$(srcdir)/dac.c'; fi`
-
 pcem-dells200.o: dells200.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-dells200.o -MD -MP -MF $(DEPDIR)/pcem-dells200.Tpo -c -o pcem-dells200.o `test -f 'dells200.c' || echo '$(srcdir)/'`dells200.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-dells200.Tpo $(DEPDIR)/pcem-dells200.Po
@@ -1688,6 +1714,34 @@ pcem-lpt.obj: lpt.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-lpt.obj `if test -f 'lpt.c'; then $(CYGPATH_W) 'lpt.c'; else $(CYGPATH_W) '$(srcdir)/lpt.c'; fi`
 
+pcem-lpt_dac.o: lpt_dac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-lpt_dac.o -MD -MP -MF $(DEPDIR)/pcem-lpt_dac.Tpo -c -o pcem-lpt_dac.o `test -f 'lpt_dac.c' || echo '$(srcdir)/'`lpt_dac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-lpt_dac.Tpo $(DEPDIR)/pcem-lpt_dac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lpt_dac.c' object='pcem-lpt_dac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-lpt_dac.o `test -f 'lpt_dac.c' || echo '$(srcdir)/'`lpt_dac.c
+
+pcem-lpt_dac.obj: lpt_dac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-lpt_dac.obj -MD -MP -MF $(DEPDIR)/pcem-lpt_dac.Tpo -c -o pcem-lpt_dac.obj `if test -f 'lpt_dac.c'; then $(CYGPATH_W) 'lpt_dac.c'; else $(CYGPATH_W) '$(srcdir)/lpt_dac.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-lpt_dac.Tpo $(DEPDIR)/pcem-lpt_dac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lpt_dac.c' object='pcem-lpt_dac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-lpt_dac.obj `if test -f 'lpt_dac.c'; then $(CYGPATH_W) 'lpt_dac.c'; else $(CYGPATH_W) '$(srcdir)/lpt_dac.c'; fi`
+
+pcem-lpt_dss.o: lpt_dss.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-lpt_dss.o -MD -MP -MF $(DEPDIR)/pcem-lpt_dss.Tpo -c -o pcem-lpt_dss.o `test -f 'lpt_dss.c' || echo '$(srcdir)/'`lpt_dss.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-lpt_dss.Tpo $(DEPDIR)/pcem-lpt_dss.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lpt_dss.c' object='pcem-lpt_dss.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-lpt_dss.o `test -f 'lpt_dss.c' || echo '$(srcdir)/'`lpt_dss.c
+
+pcem-lpt_dss.obj: lpt_dss.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-lpt_dss.obj -MD -MP -MF $(DEPDIR)/pcem-lpt_dss.Tpo -c -o pcem-lpt_dss.obj `if test -f 'lpt_dss.c'; then $(CYGPATH_W) 'lpt_dss.c'; else $(CYGPATH_W) '$(srcdir)/lpt_dss.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-lpt_dss.Tpo $(DEPDIR)/pcem-lpt_dss.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lpt_dss.c' object='pcem-lpt_dss.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-lpt_dss.obj `if test -f 'lpt_dss.c'; then $(CYGPATH_W) 'lpt_dss.c'; else $(CYGPATH_W) '$(srcdir)/lpt_dss.c'; fi`
+
 pcem-mca.o: mca.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-mca.o -MD -MP -MF $(DEPDIR)/pcem-mca.Tpo -c -o pcem-mca.o `test -f 'mca.c' || echo '$(srcdir)/'`mca.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-mca.Tpo $(DEPDIR)/pcem-mca.Po
@@ -2094,6 +2148,76 @@ pcem-scat.obj: scat.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scat.obj `if test -f 'scat.c'; then $(CYGPATH_W) 'scat.c'; else $(CYGPATH_W) '$(srcdir)/scat.c'; fi`
 
+pcem-scsi.o: scsi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi.o -MD -MP -MF $(DEPDIR)/pcem-scsi.Tpo -c -o pcem-scsi.o `test -f 'scsi.c' || echo '$(srcdir)/'`scsi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi.Tpo $(DEPDIR)/pcem-scsi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi.c' object='pcem-scsi.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi.o `test -f 'scsi.c' || echo '$(srcdir)/'`scsi.c
+
+pcem-scsi.obj: scsi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi.obj -MD -MP -MF $(DEPDIR)/pcem-scsi.Tpo -c -o pcem-scsi.obj `if test -f 'scsi.c'; then $(CYGPATH_W) 'scsi.c'; else $(CYGPATH_W) '$(srcdir)/scsi.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi.Tpo $(DEPDIR)/pcem-scsi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi.c' object='pcem-scsi.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi.obj `if test -f 'scsi.c'; then $(CYGPATH_W) 'scsi.c'; else $(CYGPATH_W) '$(srcdir)/scsi.c'; fi`
+
+pcem-scsi_53c400.o: scsi_53c400.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_53c400.o -MD -MP -MF $(DEPDIR)/pcem-scsi_53c400.Tpo -c -o pcem-scsi_53c400.o `test -f 'scsi_53c400.c' || echo '$(srcdir)/'`scsi_53c400.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_53c400.Tpo $(DEPDIR)/pcem-scsi_53c400.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_53c400.c' object='pcem-scsi_53c400.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_53c400.o `test -f 'scsi_53c400.c' || echo '$(srcdir)/'`scsi_53c400.c
+
+pcem-scsi_53c400.obj: scsi_53c400.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_53c400.obj -MD -MP -MF $(DEPDIR)/pcem-scsi_53c400.Tpo -c -o pcem-scsi_53c400.obj `if test -f 'scsi_53c400.c'; then $(CYGPATH_W) 'scsi_53c400.c'; else $(CYGPATH_W) '$(srcdir)/scsi_53c400.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_53c400.Tpo $(DEPDIR)/pcem-scsi_53c400.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_53c400.c' object='pcem-scsi_53c400.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_53c400.obj `if test -f 'scsi_53c400.c'; then $(CYGPATH_W) 'scsi_53c400.c'; else $(CYGPATH_W) '$(srcdir)/scsi_53c400.c'; fi`
+
+pcem-scsi_aha1540.o: scsi_aha1540.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_aha1540.o -MD -MP -MF $(DEPDIR)/pcem-scsi_aha1540.Tpo -c -o pcem-scsi_aha1540.o `test -f 'scsi_aha1540.c' || echo '$(srcdir)/'`scsi_aha1540.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_aha1540.Tpo $(DEPDIR)/pcem-scsi_aha1540.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_aha1540.c' object='pcem-scsi_aha1540.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_aha1540.o `test -f 'scsi_aha1540.c' || echo '$(srcdir)/'`scsi_aha1540.c
+
+pcem-scsi_aha1540.obj: scsi_aha1540.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_aha1540.obj -MD -MP -MF $(DEPDIR)/pcem-scsi_aha1540.Tpo -c -o pcem-scsi_aha1540.obj `if test -f 'scsi_aha1540.c'; then $(CYGPATH_W) 'scsi_aha1540.c'; else $(CYGPATH_W) '$(srcdir)/scsi_aha1540.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_aha1540.Tpo $(DEPDIR)/pcem-scsi_aha1540.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_aha1540.c' object='pcem-scsi_aha1540.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_aha1540.obj `if test -f 'scsi_aha1540.c'; then $(CYGPATH_W) 'scsi_aha1540.c'; else $(CYGPATH_W) '$(srcdir)/scsi_aha1540.c'; fi`
+
+pcem-scsi_cd.o: scsi_cd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_cd.o -MD -MP -MF $(DEPDIR)/pcem-scsi_cd.Tpo -c -o pcem-scsi_cd.o `test -f 'scsi_cd.c' || echo '$(srcdir)/'`scsi_cd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_cd.Tpo $(DEPDIR)/pcem-scsi_cd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_cd.c' object='pcem-scsi_cd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_cd.o `test -f 'scsi_cd.c' || echo '$(srcdir)/'`scsi_cd.c
+
+pcem-scsi_cd.obj: scsi_cd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_cd.obj -MD -MP -MF $(DEPDIR)/pcem-scsi_cd.Tpo -c -o pcem-scsi_cd.obj `if test -f 'scsi_cd.c'; then $(CYGPATH_W) 'scsi_cd.c'; else $(CYGPATH_W) '$(srcdir)/scsi_cd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_cd.Tpo $(DEPDIR)/pcem-scsi_cd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_cd.c' object='pcem-scsi_cd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_cd.obj `if test -f 'scsi_cd.c'; then $(CYGPATH_W) 'scsi_cd.c'; else $(CYGPATH_W) '$(srcdir)/scsi_cd.c'; fi`
+
+pcem-scsi_hd.o: scsi_hd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_hd.o -MD -MP -MF $(DEPDIR)/pcem-scsi_hd.Tpo -c -o pcem-scsi_hd.o `test -f 'scsi_hd.c' || echo '$(srcdir)/'`scsi_hd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_hd.Tpo $(DEPDIR)/pcem-scsi_hd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_hd.c' object='pcem-scsi_hd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_hd.o `test -f 'scsi_hd.c' || echo '$(srcdir)/'`scsi_hd.c
+
+pcem-scsi_hd.obj: scsi_hd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-scsi_hd.obj -MD -MP -MF $(DEPDIR)/pcem-scsi_hd.Tpo -c -o pcem-scsi_hd.obj `if test -f 'scsi_hd.c'; then $(CYGPATH_W) 'scsi_hd.c'; else $(CYGPATH_W) '$(srcdir)/scsi_hd.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-scsi_hd.Tpo $(DEPDIR)/pcem-scsi_hd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scsi_hd.c' object='pcem-scsi_hd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-scsi_hd.obj `if test -f 'scsi_hd.c'; then $(CYGPATH_W) 'scsi_hd.c'; else $(CYGPATH_W) '$(srcdir)/scsi_hd.c'; fi`
+
 pcem-serial.o: serial.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-serial.o -MD -MP -MF $(DEPDIR)/pcem-serial.Tpo -c -o pcem-serial.o `test -f 'serial.c' || echo '$(srcdir)/'`serial.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-serial.Tpo $(DEPDIR)/pcem-serial.Po
@@ -3200,20 +3324,6 @@ pcem-wx-sdl2-video.obj: wx-sdl2-video.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-sdl2-video.obj `if test -f 'wx-sdl2-video.c'; then $(CYGPATH_W) 'wx-sdl2-video.c'; else $(CYGPATH_W) '$(srcdir)/wx-sdl2-video.c'; fi`
 
-pcem-wx-sdl2-midi.o: wx-sdl2-midi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-wx-sdl2-midi.o -MD -MP -MF $(DEPDIR)/pcem-wx-sdl2-midi.Tpo -c -o pcem-wx-sdl2-midi.o `test -f 'wx-sdl2-midi.c' || echo '$(srcdir)/'`wx-sdl2-midi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-sdl2-midi.Tpo $(DEPDIR)/pcem-wx-sdl2-midi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wx-sdl2-midi.c' object='pcem-wx-sdl2-midi.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-sdl2-midi.o `test -f 'wx-sdl2-midi.c' || echo '$(srcdir)/'`wx-sdl2-midi.c
-
-pcem-wx-sdl2-midi.obj: wx-sdl2-midi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-wx-sdl2-midi.obj -MD -MP -MF $(DEPDIR)/pcem-wx-sdl2-midi.Tpo -c -o pcem-wx-sdl2-midi.obj `if test -f 'wx-sdl2-midi.c'; then $(CYGPATH_W) 'wx-sdl2-midi.c'; else $(CYGPATH_W) '$(srcdir)/wx-sdl2-midi.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-sdl2-midi.Tpo $(DEPDIR)/pcem-wx-sdl2-midi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wx-sdl2-midi.c' object='pcem-wx-sdl2-midi.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-sdl2-midi.obj `if test -f 'wx-sdl2-midi.c'; then $(CYGPATH_W) 'wx-sdl2-midi.c'; else $(CYGPATH_W) '$(srcdir)/wx-sdl2-midi.c'; fi`
-
 pcem-wx-sdl2.o: wx-sdl2.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-wx-sdl2.o -MD -MP -MF $(DEPDIR)/pcem-wx-sdl2.Tpo -c -o pcem-wx-sdl2.o `test -f 'wx-sdl2.c' || echo '$(srcdir)/'`wx-sdl2.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-sdl2.Tpo $(DEPDIR)/pcem-wx-sdl2.Po
@@ -3354,6 +3464,34 @@ pcem-wx-shader_man.obj: wx-shader_man.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-shader_man.obj `if test -f 'wx-shader_man.c'; then $(CYGPATH_W) 'wx-shader_man.c'; else $(CYGPATH_W) '$(srcdir)/wx-shader_man.c'; fi`
 
+pcem-midi_alsa.o: midi_alsa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-midi_alsa.o -MD -MP -MF $(DEPDIR)/pcem-midi_alsa.Tpo -c -o pcem-midi_alsa.o `test -f 'midi_alsa.c' || echo '$(srcdir)/'`midi_alsa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-midi_alsa.Tpo $(DEPDIR)/pcem-midi_alsa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='midi_alsa.c' object='pcem-midi_alsa.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-midi_alsa.o `test -f 'midi_alsa.c' || echo '$(srcdir)/'`midi_alsa.c
+
+pcem-midi_alsa.obj: midi_alsa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-midi_alsa.obj -MD -MP -MF $(DEPDIR)/pcem-midi_alsa.Tpo -c -o pcem-midi_alsa.obj `if test -f 'midi_alsa.c'; then $(CYGPATH_W) 'midi_alsa.c'; else $(CYGPATH_W) '$(srcdir)/midi_alsa.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-midi_alsa.Tpo $(DEPDIR)/pcem-midi_alsa.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='midi_alsa.c' object='pcem-midi_alsa.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-midi_alsa.obj `if test -f 'midi_alsa.c'; then $(CYGPATH_W) 'midi_alsa.c'; else $(CYGPATH_W) '$(srcdir)/midi_alsa.c'; fi`
+
+pcem-wx-sdl2-midi.o: wx-sdl2-midi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-wx-sdl2-midi.o -MD -MP -MF $(DEPDIR)/pcem-wx-sdl2-midi.Tpo -c -o pcem-wx-sdl2-midi.o `test -f 'wx-sdl2-midi.c' || echo '$(srcdir)/'`wx-sdl2-midi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-sdl2-midi.Tpo $(DEPDIR)/pcem-wx-sdl2-midi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wx-sdl2-midi.c' object='pcem-wx-sdl2-midi.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-sdl2-midi.o `test -f 'wx-sdl2-midi.c' || echo '$(srcdir)/'`wx-sdl2-midi.c
+
+pcem-wx-sdl2-midi.obj: wx-sdl2-midi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-wx-sdl2-midi.obj -MD -MP -MF $(DEPDIR)/pcem-wx-sdl2-midi.Tpo -c -o pcem-wx-sdl2-midi.obj `if test -f 'wx-sdl2-midi.c'; then $(CYGPATH_W) 'wx-sdl2-midi.c'; else $(CYGPATH_W) '$(srcdir)/wx-sdl2-midi.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-sdl2-midi.Tpo $(DEPDIR)/pcem-wx-sdl2-midi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wx-sdl2-midi.c' object='pcem-wx-sdl2-midi.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -c -o pcem-wx-sdl2-midi.obj `if test -f 'wx-sdl2-midi.c'; then $(CYGPATH_W) 'wx-sdl2-midi.c'; else $(CYGPATH_W) '$(srcdir)/wx-sdl2-midi.c'; fi`
+
 pcem-allegro-gui.o: allegro-gui.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CFLAGS) $(CFLAGS) -MT pcem-allegro-gui.o -MD -MP -MF $(DEPDIR)/pcem-allegro-gui.Tpo -c -o pcem-allegro-gui.o `test -f 'allegro-gui.c' || echo '$(srcdir)/'`allegro-gui.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-allegro-gui.Tpo $(DEPDIR)/pcem-allegro-gui.Po
@@ -4040,6 +4178,20 @@ pcem-wx-shaderconfig.obj: wx-shaderconfig.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CXXFLAGS) $(CXXFLAGS) -c -o pcem-wx-shaderconfig.obj `if test -f 'wx-shaderconfig.cc'; then $(CYGPATH_W) 'wx-shaderconfig.cc'; else $(CYGPATH_W) '$(srcdir)/wx-shaderconfig.cc'; fi`
 
+pcem-wx-joystickconfig.o: wx-joystickconfig.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CXXFLAGS) $(CXXFLAGS) -MT pcem-wx-joystickconfig.o -MD -MP -MF $(DEPDIR)/pcem-wx-joystickconfig.Tpo -c -o pcem-wx-joystickconfig.o `test -f 'wx-joystickconfig.cc' || echo '$(srcdir)/'`wx-joystickconfig.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-joystickconfig.Tpo $(DEPDIR)/pcem-wx-joystickconfig.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='wx-joystickconfig.cc' object='pcem-wx-joystickconfig.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CXXFLAGS) $(CXXFLAGS) -c -o pcem-wx-joystickconfig.o `test -f 'wx-joystickconfig.cc' || echo '$(srcdir)/'`wx-joystickconfig.cc
+
+pcem-wx-joystickconfig.obj: wx-joystickconfig.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CXXFLAGS) $(CXXFLAGS) -MT pcem-wx-joystickconfig.obj -MD -MP -MF $(DEPDIR)/pcem-wx-joystickconfig.Tpo -c -o pcem-wx-joystickconfig.obj `if test -f 'wx-joystickconfig.cc'; then $(CYGPATH_W) 'wx-joystickconfig.cc'; else $(CYGPATH_W) '$(srcdir)/wx-joystickconfig.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcem-wx-joystickconfig.Tpo $(DEPDIR)/pcem-wx-joystickconfig.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='wx-joystickconfig.cc' object='pcem-wx-joystickconfig.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcem_CXXFLAGS) $(CXXFLAGS) -c -o pcem-wx-joystickconfig.obj `if test -f 'wx-joystickconfig.cc'; then $(CYGPATH_W) 'wx-joystickconfig.cc'; else $(CYGPATH_W) '$(srcdir)/wx-joystickconfig.cc'; fi`
+
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
diff --git a/src/midi_alsa.c b/src/midi_alsa.c
new file mode 100644
index 0000000..f513c23
--- /dev/null
+++ b/src/midi_alsa.c
@@ -0,0 +1,184 @@
+#include <alsa/asoundlib.h>
+#include "ibm.h"
+#include "config.h"
+#include "plat-midi.h"
+
+#define MAX_MIDI_DEVICES 128
+
+static struct
+{
+	int card;
+	int device;
+	int sub;
+	char name[50];
+} midi_devices[MAX_MIDI_DEVICES];
+
+static int midi_device_count = 0;
+
+static int midi_queried = 0;
+
+static snd_rawmidi_t *midiout = NULL;
+
+static void midi_query()
+{
+	int status;
+	int card = -1;
+
+	midi_queried = 1;
+
+	if ((status = snd_card_next(&card)) < 0)
+		return;
+
+	if (card < 0)
+		return; /*No cards*/
+
+	while (card >= 0)
+	{
+		char *shortname;
+
+		if ((status = snd_card_get_name(card, &shortname)) >= 0)
+		{
+			snd_ctl_t *ctl;
+			char name[32];
+
+			sprintf(name, "hw:%i", card);
+
+			if ((status = snd_ctl_open(&ctl, name, 0)) >= 0)
+			{
+				int device = -1;
+
+				do
+				{
+					status = snd_ctl_rawmidi_next_device(ctl, &device);
+					if (status >= 0 && device != -1)
+					{
+						snd_rawmidi_info_t *info;
+						int sub_nr, sub;
+
+						snd_rawmidi_info_alloca(&info);
+						snd_rawmidi_info_set_device(info, device);
+						snd_rawmidi_info_set_stream(info, SND_RAWMIDI_STREAM_OUTPUT);
+						snd_ctl_rawmidi_info(ctl, info);
+						sub_nr = snd_rawmidi_info_get_subdevices_count(info);
+						pclog("sub_nr=%i\n",sub_nr);
+
+						for (sub = 0; sub < sub_nr; sub++)
+						{
+							snd_rawmidi_info_set_subdevice(info, sub);
+
+							if (snd_ctl_rawmidi_info(ctl, info) == 0)
+							{
+								pclog("%s: MIDI device=%i:%i:%i\n", shortname, card, device,sub);
+
+								midi_devices[midi_device_count].card = card;
+								midi_devices[midi_device_count].device = device;
+								midi_devices[midi_device_count].sub = sub;
+								snprintf(midi_devices[midi_device_count].name, 50, "%s (%i:%i:%i)", shortname, card, device, sub);
+								midi_device_count++;
+								if (midi_device_count >= MAX_MIDI_DEVICES)
+									return;
+							}
+						}
+					}
+				} while (device >= 0);
+			}
+		}
+
+		if (snd_card_next(&card) < 0)
+			break;
+	}
+}
+
+void midi_init()
+{
+	char portname[32];
+	int midi_id;
+
+	if (!midi_queried)
+		midi_query();
+
+	midi_id = config_get_int(CFG_MACHINE, NULL, "midi", 0);
+
+	sprintf(portname, "hw:%i,%i,%i", midi_devices[midi_id].card,
+					 midi_devices[midi_id].device,
+					 midi_devices[midi_id].sub);
+	pclog("Opening MIDI port %s\n", portname);
+
+	if (snd_rawmidi_open(NULL, &midiout, portname, SND_RAWMIDI_SYNC) < 0)
+	{
+		pclog("Failed to open MIDI\n");
+		return;
+	}
+}
+
+void midi_close()
+{
+	if (midiout != NULL)
+	{
+		snd_rawmidi_close(midiout);
+		midiout = NULL;
+	}
+}
+
+static int midi_pos, midi_len;
+static uint8_t midi_command[4];
+static int midi_lengths[8] = {3, 3, 3, 3, 2, 2, 3, 1};
+static int midi_insysex;
+static uint8_t midi_sysex_data[1024+2];
+
+void midi_write(uint8_t val)
+{
+	//pclog("Write MIDI %02x\n", val);
+
+        if ((val & 0x80) && !(val == 0xf7 && midi_insysex))
+        {
+                midi_pos = 0;
+                midi_len = midi_lengths[(val >> 4) & 7];
+                midi_command[0] = midi_command[1] = midi_command[2] = midi_command[3] = 0;
+                if (val == 0xf0)
+                        midi_insysex = 1;
+        }
+
+        if (midi_insysex)
+        {
+                midi_sysex_data[midi_pos++] = val;
+                
+                if (val == 0xf7 || midi_pos >= 1024+2)
+		{
+/*			pclog("MIDI send sysex %i: ", midi_pos);
+			for (int i = 0; i < midi_pos; i++)
+				pclog("%02x ", midi_sysex_data[i]);
+			pclog("\n");*/
+			snd_rawmidi_write(midiout, midi_sysex_data, midi_pos);
+//			pclog("Sent sysex\n");
+			midi_insysex = 0;
+		}
+                return;
+        }
+                        
+        if (midi_len)
+        {                
+                midi_command[midi_pos] = val;
+                
+                midi_pos++;
+                
+                if (midi_pos == midi_len)
+		{
+//			pclog("MIDI send %i: %02x %02x %02x %02x\n", midi_len, midi_command[0], midi_command[1], midi_command[2], midi_command[3]);
+                        snd_rawmidi_write(midiout, midi_command, midi_len);
+		}
+        }
+}
+
+int midi_get_num_devs()
+{
+	if (!midi_queried)
+		midi_query();
+
+	return midi_device_count;
+}
+
+void midi_get_dev_name(int num, char *s)
+{
+	strcpy(s, midi_devices[num].name);
+}