X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2F940ctl_ym2612.c;h=9d7e38d397f1d065c51566ff4fb0bed3b038bca6;hb=2c60056042e94007286e3e0e1789f4c9a78b7731;hp=403cca2cd342438326d74694a296576edd9c6621;hpb=703e4c7bbb2cfd549797e2092e4d863547b3e87c;p=libpicofe.git

diff --git a/linux/940ctl_ym2612.c b/linux/940ctl_ym2612.c
index 403cca2..9d7e38d 100644
--- a/linux/940ctl_ym2612.c
+++ b/linux/940ctl_ym2612.c
@@ -8,19 +8,15 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "../../Pico/sound/ym2612.h"
+#include "../../pico/sound/ym2612.h"
 #include "../gp2x/gp2x.h"
 #include "../gp2x/emu.h"
 #include "../gp2x/menu.h"
 #include "../gp2x/code940/940shared.h"
 #include "../common/helix/pub/mp3dec.h"
-#include "../../Pico/PicoInt.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,9 +211,3 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 }
 
 
-int mp3_get_offset(void)
-{
-	return 0;
-}
-
-