more Pandora porting work

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@560 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-07-23 11:21:08 +00:00
parent fe01739339
commit 492d353af9
6 changed files with 1070 additions and 237 deletions

View file

@ -49,7 +49,7 @@ LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
# frontend
OBJS += pandora.o main.o platform/gp2x/menu.o platform/gp2x/usbjoy.o platform/gp2x/emu.o
OBJS += pandora.o main.o emu.o platform/gp2x/menu.o platform/gp2x/usbjoy.o
# common
OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
@ -141,7 +141,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound
all: mkdirs PicoDrive
PicoDrive : $(OBJS) ../common/helix/helix_mp3.a
PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@
$(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng
ifeq ($(DEBUG),)
@ -218,8 +218,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h
Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h
# build helix libs
../common/helix/helix_mp3.a:
make -C ../common/helix
../common/helix/$(CROSS)helix-mp3.a:
make -C ../common/helix clean all
readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X

1014
pandora/emu.c Normal file

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,6 @@
#include "../gp2x/version.h"
extern char *ext_menu, *ext_state;
extern int select_exits;
extern char *PicoConfigFile;
int mmuhack_status = 0; // TODO rm
@ -32,13 +31,7 @@ void parse_cmd_line(int argc, char *argv[])
{
if(argv[x][0] == '-')
{
if(strcasecmp(argv[x], "-menu") == 0) {
if(x+1 < argc) { ++x; ext_menu = argv[x]; } /* External Frontend: Program Name */
}
else if(strcasecmp(argv[x], "-state") == 0) {
if(x+1 < argc) { ++x; ext_state = argv[x]; } /* External Frontend: Arguments */
}
else if(strcasecmp(argv[x], "-config") == 0) {
if(strcasecmp(argv[x], "-config") == 0) {
if(x+1 < argc) { ++x; PicoConfigFile = argv[x]; }
}
else if(strcasecmp(argv[x], "-selectexit") == 0) {

View file

@ -1,24 +1,3 @@
/**
* All this is mostly based on rlyeh's minimal library.
* Copied here to review all his code and understand what's going on.
**/
/*
GP2X minimal library v0.A by rlyeh, (c) 2005. emulnation.info@rlyeh (swap it!)
Thanks to Squidge, Robster, snaff, Reesy and NK, for the help & previous work! :-)
License
=======
Free for non-commercial projects (it would be nice receiving a mail from you).
Other cases, ask me first.
GamePark Holdings is not allowed to use this library and/or use parts from it.
*/
#include <stdio.h>
#include <stdlib.h>
@ -37,177 +16,84 @@
#include "../gp2x/usbjoy.h"
#include "../common/arm_utils.h"
volatile unsigned short *gp2x_memregs;
//static
volatile unsigned long *gp2x_memregl;
static void *gp2x_screens[4];
static int screensel = 0;
static volatile unsigned int *memregs;
//static
int memdev = 0;
static int sounddev = -1, mixerdev = -1, touchdev = -1;
static int touchcal[7] = { 6203, 0, -1501397, 0, -4200, 16132680, 65536 };
#define SCREEN_MAP_SIZE (((800*(480+11)*2)+0xfff)&~0xfff)
static void *screen;
void *gp2x_screen;
#define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more
#define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE)
#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0+0x30000)
#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000)
#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)
static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
static int gp2x_screenaddrs_use[4];
static unsigned short gp2x_screenaddr_old[4];
/* video stuff */
void gp2x_video_flip(void)
{
unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3];
unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16);
gp2x_memregs[0x2910>>1] = msw;
gp2x_memregs[0x2914>>1] = msw;
gp2x_memregs[0x290E>>1] = lsw;
gp2x_memregs[0x2912>>1] = lsw;
// jump to other buffer:
gp2x_screen = gp2x_screens[++screensel&3];
}
/* doulblebuffered flip */
void gp2x_video_flip2(void)
{
unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);
gp2x_memregs[0x2910>>1] = msw;
gp2x_memregs[0x2914>>1] = msw;
gp2x_memregs[0x290E>>1] = 0;
gp2x_memregs[0x2912>>1] = 0;
// jump to other buffer:
gp2x_screen = gp2x_screens[++screensel&1];
}
void gp2x_video_changemode2(int bpp)
{
gp2x_memregs[0x28DA>>1]=(((bpp+1)/8)<<9)|0xAB; /*8/15/16/24bpp...*/
gp2x_memregs[0x290C>>1]=320*((bpp+1)/8); /*line width in bytes*/
}
void gp2x_video_changemode(int bpp)
{
gp2x_video_changemode2(bpp);
gp2x_memset_all_buffers(0, 0, 320*240*2);
gp2x_video_flip();
}
void gp2x_video_setpalette(int *pal, int len)
{
unsigned short *g=(unsigned short *)pal;
volatile unsigned short *memreg = &gp2x_memregs[0x295A>>1];
gp2x_memregs[0x2958>>1] = 0;
len *= 2;
while(len--) *memreg=*g++;
}
// TV Compatible function //
void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
{
float escalaw, escalah;
int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;
unsigned short scalw;
// set offset
gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;
escalaw = 1024.0; // RGB Horiz LCD
escalah = 320.0; // RGB Vert LCD
if(gp2x_memregs[0x2800>>1]&0x100) //TV-Out
{
escalaw=489.0; // RGB Horiz TV (PAL, NTSC)
if (gp2x_memregs[0x2818>>1] == 287) //PAL
escalah=274.0; // RGB Vert TV PAL
else if (gp2x_memregs[0x2818>>1] == 239) //NTSC
escalah=331.0; // RGB Vert TV NTSC
}
// scale horizontal
scalw = (unsigned short)((float)escalaw *(W/320.0));
/* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */
if (H != 240 && W == 320) scalw--;
gp2x_memregs[0x2906>>1]=scalw;
// scale vertical
gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));
}
void gp2x_video_wait_vsync(void)
{
unsigned short v = gp2x_memregs[0x1182>>1];
while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) spend_cycles(1024);
}
void gp2x_video_flush_cache(void)
{
// since we are using the mmu hack, we must flush the cache first
// (the params are most likely wrong, but they seem to work somehow)
//flushcache(addr, addr + 320*240*2, 0);
flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
// flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
}
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
{
char *dst;
if (buffers & (1<<0)) { dst = (char *)gp2x_screens[0] + offset; if (dst != data) memcpy(dst, data, len); }
if (buffers & (1<<1)) { dst = (char *)gp2x_screens[1] + offset; if (dst != data) memcpy(dst, data, len); }
if (buffers & (1<<2)) { dst = (char *)gp2x_screens[2] + offset; if (dst != data) memcpy(dst, data, len); }
if (buffers & (1<<3)) { dst = (char *)gp2x_screens[3] + offset; if (dst != data) memcpy(dst, data, len); }
}
void gp2x_memcpy_all_buffers(void *data, int offset, int len)
{
gp2x_memcpy_buffers(0xf, data, offset, len);
}
void gp2x_memset_all_buffers(int offset, int byte, int len)
{
memset((char *)gp2x_screens[0] + offset, byte, len);
memset((char *)gp2x_screens[1] + offset, byte, len);
memset((char *)gp2x_screens[2] + offset, byte, len);
memset((char *)gp2x_screens[3] + offset, byte, len);
memset((char *)gp2x_screen + offset, byte, len);
}
void gp2x_pd_clone_buffer2(void)
{
memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);
}
unsigned long gp2x_joystick_read(int allow_usb_joy)
{
unsigned long value = 0;
int i;
unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M
if(value==0xFD) value=0xFA;
if(value==0xF7) value=0xEB;
if(value==0xDF) value=0xAF;
if(value==0x7F) value=0xBE;
value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D
if (allow_usb_joy && num_of_joys > 0) {
// check the usb joy as well..
@ -252,10 +138,11 @@ int gp2x_touchpad_read(int *x, int *y)
}
static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
//static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
void gp2x_start_sound(int rate, int bits, int stereo)
{
#if 0
int frag = 0, bsize, buffers;
// if no settings change, we don't need to do anything
@ -282,72 +169,36 @@ void gp2x_start_sound(int rate, int bits, int stereo)
rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));
s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;
#endif
}
void gp2x_sound_write(void *buff, int len)
{
write(sounddev, buff, len);
// write(sounddev, buff, len);
}
void gp2x_sound_sync(void)
{
ioctl(sounddev, SOUND_PCM_SYNC, 0);
// ioctl(sounddev, SOUND_PCM_SYNC, 0);
}
void gp2x_sound_volume(int l, int r)
{
#if 0
l=l<0?0:l; l=l>255?255:l; r=r<0?0:r; r=r>255?255:r;
l<<=8; l|=r;
ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &l); /*SOUND_MIXER_WRITE_VOLUME*/
}
/* 940 */
void Pause940(int yes)
{
if(yes)
gp2x_memregs[0x0904>>1] &= 0xFFFE;
else
gp2x_memregs[0x0904>>1] |= 1;
}
void Reset940(int yes, int bank)
{
gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03);
}
static void proc_set(const char *path, const char *val)
{
FILE *f;
char tmp[16];
f = fopen(path, "w");
if (f == NULL) {
printf("failed to open: %s\n", path);
return;
}
fprintf(f, "0\n");
fclose(f);
printf("\"%s\" is set to: ", path);
f = fopen(path, "r");
if (f == NULL) {
printf("(open failed)\n");
return;
}
fgets(tmp, sizeof(tmp), f);
printf("%s", tmp);
fclose(f);
#endif
}
/* common */
void gp2x_init(void)
{
// struct fb_fix_screeninfo fbfix;
int fbdev;
printf("entering init()\n"); fflush(stdout);
memdev = open("/dev/mem", O_RDWR);
@ -357,38 +208,37 @@ void gp2x_init(void)
exit(1);
}
gp2x_memregs = mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000);
printf("memregs are @ %p\n", gp2x_memregs);
if(gp2x_memregs == MAP_FAILED)
memregs = mmap(0, 0x01000000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x48000000);
if (memregs == MAP_FAILED)
{
printf("mmap(memregs) failed with %i\n", errno);
exit(1);
}
gp2x_memregl = (unsigned long *) gp2x_memregs;
gp2x_memregs[0x2880>>1] &= ~0x383; // disable cursor, subpict, osd, video layers
gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);
if(gp2x_screens[0] == MAP_FAILED)
fbdev = open("/dev/fb0", O_RDWR);
if (fbdev == -1)
{
printf("mmap(gp2x_screen) failed with %i\n", errno);
printf("open(\"/dev/fb0\") failed with %i\n", errno);
exit(1);
}
printf("framebuffers point to %p\n", gp2x_screens[0]);
gp2x_screens[1] = (char *) gp2x_screens[0]+0x30000;
gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000;
gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000;
gp2x_screen = gp2x_screens[0];
screensel = 0;
/*
ret = ioctl(fbdev, FBIOGET_FSCREENINFO, &fbfix);
if (ret == -1)
{
printf("ioctl(fbdev) failed with %i\n", errno);
exit(1);
}
*/
screen = mmap(0, SCREEN_MAP_SIZE, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
if (screen == MAP_FAILED)
{
printf("mmap(fbptr) failed with %i\n", errno);
exit(1);
}
printf("fbptr %p\n", screen);
gp2x_screen = (char *)screen + 800*10*2-64;
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];
memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));
gp2x_memset_all_buffers(0, 0, 320*240*2);
// snd
mixerdev = open("/dev/mixer", O_RDWR);
@ -410,49 +260,23 @@ void gp2x_init(void)
printf("found touchscreen/wm97xx\n");
}
/* disable Linux read-ahead */
proc_set("/proc/sys/vm/max-readahead", "0\n");
proc_set("/proc/sys/vm/min-readahead", "0\n");
printf("exitting init()\n"); fflush(stdout);
}
char *ext_menu = 0, *ext_state = 0;
void gp2x_deinit(void)
{
Reset940(1, 3);
Pause940(1);
//gp2x_video_changemode(15);
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], FRAMEBUFF_WHOLESIZE);
munmap((void *)gp2x_memregs, 0x10000);
munmap(screen, SCREEN_MAP_SIZE);
munmap((void *)memregs, 0x10000);
close(memdev);
close(mixerdev);
if (mixerdev >= 0) close(mixerdev);
if (sounddev >= 0) close(sounddev);
if (touchdev >= 0) close(touchdev);
gp2x_usbjoy_deinit();
printf("all done, running ");
// Zaq121's alternative frontend support from MAME
if(ext_menu && ext_state) {
printf("%s -state %s\n", ext_menu, ext_state);
execl(ext_menu, ext_menu, "-state", ext_state, NULL);
} else if(ext_menu) {
printf("%s\n", ext_menu);
execl(ext_menu, ext_menu, NULL);
} else {
printf("gp2xmenu\n");
chdir("/usr/gp2x");
execl("gp2xmenu", "gp2xmenu", NULL);
}
printf("all done");
}
/* lprintf */
@ -474,4 +298,6 @@ void set_gamma(int g100, int A_SNs_curve) {}
void set_FCLK(unsigned MHZ) {}
void set_LCD_custom_rate(int rate) {}
void unset_LCD_custom_rate(void) {}
void Pause940(int yes) {}
void Reset940(int yes, int bank) {}