\r
bmem = calloc(1, is_480 ? 480*240*3 : 320*240*3);\r
if (bmem == NULL) return NULL;\r
- ret = readpng(bmem, fname, is_480 ? READPNG_480_24 : READPNG_320_24);\r
+ ret = readpng(bmem, fname, READPNG_24, is_480 ? 480 : 320, 240);\r
if (ret != 0) {\r
free(bmem);\r
return NULL;\r
static void PrepareForROM(void)\r
{\r
unsigned char *rom_data = NULL;\r
- int i, ret, show = PicoAHW & PAHW_PICO;\r
+ int i, ret, show = PicoIn.AHW & PAHW_PICO;\r
\r
PicoGetInternal(PI_ROM, (pint_ret_t *) &rom_data);\r
EnableMenuItem(mmain, 2, MF_BYPOSITION|(show ? MF_ENABLED : MF_GRAYED));\r
/* in_init() must go before config, config accesses in_ fwk */\r
in_init();\r
emu_prep_defconfig();\r
- emu_read_config(0, 0);\r
+ emu_read_config(NULL, 0);\r
config_readlrom(PicoConfigFile);\r
\r
plat_init();\r