cd: switch to CD drive emu code from genplus

same license, much cleaner code
This commit is contained in:
notaz 2013-10-06 21:08:07 +03:00
parent 3f23709ef3
commit 274fcc35aa
25 changed files with 1798 additions and 1824 deletions

View file

@ -198,7 +198,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
{
const char *rom_fname = filename;
enum media_type_e media_type;
cd_img_type cd_img_type = CIT_NOT_CD;
enum cd_img_type cd_img_type = CIT_NOT_CD;
unsigned char *rom_data = NULL;
unsigned int rom_size = 0;
pm_file *rom = NULL;
@ -210,7 +210,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
goto out;
if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
Stop_CD();
cdd_unload();
PicoCartUnload();
PicoAHW = 0;
PicoQuirks = 0;
@ -291,7 +291,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
// insert CD if it was detected
if (cd_img_type != CIT_NOT_CD) {
ret = Insert_CD(filename, cd_img_type);
ret = cdd_load(filename, cd_img_type);
if (ret != 0) {
PicoCartUnload();
media_type = PM_BAD_CD;