mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

C89 buildfix

Browse Source
This commit is contained in:
Brad Parker 2019-07-09 16:46:53 -04:00
parent 9158ad86a0
commit ae87f87ee3
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,14 +835,18 @@ int cdrom_read_subq(libretro_vfs_implementation_file *stream, unsigned char *buf
static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsigned char track, cdrom_toc_t *toc) static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsigned char track, cdrom_toc_t *toc)
{ {
/* MMC Command: READ TRACK INFORMATION */ /* MMC Command: READ TRACK INFORMATION */
unsigned char cdb[] = {0x52, 0x1, 0, 0, 0, track, 0, 0x1, 0x80, 0}; unsigned char cdb[] = {0x52, 0x1, 0, 0, 0, 0, 0, 0x1, 0x80, 0};
unsigned char buf[384] = {0}; unsigned char buf[384] = {0};
unsigned char mode = 0; unsigned char mode = 0;
unsigned lba = 0; unsigned lba = 0;
unsigned track_size = 0; unsigned track_size = 0;
int rv = cdrom_send_command(stream, DIRECTION_IN, buf, sizeof(buf), cdb, sizeof(cdb), 0); int rv;
ssize_t pregap_lba_len; ssize_t pregap_lba_len;
cdb[5] = track;
rv = cdrom_send_command(stream, DIRECTION_IN, buf, sizeof(buf), cdb, sizeof(cdb), 0);
if (rv) if (rv)
return 1; return 1;
@ -876,7 +880,12 @@ static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsig
int cdrom_set_read_speed(libretro_vfs_implementation_file *stream, unsigned speed) int cdrom_set_read_speed(libretro_vfs_implementation_file *stream, unsigned speed)
{ {
/* MMC Command: SET CD SPEED */ /* MMC Command: SET CD SPEED */
unsigned char cmd[] = {0xBB, 0, (speed >> 24) & 0xFF, (speed >> 16) & 0xFF, (speed >> 8) & 0xFF, speed & 0xFF, 0, 0, 0, 0, 0, 0 }; unsigned char cmd[] = {0xBB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
cmd[2] = (speed >> 24) & 0xFF;
cmd[3] = (speed >> 16) & 0xFF;
cmd[4] = (speed >> 8) & 0xFF;
cmd[5] = speed & 0xFF;
return cdrom_send_command(stream, DIRECTION_NONE, NULL, 0, cmd, sizeof(cmd), 0); return cdrom_send_command(stream, DIRECTION_NONE, NULL, 0, cmd, sizeof(cmd), 0);
} }
@ -1060,9 +1069,13 @@ int cdrom_get_inquiry(const libretro_vfs_implementation_file *stream, char *mode
int cdrom_read(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts, unsigned char min, unsigned char sec, unsigned char frame, void *s, size_t len, size_t skip) int cdrom_read(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts, unsigned char min, unsigned char sec, unsigned char frame, void *s, size_t len, size_t skip)
{ {
/* MMC Command: READ CD MSF */ /* MMC Command: READ CD MSF */
unsigned char cdb[] = {0xB9, 0, 0, min, sec, frame, 0, 0, 0, 0xF8, 0, 0}; unsigned char cdb[] = {0xB9, 0, 0, 0, 0, 0, 0, 0, 0, 0xF8, 0, 0};
int rv; int rv;
cdb[3] = min;
cdb[4] = sec;
cdb[5] = frame;
if (len + skip <= 2352) if (len + skip <= 2352)
{ {
unsigned char next_min = (frame == 74) ? (sec < 59 ? min : min + 1) : min; unsigned char next_min = (frame == 74) ? (sec < 59 ? min : min + 1) : min;

2
libretro-common/include/vfs/vfs_implementation_cdrom.h
View File

@ -28,8 +28,6 @@
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
typedef struct RFILE RFILE;
int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int64_t offset, int whence); int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int64_t offset, int whence);
void retro_vfs_file_open_cdrom( void retro_vfs_file_open_cdrom(