X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=88f17313fe138ac0f6388e6b49c4063409649636;hb=4742480dcabcbd9d23fd8cb9a655fc8c9c314513;hp=29ee5f4c27c367db77d6f90e04c5e07fe45cf89d;hpb=2823a4c8196a02da86ee180cf55586d4e8c91a2f;p=gpsp.git diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c index 29ee5f4..88f1731 100644 --- a/gp2x/gp2x.c +++ b/gp2x/gp2x.c @@ -24,16 +24,19 @@ #include #include "../common.h" #include "gp2x.h" +#include "warm.h" extern int main_cpuspeed(int argc, char *argv[]); extern SDL_Surface* screen; -u32 gp2x_audio_volume = 74; +u32 gp2x_audio_volume = 74/2; u32 gpsp_gp2x_dev_audio = 0; u32 gpsp_gp2x_dev = 0; +u32 gpsp_gp2x_gpiodev = 0; -volatile u16 *gpsp_gp2x_memregs; -volatile u32 *gpsp_gp2x_memregl; +static volatile u16 *gpsp_gp2x_memregs; +static volatile u32 *gpsp_gp2x_memregl; +unsigned short *gp2x_memregs; static volatile u16 *MEM_REG; @@ -54,7 +57,7 @@ s32 gp2x_load_mmuhack() return 0; } -void gp2x_overclock() +void gp2x_init() { gpsp_gp2x_dev = open("/dev/mem", O_RDWR); gpsp_gp2x_dev_audio = open("/dev/mixer", O_RDWR); @@ -62,9 +65,15 @@ void gp2x_overclock() (unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gpsp_gp2x_dev, 0xc0000000); gpsp_gp2x_memregs = (unsigned short *)gpsp_gp2x_memregl; +#ifdef WIZ_BUILD + gpsp_gp2x_gpiodev = open("/dev/GPIO", O_RDONLY); +#endif + warm_init(); clear_screen(0); - main_cpuspeed(0, NULL); +// main_cpuspeed(0, NULL); + gp2x_memregs = (void *)gpsp_gp2x_memregs; + cpuctrl_init(); gp2x_sound_volume(1); } @@ -73,8 +82,13 @@ void gp2x_quit() munmap((void *)gpsp_gp2x_memregl, 0x10000); close(gpsp_gp2x_dev_audio); close(gpsp_gp2x_dev); - chdir("/usr/gp2x"); - execl("gp2xmenu", "gp2xmenu", NULL); +#ifdef WIZ_BUILD + close(gpsp_gp2x_gpiodev); +#endif + + //chdir("/usr/gp2x"); + //execl("gp2xmenu", "gp2xmenu", NULL); + exit(0); } void gp2x_sound_volume(u32 volume_up) @@ -91,3 +105,44 @@ void gp2x_sound_volume(u32 volume_up) ioctl(gpsp_gp2x_dev_audio, SOUND_MIXER_WRITE_PCM, &volume); } +u32 gpsp_gp2x_joystick_read(void) +{ +#ifdef WIZ_BUILD + u32 value = 0; + read(gpsp_gp2x_gpiodev, &value, 4); + if(value & 0x02) + value |= 0x05; + if(value & 0x08) + value |= 0x14; + if(value & 0x20) + value |= 0x50; + if(value & 0x80) + value |= 0x41; + return value; +#else + u32 value = (gpsp_gp2x_memregs[0x1198 >> 1] & 0x00FF); + + if(value == 0xFD) + value = 0xFA; + if(value == 0xF7) + value = 0xEB; + if(value == 0xDF) + value = 0xAF; + if(value == 0x7F) + value = 0xBE; + + return ~((gpsp_gp2x_memregs[0x1184 >> 1] & 0xFF00) | value | + (gpsp_gp2x_memregs[0x1186 >> 1] << 16)); +#endif +} + +#ifdef WIZ_BUILD +void cpuctrl_init(void) +{ +} + +void set_FCLK(u32 MHZ) +{ +} +#endif +