UIQ3 update, some makefile unification, rm old configs, stuff

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@569 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-08-21 10:45:54 +00:00
parent 5d239ae7a4
commit 36f6fd5afe
18 changed files with 339 additions and 264 deletions

View file

@ -48,7 +48,6 @@ char romFileName[PATH_MAX];
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
static int osd_fps_x;
char noticeMsg[64]; // notice msg to draw
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
int reset_timing = 0;
@ -65,7 +64,7 @@ void emu_noticeMsgUpdated(void)
gettimeofday(&noticeMsgTime, 0);
}
void emu_getMainDir(char *dst, int len)
int emu_getMainDir(char *dst, int len)
{
extern char **g_argv;
int j;
@ -76,6 +75,8 @@ void emu_getMainDir(char *dst, int len)
dst[len] = 0;
for (j = strlen(dst); j > 0; j--)
if (dst[j] == '/') { dst[j+1] = 0; break; }
return j + 1;
}
void emu_Init(void)
@ -151,16 +152,6 @@ void emu_prepareDefaultConfig(void)
defaultConfig.turbo_rate = 15;
}
void emu_setDefaultConfig(void)
{
memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
PicoOpt = currentConfig.s_PicoOpt;
PsndRate = currentConfig.s_PsndRate;
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
}
static void textOut16(int x, int y, const char *text)
{
int i,l,len=strlen(text);

View file

@ -92,7 +92,7 @@ int main(int argc, char *argv[])
if (engineState == PGS_ReloadRom)
{
if (emu_ReloadRom()) {
if (emu_ReloadRom(romFileName)) {
engineState = PGS_Running;
if (load_state_slot >= 0) {
state_slot = load_state_slot;
@ -110,7 +110,7 @@ int main(int argc, char *argv[])
break;
case PGS_ReloadRom:
if (emu_ReloadRom())
if (emu_ReloadRom(romFileName))
engineState = PGS_Running;
else {
printf("PGS_ReloadRom == 0\n");

View file

@ -24,4 +24,10 @@
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
#define dprintf(x...)
// platform
#define PLAT_MAX_KEYS 32
#define PLAT_HAVE_JOY 1
#define PATH_SEP "/"
#define PATH_SEP_C '/'
#endif //PORT_CONFIG_H