notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
error checking for png
[picodrive.git]
/
Pico
/
cd
/
cd_sys.c
diff --git
a/Pico/cd/cd_sys.c
b/Pico/cd/cd_sys.c
index
003c825
..
03bf0d2
100644
(file)
--- a/
Pico/cd/cd_sys.c
+++ b/
Pico/cd/cd_sys.c
@@
-13,8
+13,6
@@
#include "cd_sys.h"
\r
#include "cd_file.h"
\r
\r
#include "cd_sys.h"
\r
#include "cd_file.h"
\r
\r
-#define cdprintf dprintf
\r
-//#define cdprintf(x...)
\r
#define DEBUG_CD
\r
\r
#define TRAY_OPEN 0x0500 // TRAY OPEN CDD status
\r
#define DEBUG_CD
\r
\r
#define TRAY_OPEN 0x0500 // TRAY OPEN CDD status
\r
@@
-198,16
+196,16
@@
PICO_INTERNAL void Reset_CD(void)
}
\r
\r
\r
}
\r
\r
\r
-int Insert_CD(char *
iso_name, int is_bin
)
\r
+int Insert_CD(char *
cdimg_name, int type
)
\r
{
\r
{
\r
- int ret =
0
;
\r
+ int ret =
1
;
\r
\r
CD_Present = 0;
\r
Pico_mcd->scd.Status_CDD = NOCD;
\r
\r
\r
CD_Present = 0;
\r
Pico_mcd->scd.Status_CDD = NOCD;
\r
\r
- if (
iso_name != NULL
)
\r
+ if (
cdimg_name != NULL && type != CIT_NOT_CD
)
\r
{
\r
{
\r
- ret = Load_
ISO(iso_name, is_bin
);
\r
+ ret = Load_
CD_Image(cdimg_name, type
);
\r
if (ret == 0) {
\r
CD_Present = 1;
\r
Pico_mcd->scd.Status_CDD = READY;
\r
if (ret == 0) {
\r
CD_Present = 1;
\r
Pico_mcd->scd.Status_CDD = READY;
\r
@@
-491,8
+489,7
@@
PICO_INTERNAL int Play_CDD_c3(void)
else
\r
{
\r
Pico_mcd->s68k_regs[0x36] &= ~0x01; // AUDIO
\r
else
\r
{
\r
Pico_mcd->s68k_regs[0x36] &= ~0x01; // AUDIO
\r
- //CD_Audio_Starting = 1;
\r
- FILE_Play_CD_LBA();
\r
+ cdda_start_play();
\r
}
\r
\r
if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
\r
}
\r
\r
if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
\r
@@
-594,8
+591,7
@@
PICO_INTERNAL int Resume_CDD_c7(void)
else
\r
{
\r
Pico_mcd->s68k_regs[0x36] &= ~0x01; // AUDIO
\r
else
\r
{
\r
Pico_mcd->s68k_regs[0x36] &= ~0x01; // AUDIO
\r
- //CD_Audio_Starting = 1;
\r
- FILE_Play_CD_LBA();
\r
+ cdda_start_play();
\r
}
\r
\r
if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
\r
}
\r
\r
if (Pico_mcd->scd.Cur_Track == 100) Pico_mcd->cdd.Minute = 0x0A02;
\r
@@
-660,7
+656,7
@@
PICO_INTERNAL int Close_Tray_CDD_cC(void)
\r
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
\r
\r
\r
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
\r
\r
-
printf(
"tray close\n");
\r
+
elprintf(EL_STATUS,
"tray close\n");
\r
\r
if (PicoMCDcloseTray != NULL)
\r
CD_Present = PicoMCDcloseTray();
\r
\r
if (PicoMCDcloseTray != NULL)
\r
CD_Present = PicoMCDcloseTray();
\r
@@
-685,7
+681,7
@@
PICO_INTERNAL int Open_Tray_CDD_cD(void)
\r
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
\r
\r
\r
Pico_mcd->scd.Status_CDC &= ~1; // Stop CDC read
\r
\r
-
printf(
"tray open\n");
\r
+
elprintf(EL_STATUS,
"tray open\n");
\r
\r
Unload_ISO();
\r
CD_Present = 0;
\r
\r
Unload_ISO();
\r
CD_Present = 0;
\r