\r
#include "../libpicofe/menu.h"\r
#include "../libpicofe/plat.h"\r
-#include "../libpicofe/linux/sndout_oss.h"\r
#include "../common/emu.h"\r
#include "../common/arm_utils.h"\r
-#include "version.h"\r
+#include "../common/version.h"\r
\r
#include <pico/pico_int.h>\r
\r
\r
-static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
\r
void pemu_validate_config(void)\r
{\r
- extern int PicoOpt;\r
-// PicoOpt &= ~POPT_EXT_FM;\r
- PicoOpt &= ~POPT_EN_SVP_DRC;\r
-}\r
-\r
-// FIXME: dupes from GP2X, need cleanup\r
-static void (*osd_text)(int x, int y, const char *text);\r
-\r
-/*\r
-static void osd_text8(int x, int y, const char *text)\r
-{\r
- int len = strlen(text)*8;\r
- int *p, i, h, offs;\r
-\r
- len = (len+3) >> 2;\r
- for (h = 0; h < 8; h++) {\r
- offs = (x + g_screen_width * (y+h)) & ~3;\r
- p = (int *) ((char *)g_screen_ptr + offs);\r
- for (i = len; i; i--, p++)\r
- *p = 0xe0e0e0e0;\r
- }\r
- emu_text_out8(x, y, text);\r
-}\r
-*/\r
-\r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
- int len = strlen(text)*8;\r
- int *p, i, h, offs;\r
-\r
- len = (len+1) >> 1;\r
- for (h = 0; h < 8; h++) {\r
- offs = (x + g_screen_width * (y+h)) & ~1;\r
- p = (int *) ((short *)g_screen_ptr + offs);\r
- for (i = len; i; i--, p++)\r
- *p = (*p >> 2) & 0x39e7;\r
- }\r
- emu_text_out16(x, y, text);\r
+#if !defined(__arm__) && !defined(__i386__) && !defined(__x86_64__)\r
+ PicoIn.opt &= ~POPT_EN_DRC;\r
+#endif\r
}\r
\r
static void draw_cd_leds(void)\r
\r
void pemu_finalize_frame(const char *fps, const char *notice)\r
{\r
- if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {\r
+ if (currentConfig.renderer != RT_16BIT && !(PicoIn.AHW & PAHW_32X)) {\r
unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;\r
- unsigned char *ps = PicoDraw2FB + 328*8 + 8;\r
- unsigned short *pal = HighPal;\r
+ unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;\r
+ unsigned short *pal = Pico.est.HighPal;\r
int i, x;\r
if (Pico.m.dirtyPal)\r
PicoDrawUpdateHighPal();\r
\r
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
if (notice)\r
- osd_text(4, g_screen_height - 8, notice);\r
+ emu_osd_text16(4, g_screen_height - 8, notice);\r
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
- osd_text(g_screen_width - 60, g_screen_height - 8, fps);\r
+ emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);\r
}\r
- if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
+ if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
draw_cd_leds();\r
}\r
\r
{\r
switch (currentConfig.renderer) {\r
case RT_16BIT:\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoIn.opt &= ~POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_RGB555, 0);\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
break;\r
case RT_8BIT_ACC:\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoIn.opt &= ~POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_8BIT, 0);\r
- PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);\r
+ PicoDrawSetOutBuf(Pico.est.Draw2FB + 8, 328);\r
break;\r
case RT_8BIT_FAST:\r
- PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoIn.opt |= POPT_ALT_RENDERER;\r
PicoDrawSetOutFormat(PDF_NONE, 0);\r
break;\r
}\r
\r
- if (PicoAHW & PAHW_32X) {\r
- int only_32x = 0;\r
- if (currentConfig.renderer == RT_16BIT)\r
- only_32x = 1;\r
- else\r
- PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoDraw32xSetFrameMode(1, only_32x);\r
+ if (PicoIn.AHW & PAHW_32X)\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- }\r
- //PicoDraw32xSetFrameMode(0, 0);\r
- //PicoDrawSetOutFormat(PDF_RGB555, 1);\r
}\r
\r
void plat_video_toggle_renderer(int change, int is_menu)\r
emu_status_msg(renderer_names[currentConfig.renderer]);\r
}\r
\r
-void plat_video_menu_enter(int is_rom_loaded)\r
-{\r
-}\r
-\r
-void plat_video_menu_begin(void)\r
-{\r
- g_menuscreen_ptr = g_screen_ptr;\r
-}\r
-\r
-void plat_video_menu_end(void)\r
-{\r
- plat_video_flip();\r
-}\r
-\r
void plat_status_msg_clear(void)\r
{\r
unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height;\r
void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
\r
g_menubg_src_ptr = g_screen_ptr;\r
}\r
\r
-static void oss_write_nonblocking(int len)\r
-{\r
- // sndout_oss_can_write() is not reliable, only use with no_frmlimit\r
- if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
- return;\r
-\r
- sndout_oss_write_nb(PsndOut, len);\r
-}\r
-\r
void pemu_sound_start(void)\r
{\r
- PsndOut = NULL;\r
-\r
- if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
- {\r
- int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
-\r
- PsndRerate(Pico.m.frame_count ? 1 : 0);\r
-\r
- printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
- PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
- sndout_oss_start(PsndRate, is_stereo, 1);\r
- sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
- PicoWriteSound = oss_write_nonblocking;\r
- plat_update_volume(0, 0);\r
- memset(sndBuffer, 0, sizeof(sndBuffer));\r
- PsndOut = sndBuffer;\r
- }\r
-}\r
-\r
-void pemu_sound_stop(void)\r
-{\r
-}\r
-\r
-void pemu_sound_wait(void)\r
-{\r
- // don't need to do anything, writes will block by themselves\r
+ emu_sound_start();\r
}\r
\r
void plat_debug_cat(char *str)\r
void pemu_loop_prep(void)\r
{\r
apply_renderer();\r
- osd_text = osd_text16;\r
-\r
- pemu_sound_start();\r
}\r
\r
void pemu_loop_end(void)\r
{\r
- pemu_sound_stop();\r
-\r
/* do one more frame for menu bg */\r
pemu_forced_frame(0, 1);\r
}\r
}\r
}\r
\r
+void *plat_mem_get_for_drc(size_t size)\r
+{\r
+ return NULL;\r
+}\r
notaz.gp2x.de / picodrive.git / blobdiff