mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdrom: fix conflict with libchdr function names

Browse Source
This commit is contained in:
Brad Parker 2019-07-04 23:05:28 -04:00
parent d0695fc428
commit e8d488ba67
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-common/cdrom/cdrom.c
View File

@ -63,7 +63,7 @@ typedef enum
DIRECTION_OUT DIRECTION_OUT
} CDROM_CMD_Direction; } CDROM_CMD_Direction;
void lba_to_msf(unsigned lba, unsigned char *min, unsigned char *sec, unsigned char *frame) void cdrom_lba_to_msf(unsigned lba, unsigned char *min, unsigned char *sec, unsigned char *frame)
{ {
if (!min || !sec || !frame) if (!min || !sec || !frame)
return; return;
@ -75,7 +75,7 @@ void lba_to_msf(unsigned lba, unsigned char *min, unsigned char *sec, unsigned c
*min = lba; *min = lba;
} }
unsigned msf_to_lba(unsigned char min, unsigned char sec, unsigned char frame) unsigned cdrom_msf_to_lba(unsigned char min, unsigned char sec, unsigned char frame)
{ {
return (min * 60 + sec) * 75 + frame; return (min * 60 + sec) * 75 + frame;
} }
@ -925,7 +925,7 @@ int cdrom_write_cue(libretro_vfs_implementation_file *stream, char **out_buf, si
unsigned char pmin = buf[4 + (i * 11) + 8]; unsigned char pmin = buf[4 + (i * 11) + 8];
unsigned char psec = buf[4 + (i * 11) + 9]; unsigned char psec = buf[4 + (i * 11) + 9];
unsigned char pframe = buf[4 + (i * 11) + 10]; unsigned char pframe = buf[4 + (i * 11) + 10];
unsigned lba = msf_to_lba(pmin, psec, pframe); unsigned lba = cdrom_msf_to_lba(pmin, psec, pframe);
/*printf("i %d control %d adr %d tno %d point %d: ", i, control, adr, tno, point);*/ /*printf("i %d control %d adr %d tno %d point %d: ", i, control, adr, tno, point);*/
/* why is control always 0? */ /* why is control always 0? */
@ -977,7 +977,7 @@ int cdrom_write_cue(libretro_vfs_implementation_file *stream, char **out_buf, si
unsigned char sec = 0; unsigned char sec = 0;
unsigned char frame = 0; unsigned char frame = 0;
lba_to_msf(pregap_lba_len, &min, &sec, &frame); cdrom_lba_to_msf(pregap_lba_len, &min, &sec, &frame);
pos += snprintf(*out_buf + pos, len - pos, " INDEX 00 00:00:00\n"); pos += snprintf(*out_buf + pos, len - pos, " INDEX 00 00:00:00\n");
pos += snprintf(*out_buf + pos, len - pos, " INDEX 01 %02u:%02u:%02u\n", (unsigned)min, (unsigned)sec, (unsigned)frame); pos += snprintf(*out_buf + pos, len - pos, " INDEX 01 %02u:%02u:%02u\n", (unsigned)min, (unsigned)sec, (unsigned)frame);
@ -1055,9 +1055,9 @@ int cdrom_read(libretro_vfs_implementation_file *stream, unsigned char min, unsi
} }
else else
{ {
unsigned frames = msf_to_lba(min, sec, frame) + ceil((len + skip) / 2352.0); unsigned frames = cdrom_msf_to_lba(min, sec, frame) + ceil((len + skip) / 2352.0);
lba_to_msf(frames, &cdb[6], &cdb[7], &cdb[8]); cdrom_lba_to_msf(frames, &cdb[6], &cdb[7], &cdb[8]);
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("multi-frame read: from %d %d %d to %d %d %d skip %" PRId64 "\n", cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], skip); printf("multi-frame read: from %d %d %d to %d %d %d skip %" PRId64 "\n", cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], skip);

4
libretro-common/include/cdrom/cdrom.h
View File

@ -64,9 +64,9 @@ typedef struct
cdrom_track_t track[99]; cdrom_track_t track[99];
} cdrom_toc_t; } cdrom_toc_t;
void lba_to_msf(unsigned lba, unsigned char *min, unsigned char *sec, unsigned char *frame); void cdrom_lba_to_msf(unsigned lba, unsigned char *min, unsigned char *sec, unsigned char *frame);
unsigned msf_to_lba(unsigned char min, unsigned char sec, unsigned char frame); unsigned cdrom_msf_to_lba(unsigned char min, unsigned char sec, unsigned char frame);
void increment_msf(unsigned char *min, unsigned char *sec, unsigned char *frame); void increment_msf(unsigned char *min, unsigned char *sec, unsigned char *frame);

18
libretro-common/vfs/vfs_implementation_cdrom.c
View File

@ -81,7 +81,7 @@ int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int6
new_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352); new_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352);
seek_type = "SEEK_CUR"; seek_type = "SEEK_CUR";
lba_to_msf(new_lba, &min, &sec, &frame); cdrom_lba_to_msf(new_lba, &min, &sec, &frame);
break; break;
} }
@ -90,7 +90,7 @@ int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int6
ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio ? 0 : (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba_start)); ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio ? 0 : (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba_start));
ssize_t lba_len = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_size - pregap_lba_len; ssize_t lba_len = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_size - pregap_lba_len;
lba_to_msf(lba_len + lba, &min, &sec, &frame); cdrom_lba_to_msf(lba_len + lba, &min, &sec, &frame);
stream->cdrom.byte_pos = lba_len * 2352; stream->cdrom.byte_pos = lba_len * 2352;
seek_type = "SEEK_END"; seek_type = "SEEK_END";
@ -102,7 +102,7 @@ int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int6
{ {
seek_type = "SEEK_SET"; seek_type = "SEEK_SET";
stream->cdrom.byte_pos = offset; stream->cdrom.byte_pos = offset;
lba_to_msf(vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352), &min, &sec, &frame); cdrom_lba_to_msf(vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352), &min, &sec, &frame);
break; break;
} }
} }
@ -110,7 +110,7 @@ int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int6
stream->cdrom.cur_min = min; stream->cdrom.cur_min = min;
stream->cdrom.cur_sec = sec; stream->cdrom.cur_sec = sec;
stream->cdrom.cur_frame = frame; stream->cdrom.cur_frame = frame;
stream->cdrom.cur_lba = msf_to_lba(min, sec, frame); stream->cdrom.cur_lba = cdrom_msf_to_lba(min, sec, frame);
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("CDROM Seek %s: Path %s Offset %" PRIu64 " is now at %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)...\n", seek_type, stream->orig_path, offset, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, stream->cdrom.cur_lba); printf("CDROM Seek %s: Path %s Offset %" PRIu64 " is now at %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)...\n", seek_type, stream->orig_path, offset, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, stream->cdrom.cur_lba);
@ -273,14 +273,14 @@ void retro_vfs_file_open_cdrom(
stream->cdrom.cur_min = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].min; stream->cdrom.cur_min = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].min;
stream->cdrom.cur_sec = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].sec; stream->cdrom.cur_sec = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].sec;
stream->cdrom.cur_frame = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].frame; stream->cdrom.cur_frame = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].frame;
stream->cdrom.cur_lba = msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame);
} }
else else
{ {
stream->cdrom.cur_min = vfs_cdrom_toc.track[0].min; stream->cdrom.cur_min = vfs_cdrom_toc.track[0].min;
stream->cdrom.cur_sec = vfs_cdrom_toc.track[0].sec; stream->cdrom.cur_sec = vfs_cdrom_toc.track[0].sec;
stream->cdrom.cur_frame = vfs_cdrom_toc.track[0].frame; stream->cdrom.cur_frame = vfs_cdrom_toc.track[0].frame;
stream->cdrom.cur_lba = msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame);
} }
} }
@ -364,7 +364,7 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
unsigned char sec = 0; unsigned char sec = 0;
unsigned char frame = 0; unsigned char frame = 0;
lba_to_msf(stream->cdrom.cur_lba, &min, &sec, &frame); cdrom_lba_to_msf(stream->cdrom.cur_lba, &min, &sec, &frame);
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("CDROM Read: Reading %" PRIu64 " bytes from %s starting at byte offset %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u) skip %" PRIu64 "...\n", len, stream->orig_path, stream->cdrom.byte_pos, (unsigned)min, (unsigned)sec, (unsigned)frame, stream->cdrom.cur_lba, skip); printf("CDROM Read: Reading %" PRIu64 " bytes from %s starting at byte offset %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u) skip %" PRIu64 "...\n", len, stream->orig_path, stream->cdrom.byte_pos, (unsigned)min, (unsigned)sec, (unsigned)frame, stream->cdrom.cur_lba, skip);
@ -385,10 +385,10 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
stream->cdrom.byte_pos += len; stream->cdrom.byte_pos += len;
stream->cdrom.cur_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352); stream->cdrom.cur_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352);
lba_to_msf(stream->cdrom.cur_lba, &stream->cdrom.cur_min, &stream->cdrom.cur_sec, &stream->cdrom.cur_frame); cdrom_lba_to_msf(stream->cdrom.cur_lba, &stream->cdrom.cur_min, &stream->cdrom.cur_sec, &stream->cdrom.cur_frame);
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("CDROM read %" PRIu64 " bytes, position is now: %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)\n", len, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame)); printf("CDROM read %" PRIu64 " bytes, position is now: %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)\n", len, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame));
fflush(stdout); fflush(stdout);
#endif #endif