X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmedia.c;h=b7fa7f56732e0c97ce0634db3bb73bc94472a9e6;hb=9a570a67ca07aca39037024d37db1ad33712dbf1;hp=904693f955f2d70643780126bfa698f1c0e5b774;hpb=fa8fb7544593a0ed43f3354cc5f41150464b55bf;p=picodrive.git

diff --git a/pico/media.c b/pico/media.c
index 904693f..b7fa7f5 100644
--- 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;
-  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;
@@ -244,7 +244,7 @@ enum media_type_e PicoLoadMedia(const char *filename,
 
   rom = pm_open(rom_fname);
   if (rom == NULL) {
-    lprintf("Failed to open ROM");
+    lprintf("Failed to open ROM\n");
     media_type = PM_ERROR;
     goto out;
   }
@@ -252,9 +252,9 @@ enum media_type_e PicoLoadMedia(const char *filename,
   ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
   pm_close(rom);
   if (ret != 0) {
-    if      (ret == 2) lprintf("Out of memory");
-    else if (ret == 3) lprintf("Read failed");
-    else               lprintf("PicoCartLoad() failed.");
+    if      (ret == 2) lprintf("Out of memory\n");
+    else if (ret == 3) lprintf("Read failed\n");
+    else               lprintf("PicoCartLoad() failed.\n");
     media_type = PM_ERROR;
     goto out;
   }
@@ -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;