Merge from libretro/master:7ff457f for repo synchronization

This commit is contained in:
kub 2022-04-19 23:58:59 +02:00
parent 45d0add214
commit a5085db3ea
19 changed files with 1015 additions and 311 deletions

View file

@ -188,7 +188,8 @@ size_t pm_read(void *ptr, size_t bytes, pm_file *stream);
size_t pm_read_audio(void *ptr, size_t bytes, pm_file *stream);
int pm_seek(pm_file *stream, long offset, int whence);
int pm_close(pm_file *fp);
int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms);
int PicoCartLoad(pm_file *f, const unsigned char *rom, unsigned int romsize,
unsigned char **prom, unsigned int *psize, int is_sms);
int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_cfg);
void PicoCartUnload(void);
extern void (*PicoCartLoadProgressCB)(int percent);
@ -299,6 +300,7 @@ typedef struct
enum media_type_e PicoLoadMedia(const char *filename,
const unsigned char *rom, unsigned int romsize,
const char *carthw_cfg_fname,
const char *(*get_bios_filename)(int *region, const char *cd_fname),
void (*do_region_override)(const char *media_filename));