RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio improvement wip

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@33 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-02-08 23:19:53 +00:00
parent f80d67e12b
commit 85f8e92973
11 changed files with 65 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
platform/gp2x/940ctl_ym2612.c → platform/gp2x/940ctl.c
View file

@ -333,6 +333,16 @@ void sharedmem_init(void)
}
void sharedmem_deinit(void)
{
munmap(shared_mem, 0x210000);
munmap(mp3_mem, MP3_SIZE_MAX);
shared_mem = mp3_mem = NULL;
shared_data = NULL;
shared_ctl = NULL;
}
extern char **g_argv;
/* none of the functions in this file should be called before this one */
@ -433,19 +443,17 @@ void YM2612ResetChip_940(void)
int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
{
int *ym_buf = shared_data->ym_buffer;
int ym_active_chs;
//printf("YM2612UpdateOne_940()\n");
if (CHECK_BUSY(JOB940_YM2612UPDATEONE)) wait_busy_940(JOB940_YM2612UPDATEONE);
// mix in ym buffer
if (is_buf_empty) memcpy32(buffer, ym_buf, length<<stereo);
// else TODO
ym_active_chs = shared_ctl->ym_active_chs;
// for (len = length << stereo; len > 0; len--)
// {
// *dest_buf++ += *ym_buf++;
// }
// mix in ym buffer. is_buf_empty means nobody mixed there anything yet and it may contain trash
if (is_buf_empty && ym_active_chs) memcpy32(buffer, ym_buf, length<<stereo);
else memset32(buffer, 0, length<<stereo);
if (shared_ctl->writebuffsel == 1) {
shared_ctl->writebuff0[writebuff_ptr] = 0xffff;
@ -467,7 +475,7 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
add_job_940(JOB940_YM2612UPDATEONE);
return 1;
return ym_active_chs;
}

1
platform/gp2x/940ctl_ym2612.h → platform/gp2x/940ctl.h
View file

@ -1,4 +1,5 @@
void sharedmem_init(void);
void sharedmem_deinit(void);
void YM2612Init_940(int baseclock, int rate);
void YM2612ResetChip_940(void);

2
platform/gp2x/Makefile
View file

@ -34,7 +34,7 @@ OBJCOPY = $(CROSS)objcopy
# frontend
OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o asmutils.o cpuctrl.o
# 940 core control
OBJS += 940ctl_ym2612.o
OBJS += 940ctl.o
# Pico
OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory.o ../../Pico/Misc.o \
../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o

3
platform/gp2x/code940/940.c
View file

@ -112,7 +112,8 @@ void Main940(void)
YM2612Write_(d >> 8, d);
}
YM2612UpdateOne_(ym_buffer, shared_ctl->length, shared_ctl->stereo, 1);
shared_ctl->ym_active_chs =
YM2612UpdateOne_(ym_buffer, shared_ctl->length, shared_ctl->stereo, 1);
break;
}

1
platform/gp2x/code940/940shared.h
View file

@ -35,6 +35,7 @@ typedef struct
int writebuffsel; /* which write buffer to use (from 940 side) */
UINT16 writebuff0[2048]; /* list of writes to ym2612, 1024 for savestates, 1024 extra */
UINT16 writebuff1[2048];
int ym_active_chs;
int mp3_len; /* data len of loaded mp3 */
int mp3_offs; /* current playback offset (just after last decoded frame) */
int mp3_buffsel; /* which output buffer to decode to */

11
platform/gp2x/gp2x.c
View file

@ -52,6 +52,7 @@ void *gp2x_screen;
#define FRAMEBUFF_ADDR3 0x4000000-640*480*4
static const int gp2x_screenaddrs[] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
static unsigned short gp2x_screenaddr_old[4];
/* video stuff */
@ -269,6 +270,11 @@ void gp2x_init(void)
gp2x_screen = gp2x_screens[0];
screensel = 0;
gp2x_screenaddr_old[0] = gp2x_memregs[0x290E>>1];
gp2x_screenaddr_old[1] = gp2x_memregs[0x2910>>1];
gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];
gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];
// snd
mixerdev = open("/dev/mixer", O_RDWR);
if (mixerdev == -1)
@ -288,6 +294,11 @@ void gp2x_deinit(void)
Pause940(1);
gp2x_video_changemode(15);
gp2x_memregs[0x290E>>1] = gp2x_screenaddr_old[0];
gp2x_memregs[0x2910>>1] = gp2x_screenaddr_old[1];
gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2];
gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3];
munmap(gp2x_screens[0], 640*480*4);
munmap((void *)gp2x_memregs, 0x10000);
close(memdev);

3
platform/gp2x/main.c
View file

@ -12,6 +12,7 @@
#include "gp2x.h"
#include "menu.h"
#include "emu.h"
#include "940ctl.h"
#include "version.h"
#include "squidgehack.h"
@ -94,6 +95,7 @@ int main(int argc, char *argv[])
set_RAM_Timings(6, 4, 1, 1, 1, 2, 2);
printf("done.\n"); fflush(stdout);
}
sharedmem_init();
emu_Init();
engineState = PGS_Menu;
@ -134,6 +136,7 @@ int main(int argc, char *argv[])
endloop:
emu_Deinit();
sharedmem_deinit();
cpuctrl_deinit();
gp2x_deinit();
if(mmuhack_status)