remove support for 'userport DAC' from xplus4. This device does not w…

…ork with a real Plus4 as-is git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45208 379a1393-f5fb-40a0-bcee-ef074d9b53f7
VICE-Team · Jul 8, 2024 · 2389c02 · 2389c02
1 parent f421428
commit 2389c02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/vice/src/plus4/plus4.c b/vice/src/plus4/plus4.c
@@ -107,7 +107,6 @@
 #include "trapthem_snespad.h"
 #include "types.h"
 #include "userport.h"
-#include "userport_dac.h"
 #include "userport_hummer_joystick.h"
 #include "userport_io_sim.h"
 #include "userport_joystick.h"
@@ -572,10 +571,6 @@ int machine_resources_init(void)
         init_resource_fail("userport woj joystick");
         return -1;
     }
-    if (userport_dac_resources_init() < 0) {
-        init_resource_fail("userport dac");
-        return -1;
-    }
     if (userport_petscii_snespad_resources_init() < 0) {
         init_resource_fail("userport petscii snes pad");
         return -1;
@@ -895,9 +890,6 @@ int machine_specific_init(void)
     digiblaster_sound_chip_init();
     speech_sound_chip_init();
 
-    /* Initialize userport based sound chips */
-    userport_dac_sound_chip_init();
-
     drive_sound_init();
     datasette_sound_init();
     video_sound_init();

diff --git a/vice/src/userport/userport_dac.c b/vice/src/userport/userport_dac.c
@@ -26,18 +26,18 @@
  *
  */
 
-/* 8bit userport DAC (C64/C128/CBM2/PET/PLUS4/VIC20)
-
-C64/C128 | CBM2 | PET | PLUS4 | VIC20 | NAME
---------------------------------------------
-    C    |  14  |  C  |   B   |   C   | PB0 -> D0
-    D    |  13  |  D  |   K   |   D   | PB1 -> D1
-    E    |  12  |  E  |   4   |   E   | PB2 -> D2
-    F    |  11  |  F  |   5   |   F   | PB3 -> D3
-    H    |  10  |  H  |   6   |   H   | PB4 -> D4
-    J    |   9  |  J  |   7   |   J   | PB5 -> D5
-    K    |   8  |  K  |   J   |   K   | PB6 -> D6
-    L    |   7  |  L  |   F   |   L   | PB7 -> D7
+/* 8bit userport DAC (C64/C128/CBM2/PET/VIC20)
+
+C64/C128 | CBM2 | PET | VIC20 | NAME
+------------------------------------
+    C    |  14  |  C  |   C   | PB0 -> D0
+    D    |  13  |  D  |   D   | PB1 -> D1
+    E    |  12  |  E  |   E   | PB2 -> D2
+    F    |  11  |  F  |   F   | PB3 -> D3
+    H    |  10  |  H  |   H   | PB4 -> D4
+    J    |   9  |  J  |   J   | PB5 -> D5
+    K    |   8  |  K  |   K   | PB6 -> D6
+    L    |   7  |  L  |   L   | PB7 -> D7
 */
 
 #include "vice.h"