notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
musashi: run same amount of cycles as other cores
[picodrive.git]
/
pico
/
media.c
diff --git
a/pico/media.c
b/pico/media.c
index
904693f
..
3ba4532
100644
(file)
--- a/
pico/media.c
+++ b/
pico/media.c
@@
-198,7
+198,7
@@
enum media_type_e PicoLoadMedia(const char *filename,
{
const char *rom_fname = filename;
enum media_type_e media_type;
{
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;
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)
goto out;
if ((PicoAHW & PAHW_MCD) && Pico_mcd != NULL)
-
Stop_CD
();
+
cdd_unload
();
PicoCartUnload();
PicoAHW = 0;
PicoQuirks = 0;
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) {
// 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;
if (ret != 0) {
PicoCartUnload();
media_type = PM_BAD_CD;