mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
make gp2x mp3 playback functional (need to unpack and compile helix decoder separately in platform/common/helix)
This commit is contained in:
kub
kub
parent
c79d0bb90f
commit
340e528ff8
13 changed files with 274 additions and 59 deletions
|
|
@ -425,8 +425,7 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
|
|||
int mp3dec_decode(FILE *f, int *file_pos, int file_len)
|
||||
{
|
||||
if (!(PicoIn.opt & POPT_EXT_FM)) {
|
||||
//mp3_update_local(buffer, length, stereo);
|
||||
return 0;
|
||||
return _mp3dec_decode(f, file_pos, file_len);
|
||||
}
|
||||
|
||||
// check if playback was started, track not ended
|
||||
|
|
@ -457,8 +456,7 @@ int mp3dec_decode(FILE *f, int *file_pos, int file_len)
|
|||
int mp3dec_start(FILE *f, int fpos_start)
|
||||
{
|
||||
if (!(PicoIn.opt & POPT_EXT_FM)) {
|
||||
//mp3_start_play_local(f, pos);
|
||||
return -1;
|
||||
return _mp3dec_start(f, fpos_start);
|
||||
}
|
||||
|
||||
if (loaded_mp3 != f)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
|
||||
|
||||
#include "940shared.h"
|
||||
#include "../../common/mp3.h"
|
||||
#include "../../common/helix/pub/mp3dec.h"
|
||||
|
||||
static _940_data_t *shared_data = (_940_data_t *) 0x00100000;
|
||||
static _940_ctl_t *shared_ctl = (_940_ctl_t *) 0x00200000;
|
||||
|
|
@ -19,7 +19,7 @@ void drain_wb(void);
|
|||
// is changed by other core just before we update it
|
||||
void set_if_not_changed(int *val, int oldval, int newval);
|
||||
|
||||
void _memcpy(void *dst, const void *src, int count);
|
||||
extern void *memcpy(void *dest, const void *src, unsigned long n);
|
||||
|
||||
// asm volatile ("mov r0, #0" ::: "r0");
|
||||
// asm volatile ("mcr p15, 0, r0, c7, c6, 0" ::: "r0"); /* flush dcache */
|
||||
|
|
@ -153,6 +153,8 @@ void Main940(void)
|
|||
int job = 0;
|
||||
ym2612_940 = &shared_data->ym2612;
|
||||
|
||||
// extern unsigned __bss_start__, __bss_end__;
|
||||
// memset(&__bss_start__, 0, &__bss_end__ - &__bss_start__);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
|
|
@ -167,6 +169,7 @@ void Main940(void)
|
|||
shared_ctl->writebuff0[0] = shared_ctl->writebuff1[0] = 0xffff;
|
||||
YM2612Init_(shared_ctl->baseclock, shared_ctl->rate);
|
||||
/* Helix mp3 decoder */
|
||||
__malloc_init();
|
||||
shared_data->mp3dec = MP3InitDecoder();
|
||||
break;
|
||||
|
||||
|
|
@ -185,7 +188,7 @@ void Main940(void)
|
|||
|
||||
case JOB940_PICOSTATESAVE2:
|
||||
YM2612PicoStateSave2(0, 0);
|
||||
_memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);
|
||||
memcpy(shared_ctl->writebuff0, ym2612_940->REGS, 0x200);
|
||||
break;
|
||||
|
||||
case JOB940_PICOSTATELOAD2_PREP:
|
||||
|
|
@ -193,7 +196,7 @@ void Main940(void)
|
|||
break;
|
||||
|
||||
case JOB940_PICOSTATELOAD2:
|
||||
_memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);
|
||||
memcpy(ym2612_940->REGS, shared_ctl->writebuff0, 0x200);
|
||||
YM2612PicoStateLoad2(0, 0);
|
||||
break;
|
||||
|
||||
|
|
@ -207,6 +210,7 @@ void Main940(void)
|
|||
|
||||
case JOB940_MP3RESET:
|
||||
if (shared_data->mp3dec) MP3FreeDecoder(shared_data->mp3dec);
|
||||
__malloc_init();
|
||||
shared_data->mp3dec = MP3InitDecoder();
|
||||
break;
|
||||
}
|
||||
|
|
@ -215,4 +219,3 @@ void Main940(void)
|
|||
dcache_clean();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,23 @@
|
|||
# you may or may not need to change this
|
||||
#devkit_path = x:/stuff/dev/devkitgp2x/
|
||||
devkit_path ?= $(HOME)/opt/devkitGP2X/
|
||||
lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/
|
||||
CROSS = arm-linux-
|
||||
#devkit_path ?= $(HOME)/opt/devkitGP2X/
|
||||
#lgcc_path = $(devkit_path)lib/gcc/arm-linux/4.0.3/
|
||||
#CROSS = $(devkit_path)bin/arm-linux-
|
||||
#devkit_path ?= $(HOME)/opt/open2x
|
||||
#lgcc_path = $(devkit_path)/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/
|
||||
#CROSS ?= $(devkit_path)/gcc-4.1.1-glibc-2.3.6/bin/arm-open2x-linux-
|
||||
#devkit_path ?= $(HOME)/opt/arm-unknown-linux-gnu
|
||||
#lgcc_path = $(HOME)/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/
|
||||
#CROSS ?= $(devkit_path)/bin/arm-unknown-linux-gnu-
|
||||
lgcc_path = $(HOME)/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib/gcc/arm-open2x-linux/4.1.1/
|
||||
CROSS ?= arm-linux-gnueabi-
|
||||
|
||||
# settings
|
||||
#up = 1
|
||||
|
||||
CFLAGS += -O2 -Wall -fomit-frame-pointer -fstrict-aliasing -ffast-math
|
||||
CFLAGS += -I../.. -I. -D__GP2X__ -DARM
|
||||
CFLAGS += -mcpu=arm940t -mtune=arm940t
|
||||
LDFLAGS = -static -s -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc
|
||||
CFLAGS += -O2 -Wall -mno-thumb-interwork -fstrict-aliasing -ffast-math
|
||||
CFLAGS += -I../../common/helix/pub -I../../.. -I. -D__GP2X__ -DARM
|
||||
CFLAGS += -mcpu=arm940t -mtune=arm940t -mabi=apcs-gnu -mfloat-abi=soft -mfpu=fpa
|
||||
LDFLAGS = -static -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc
|
||||
|
||||
GCC = $(CROSS)gcc
|
||||
STRIP = $(CROSS)strip
|
||||
|
|
@ -36,7 +42,9 @@ all: $(BIN)
|
|||
# stuff for 940 core
|
||||
|
||||
# init, emu_control, emu
|
||||
OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o mp3.o
|
||||
OBJS940 += 940init.o 940.o 940ym2612.o misc_arm.o mp3_sync.o
|
||||
# the asm memcpy code crashes job LOAD2 on 940. Possibly a globbered reg?
|
||||
# OBJS940 += memcpy.o
|
||||
# the asm code seems to be faster when run on 920, but not on 940 for some reason
|
||||
# OBJS940 += ../../Pico/sound/ym2612_asm.o
|
||||
|
||||
|
|
@ -44,12 +52,13 @@ OBJS940 += 940init.o 940.o 940ym2612.o memcpy.o misc_arm.o mp3.o
|
|||
OBJS940 += uClibc/memset.o uClibc/s_floor.o uClibc/e_pow.o uClibc/e_sqrt.o uClibc/s_fabs.o
|
||||
OBJS940 += uClibc/s_scalbn.o uClibc/s_copysign.o uClibc/k_sin.o uClibc/k_cos.o uClibc/s_sin.o
|
||||
OBJS940 += uClibc/e_rem_pio2.o uClibc/k_rem_pio2.o uClibc/e_log.o uClibc/wrappers.o
|
||||
LIBHELIX ?= ../../common/helix/$(notdir $(CROSS))helix_mp3.a
|
||||
|
||||
$(BIN) : code940.elf
|
||||
@echo ">>>" $@
|
||||
$(OBJCOPY) -O binary $< $@
|
||||
|
||||
code940.elf : $(OBJS940) ../../common/helix/$(CROSS)helix-mp3.a
|
||||
code940.elf : $(OBJS940) $(LIBHELIX)
|
||||
@echo ">>>" $@
|
||||
$(LD) $^ $(LDFLAGS) -o $@ -Map code940.map
|
||||
|
||||
|
|
@ -64,8 +73,12 @@ misc_arm.o : ../../../pico/misc_arm.s
|
|||
@echo ">>>" $@
|
||||
$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@
|
||||
|
||||
../../common/helix/helix_mp3.a:
|
||||
@make -C ../../common/helix/
|
||||
mp3_sync.o: ../../common/mp3_sync.c
|
||||
@echo ">>>" $@
|
||||
$(GCC) $(CFLAGS) -Os -DCODE940 -c $< -o $@
|
||||
|
||||
$(LIBHELIX):
|
||||
@$(MAKE) -C ../../common/helix/ CROSS=$(CROSS)
|
||||
|
||||
|
||||
up: $(BIN)
|
||||
|
|
@ -82,7 +95,7 @@ tidy:
|
|||
##
|
||||
OBJSMP3T = mp3test.o ../gp2x.o ../asmutils.o ../usbjoy.o
|
||||
|
||||
mp3test.gpe : $(OBJSMP3T) ../helix/helix_mp3.a
|
||||
mp3test.gpe : $(OBJSMP3T) $(LIBHELIX)
|
||||
$(GCC) -static -o $@ $^
|
||||
$(STRIP) $@
|
||||
@cp -v $@ /mnt/gp2x/mnt/sd
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
//#include "emu.h"
|
||||
//#include "menu.h"
|
||||
#include "../asmutils.h"
|
||||
#include "../helix/pub/mp3dec.h"
|
||||
#include "../../helix/pub/mp3dec.h"
|
||||
|
||||
/* we will need some gp2x internals here */
|
||||
extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
.text
|
||||
.global memset
|
||||
.type memset,%function
|
||||
.align 4
|
||||
.align 2
|
||||
|
||||
memset:
|
||||
mov a4, a1
|
||||
|
|
|
|||
|
|
@ -4,9 +4,17 @@ double pow(double x, double y)
|
|||
{
|
||||
return __ieee754_pow(x, y);
|
||||
}
|
||||
double __pow_finite(double x, double y)
|
||||
{
|
||||
return __ieee754_pow(x, y);
|
||||
}
|
||||
|
||||
|
||||
double log(double x)
|
||||
{
|
||||
return __ieee754_log(x);
|
||||
}
|
||||
double __log_finite(double x)
|
||||
{
|
||||
return __ieee754_log(x);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue