gp2x+wiz binary support, wiz code wip

[libpicofe.git] / linux / 940ctl_ym2612.c

diff --git a/linux/940ctl_ym2612.c b/linux/940ctl_ym2612.c
index 86435e4..50b32e3 100644 (file)
--- a/linux/940ctl_ym2612.c
+++ b/linux/940ctl_ym2612.c
@@ -1,4 +1,5 @@
 /* faked 940 code just uses local copy of ym2612 */
+/* TODO: rm this */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,19 +9,14 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "../../Pico/sound/ym2612.h"
-#include "../gp2x/gp2x.h"
+#include "../../pico/sound/ym2612.h"
+//#include "../gp2x/gp2x.h"
 #include "../gp2x/emu.h"
-#include "../gp2x/menu.h"
 #include "../gp2x/code940/940shared.h"
-#include "../gp2x/helix/pub/mp3dec.h"
-#include "../../Pico/PicoInt.h"
+#include "../common/helix/pub/mp3dec.h"
+#include "../../pico/pico_int.h"
 
 
-static YM2612 ym2612;
-
-YM2612 *ym2612_940 = &ym2612;
-
 // static _940_data_t  shared_data_;
 static _940_ctl_t   shared_ctl_;
 // static _940_data_t *shared_data = &shared_data_;
@@ -33,26 +29,13 @@ unsigned char *mp3_mem = 0;
 /***********************************************************/
 
 
-int YM2612Write_940(unsigned int a, unsigned int v)
+int YM2612Write_940(unsigned int a, unsigned int v, int scanline)
 {
        YM2612Write_(a, v);
 
        return 0; // cause the engine to do updates once per frame only
 }
 
-UINT8 YM2612Read_940(void)
-{
-       return YM2612Read_();
-}
-
-
-int YM2612PicoTick_940(int n)
-{
-       YM2612PicoTick_(n);
-
-       return 0;
-}
-
 
 void YM2612PicoStateLoad_940(void)
 {
@@ -70,6 +53,16 @@ void YM2612PicoStateLoad_940(void)
        }
 }
 
+void YM2612PicoStateSave2_940(int tat, int tbt)
+{
+       YM2612PicoStateSave2(tat, tbt);
+}
+
+int YM2612PicoStateLoad2_940(int *tat, int *tbt)
+{
+       return YM2612PicoStateLoad2(tat, tbt);
+}
+
 
 void sharedmem_init(void)
 {
@@ -218,22 +211,3 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 }
 
 
-int mp3_get_offset(void)
-{
-       return 0;
-}
-
-
-/* unimplemented... */
-void mix_16h_to_32(int *dest_buf, short *mp3_buf, int count)
-{
-}
-
-void mix_16h_to_32_s1(int *dest_buf, short *mp3_buf, int count)
-{
-}
-
-void mix_16h_to_32_s2(int *dest_buf, short *mp3_buf, int count)
-{
-}
-