notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
giz menu works
[libpicofe.git]
/
gp2x
/
emu.c
diff --git
a/gp2x/emu.c
b/gp2x/emu.c
index
a9a931a
..
adb10a3
100644
(file)
--- a/
gp2x/emu.c
+++ b/
gp2x/emu.c
@@
-18,9
+18,9
@@
#include "gp2x.h"
\r
#include "usbjoy.h"
\r
#include "menu.h"
\r
#include "gp2x.h"
\r
#include "usbjoy.h"
\r
#include "menu.h"
\r
-#include "asmutils.h"
\r
+#include "../common/arm_utils.h"
\r
+#include "../common/fonts.h"
\r
#include "cpuctrl.h"
\r
#include "cpuctrl.h"
\r
-#include "fonts.h"
\r
\r
#include <Pico/PicoInt.h>
\r
#include <Pico/Patch.h>
\r
\r
#include <Pico/PicoInt.h>
\r
#include <Pico/Patch.h>
\r
@@
-52,7
+52,7
@@
static int combo_keys = 0, combo_acts = 0; // keys and actions which need button
static int gp2x_old_gamma = 100;
\r
static unsigned char *movie_data = NULL;
\r
static int movie_size = 0;
\r
static int gp2x_old_gamma = 100;
\r
static unsigned char *movie_data = NULL;
\r
static int movie_size = 0;
\r
-unsigned char *
framebuff = 0
; // temporary buffer for alt renderer
\r
+unsigned char *
PicoDraw2FB = NULL
; // temporary buffer for alt renderer
\r
int state_slot = 0;
\r
int reset_timing = 0;
\r
int config_slot = 0, config_slot_current = 0;
\r
int state_slot = 0;
\r
int reset_timing = 0;
\r
int config_slot = 0, config_slot_current = 0;
\r
@@
-389,10
+389,10
@@
static void emu_msg_tray_open(void);
void emu_Init(void)
\r
{
\r
// make temp buffer for alt renderer
\r
void emu_Init(void)
\r
{
\r
// make temp buffer for alt renderer
\r
-
framebuff
= malloc((8+320)*(8+240+8));
\r
- if (!
framebuff
)
\r
+
PicoDraw2FB
= malloc((8+320)*(8+240+8));
\r
+ if (!
PicoDraw2FB
)
\r
{
\r
{
\r
- printf("
framebuff
== 0\n");
\r
+ printf("
PicoDraw2FB
== 0\n");
\r
}
\r
\r
// make dirs for saves, cfgs, etc.
\r
}
\r
\r
// make dirs for saves, cfgs, etc.
\r
@@
-626,7
+626,7
@@
void emu_Deinit(void)
}
\r
}
\r
\r
}
\r
}
\r
\r
- free(
framebuff
);
\r
+ free(
PicoDraw2FB
);
\r
\r
PicoExit();
\r
\r
\r
PicoExit();
\r
\r
@@
-768,7
+768,7
@@
static void blit(const char *fps, const char *notice)
// feed new palette to our device
\r
gp2x_video_setpalette(localPal, 0x40);
\r
}
\r
// feed new palette to our device
\r
gp2x_video_setpalette(localPal, 0x40);
\r
}
\r
- vidCpyM2((unsigned char *)gp2x_screen+320*8,
framebuff
+328*8);
\r
+ vidCpyM2((unsigned char *)gp2x_screen+320*8,
PicoDraw2FB
+328*8);
\r
} else if (!(emu_opt&0x80)) {
\r
// 8bit accurate renderer
\r
if (Pico.m.dirtyPal) {
\r
} else if (!(emu_opt&0x80)) {
\r
// 8bit accurate renderer
\r
if (Pico.m.dirtyPal) {
\r
@@
-1112,7
+1112,7
@@
void emu_forced_frame(void)
clearArea(1);
\r
} else vidCpyM2 = vidCpyM2_40col;
\r
\r
clearArea(1);
\r
} else vidCpyM2 = vidCpyM2_40col;
\r
\r
- vidCpyM2((unsigned char *)gp2x_screen+320*8,
framebuff
+328*8);
\r
+ vidCpyM2((unsigned char *)gp2x_screen+320*8,
PicoDraw2FB
+328*8);
\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
\r
gp2x_video_setpalette(localPal, 0x40);
\r
*/
\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
\r
gp2x_video_setpalette(localPal, 0x40);
\r
*/
\r