Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows IOCTL CD-ROM code no longer stops CD audio when reading disc size. Fixes CD audio in OS/2.

Browse source
This commit is contained in:
TomW 2016-03-31 21:24:01 +01:00
commit db3519657a
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/cdrom-ioctl.c
View file

@ -26,6 +26,7 @@ typedef struct _CDROM_TOC_SESSION_DATA {
static ATAPI ioctl_atapi; static ATAPI ioctl_atapi;
static uint32_t last_block = 0; static uint32_t last_block = 0;
static uint32_t cdrom_capacity = 0;
static int ioctl_inited = 0; static int ioctl_inited = 0;
static char ioctl_path[8]; static char ioctl_path[8];
void ioctl_close(void); void ioctl_close(void);
@ -258,6 +259,31 @@ static int ioctl_ready(void)
return 1; return 1;
} }
static int ioctl_get_last_block(unsigned char starttrack, int msf, int maxlen, int single)
{
long size;
int c;
CDROM_TOC lbtoc;
int lb=0;
if (!cdrom_drive) return 0;
ioctl_cd_state = CD_STOPPED;
ioctl_open(0);
DeviceIoControl(hIOCTL,IOCTL_CDROM_READ_TOC, NULL,0,&lbtoc,sizeof(lbtoc),&size,NULL);
ioctl_close();
tocvalid = 1;
for (c = 0; c <= lbtoc.LastTrack; c++)
{
uint32_t address;
address = MSFtoLBA(toc.TrackData[c].Address[1], toc.TrackData[c].Address[2], toc.TrackData[c].Address[3]);
if (address > lb)
lb = address;
}
return lb;
}
static int ioctl_medium_changed(void) static int ioctl_medium_changed(void)
{ {
long size; long size;
@ -276,6 +302,7 @@ static int ioctl_medium_changed(void)
tocvalid = 1; tocvalid = 1;
if (cdrom_drive != old_cdrom_drive) if (cdrom_drive != old_cdrom_drive)
old_cdrom_drive = cdrom_drive; old_cdrom_drive = cdrom_drive;
cdrom_capacity = ioctl_get_last_block(0, 0, 4096, 0);
return 0; return 0;
} }
if ((ltoc.TrackData[ltoc.LastTrack].Address[1] != toc.TrackData[toc.LastTrack].Address[1]) || if ((ltoc.TrackData[ltoc.LastTrack].Address[1] != toc.TrackData[toc.LastTrack].Address[1]) ||
@ -284,6 +311,7 @@ static int ioctl_medium_changed(void)
{ {
ioctl_cd_state = CD_STOPPED; ioctl_cd_state = CD_STOPPED;
toc = ltoc; toc = ltoc;
cdrom_capacity = ioctl_get_last_block(0, 0, 4096, 0);
return 1; /* TOC mismatches. */ return 1; /* TOC mismatches. */
} }
return 0; /* None of the above, return 0. */ return 0; /* None of the above, return 0. */
@ -393,6 +421,7 @@ static void ioctl_load(void)
ioctl_open(0); ioctl_open(0);
DeviceIoControl(hIOCTL,IOCTL_STORAGE_LOAD_MEDIA,NULL,0,NULL,0,&size,NULL); DeviceIoControl(hIOCTL,IOCTL_STORAGE_LOAD_MEDIA,NULL,0,NULL,0,&size,NULL);
ioctl_close(); ioctl_close();
cdrom_capacity = ioctl_get_last_block(0, 0, 4096, 0);
} }
static void ioctl_readsector(uint8_t *b, int sector) static void ioctl_readsector(uint8_t *b, int sector)
@ -637,11 +666,7 @@ static int ioctl_readtoc_raw(unsigned char *b, int maxlen)
static uint32_t ioctl_size() static uint32_t ioctl_size()
{ {
unsigned char b[4096]; return cdrom_capacity;
atapi->readtoc(b, 0, 0, 4096, 0);
return last_block;
} }
static int ioctl_status() static int ioctl_status()