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

Implement ATAPI Stop Play/Scan command.

Browse source 
Stop CD audio playback on IDE reset, ATAPI reset, and hard reset.
This commit is contained in:
TomW 2015-09-30 20:45:47 +01:00
commit 60d75012df
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ide.c
View file

@ -80,6 +80,7 @@
#define GPCMD_SEND_DVD_STRUCTURE 0xad #define GPCMD_SEND_DVD_STRUCTURE 0xad
#define GPCMD_SET_SPEED 0xbb #define GPCMD_SET_SPEED 0xbb
#define GPCMD_START_STOP_UNIT 0x1b #define GPCMD_START_STOP_UNIT 0x1b
#define GPCMD_STOP_PLAY_SCAN 0x4e
#define GPCMD_TEST_UNIT_READY 0x00 #define GPCMD_TEST_UNIT_READY 0x00
/* Mode page codes for mode sense/set */ /* Mode page codes for mode sense/set */
@ -1127,9 +1128,15 @@ void callbackide(int ide_board)
ide->reset = ide_other->reset = 0; ide->reset = ide_other->reset = 0;
ide->blocksize = ide_other->blocksize = 0; ide->blocksize = ide_other->blocksize = 0;
if (IDE_DRIVE_IS_CDROM(ide)) if (IDE_DRIVE_IS_CDROM(ide))
{
ide->cylinder=0xEB14; ide->cylinder=0xEB14;
atapi->stop();
}
if (IDE_DRIVE_IS_CDROM(ide_other)) if (IDE_DRIVE_IS_CDROM(ide_other))
{
ide_other->cylinder=0xEB14; ide_other->cylinder=0xEB14;
atapi->stop();
}
// pclog("Reset callback\n"); // pclog("Reset callback\n");
return; return;
} }
@ -1143,6 +1150,7 @@ void callbackide(int ide_board)
if (IDE_DRIVE_IS_CDROM(ide)) { if (IDE_DRIVE_IS_CDROM(ide)) {
ide->cylinder = 0xeb14; ide->cylinder = 0xeb14;
ide->atastat = 0; ide->atastat = 0;
atapi->stop();
} else { } else {
ide->cylinder = 0; ide->cylinder = 0;
} }
@ -2005,7 +2013,13 @@ static void atapicommand(int ide_board)
ide->packetstatus=0x80; ide->packetstatus=0x80;
idecallback[ide_board]=50*IDE_TIME; idecallback[ide_board]=50*IDE_TIME;
break; break;
case GPCMD_STOP_PLAY_SCAN:
if (!atapi->ready()) { atapi_notready(ide); return; }
atapi->stop();
ide->packetstatus=2;
idecallback[ide_board]=50*IDE_TIME;
break;
/* default: /* default:
pclog("Bad ATAPI command %02X\n",idebufferb[0]); pclog("Bad ATAPI command %02X\n",idebufferb[0]);
pclog("Packet data :\n"); pclog("Packet data :\n");

1
src/sound.c
View file

@ -180,4 +180,5 @@ void sound_reset()
sound_handlers_num = 0; sound_handlers_num = 0;
sound_set_cd_volume(65535, 65535); sound_set_cd_volume(65535, 65535);
ioctl_audio_stop();
} }