Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge cleanup from MAME 0.238 release branch to avoid conflicts later.

Browse Source
This commit is contained in:
Vas Crabb 2021-11-22 02:59:06 +11:00
commit 246ba1f482
3 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hash/sgi_mips.xml
View File

@ -1834,7 +1834,7 @@ license:CC0
</software> </software>
<software name="tido_4_0_5epl"> <software name="tido_4_0_5epl">
<description>Trusted IRIS Development Option 4.0.5 EPL"</description> <description>Trusted IRIS Development Option 4.0.5 EPL</description>
<year>1995</year> <!-- 02/95 --> <year>1995</year> <!-- 02/95 -->
<publisher>Silicon Graphics</publisher> <publisher>Silicon Graphics</publisher>
<part name="cdrom" interface="cdrom"> <part name="cdrom" interface="cdrom">

7
language/Greek/strings.po
View File

@ -7633,10 +7633,3 @@ msgid ""
msgstr "" msgstr ""
"Δώστε ακολουθία ή πατήστε %s για ακύρωση\n" "Δώστε ακολουθία ή πατήστε %s για ακύρωση\n"
"%s" "%s"
#~ msgid "Device Mapping"
#~ msgstr "Χαρτογράφηση Συσκευών"
#~ msgctxt "input-name"
#~ msgid "Write current timecode"
#~ msgstr "Εγγραφή τρέχοντος χρονοκώδικα"

31
src/devices/machine/wd_fdc.cpp
View File

@ -614,8 +614,7 @@ void wd_fdc_device_base::read_sector_continue()
case SECTOR_READ: case SECTOR_READ:
LOGSTATE("SECTOR_READ\n"); LOGSTATE("SECTOR_READ\n");
if(cur_live.crc) if(cur_live.crc) {
{
status |= S_CRC; status |= S_CRC;
LOGCRC("CRC error in readsector %04X\n",cur_live.crc); LOGCRC("CRC error in readsector %04X\n",cur_live.crc);
} }
@ -1025,13 +1024,10 @@ void wd_fdc_device_base::interrupt_start()
// at the end of a multiple sector write occasionally prevents the CRC byte being // at the end of a multiple sector write occasionally prevents the CRC byte being
// written, causing the disk to be corrupted. // written, causing the disk to be corrupted.
if(/*((main_state == READ_SECTOR) && (cur_live.state == READ_SECTOR_DATA)) ||*/ if(/*((main_state == READ_SECTOR) && (cur_live.state == READ_SECTOR_DATA)) ||*/
((main_state == WRITE_SECTOR) && (cur_live.state == WRITE_BYTE))) ((main_state == WRITE_SECTOR) && (cur_live.state == WRITE_BYTE))) {
{
delay_int = true; delay_int = true;
return; return;
} } else {
else
{
delay_int = false; delay_int = false;
} }
@ -1043,9 +1039,7 @@ void wd_fdc_device_base::interrupt_start()
status &= ~S_BUSY; status &= ~S_BUSY;
drop_drq(); drop_drq();
motor_timeout = 0; motor_timeout = 0;
} } else {
else
{
// when a force interrupt command is issued and there is no // when a force interrupt command is issued and there is no
// currently running command, return the status type 1 bits // currently running command, return the status type 1 bits
status_type_1 = true; status_type_1 = true;
@ -1059,8 +1053,7 @@ void wd_fdc_device_base::interrupt_start()
intrq_cb(intrq); intrq_cb(intrq);
} }
if (spinup_on_interrupt) // see notes in FD1771 and WD1772 constructors, might be true for other FDC types as well. if(spinup_on_interrupt) { // see notes in FD1771 and WD1772 constructors, might be true for other FDC types as well.
{
motor_timeout = 0; motor_timeout = 0;
if (head_control) if (head_control)
@ -1984,11 +1977,9 @@ void wd_fdc_device_base::live_run(attotime limit)
} else if(slot < sector_size+2) { } else if(slot < sector_size+2) {
// CRC // CRC
if(slot == sector_size+1) if(slot == sector_size+1) {
{
// act on delayed interrupt if active // act on delayed interrupt if active
/* if (delay_int) /* if(delay_int) {
{
interrupt_start(); interrupt_start();
return; return;
} }
@ -2210,10 +2201,8 @@ void wd_fdc_device_base::live_run(attotime limit)
// Act on delayed interrupt if set. // Act on delayed interrupt if set.
if(delay_int) if(delay_int)
{
interrupt_start(); interrupt_start();
return;
}
return; return;
} }
@ -2250,10 +2239,8 @@ void wd_fdc_device_base::live_run(attotime limit)
// Act on delayed interrupt if set. // Act on delayed interrupt if set.
if(delay_int) if(delay_int)
{
interrupt_start(); interrupt_start();
return;
}
return; return;
} }
} }