notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debug bgm player, sound code refactoring
[libpicofe.git]
/
pandora
/
pandora.c
diff --git
a/pandora/pandora.c
b/pandora/pandora.c
index
e6c92d9
..
dd73973
100644
(file)
--- a/
pandora/pandora.c
+++ b/
pandora/pandora.c
@@
-15,7
+15,7
@@
\r
#include "../gp2x/gp2x.h"
\r
#include "../gp2x/usbjoy.h"
\r
\r
#include "../gp2x/gp2x.h"
\r
#include "../gp2x/usbjoy.h"
\r
-#include "../common/arm_
utils
.h"
\r
+#include "../common/arm_
linux
.h"
\r
\r
static volatile unsigned int *memregs = MAP_FAILED;
\r
//static
\r
\r
static volatile unsigned int *memregs = MAP_FAILED;
\r
//static
\r
@@
-64,13
+64,11
@@
void gp2x_video_wait_vsync(void)
{
\r
}
\r
\r
{
\r
}
\r
\r
-
\r
void gp2x_video_flush_cache(void)
\r
{
\r
void gp2x_video_flush_cache(void)
\r
{
\r
-//
flushcache
(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
\r
+//
cache_flush_d_inval_i
(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
\r
}
\r
\r
}
\r
\r
-
\r
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
\r
{
\r
}
\r
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
\r
{
\r
}
\r
@@
-89,6
+87,7
@@
void gp2x_memset_all_buffers(int offset, int byte, int len)
\r
void gp2x_pd_clone_buffer2(void)
\r
{
\r
\r
void gp2x_pd_clone_buffer2(void)
\r
{
\r
+ memset(gp2x_screen, 0, 800*480*2);
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-140,11
+139,10
@@
int gp2x_touchpad_read(int *x, int *y)
}
\r
\r
\r
}
\r
\r
\r
-
//
static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
\r
+static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
\r
\r
void gp2x_start_sound(int rate, int bits, int stereo)
\r
{
\r
\r
void gp2x_start_sound(int rate, int bits, int stereo)
\r
{
\r
-#if 0
\r
int frag = 0, bsize, buffers;
\r
\r
// if no settings change, we don't need to do anything
\r
int frag = 0, bsize, buffers;
\r
\r
// if no settings change, we don't need to do anything
\r
@@
-171,13
+169,12
@@
void gp2x_start_sound(int rate, int bits, int stereo)
rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));
\r
\r
s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;
\r
rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));
\r
\r
s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;
\r
-#endif
\r
}
\r
\r
\r
void gp2x_sound_write(void *buff, int len)
\r
{
\r
}
\r
\r
\r
void gp2x_sound_write(void *buff, int len)
\r
{
\r
-
//
write(sounddev, buff, len);
\r
+
write(sounddev, buff, len);
\r
}
\r
\r
void gp2x_sound_sync(void)
\r
}
\r
\r
void gp2x_sound_sync(void)
\r
@@
-217,6
+214,13
@@
void gp2x_init(void)
exit(1);
\r
}
\r
*/
\r
exit(1);
\r
}
\r
*/
\r
+ fbdev = open("/dev/fb0", O_RDWR);
\r
+ if (fbdev == -1)
\r
+ {
\r
+ printf("open(\"/dev/fb0\") failed with %i\n", errno);
\r
+ exit(1);
\r
+ }
\r
+
\r
ret = ioctl(fbdev, FBIOGET_FSCREENINFO, &fbfix);
\r
if (ret == -1)
\r
{
\r
ret = ioctl(fbdev, FBIOGET_FSCREENINFO, &fbfix);
\r
if (ret == -1)
\r
{
\r
@@
-231,13
+235,6
@@
void gp2x_init(void)
return;
\r
}
\r
\r
return;
\r
}
\r
\r
- fbdev = open("/dev/fb0", O_RDWR);
\r
- if (fbdev == -1)
\r
- {
\r
- printf("open(\"/dev/fb0\") failed with %i\n", errno);
\r
- exit(1);
\r
- }
\r
-
\r
screen = mmap(0, SCREEN_MAP_SIZE, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
\r
if (screen == MAP_FAILED)
\r
{
\r
screen = mmap(0, SCREEN_MAP_SIZE, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
\r
if (screen == MAP_FAILED)
\r
{
\r