claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some commented out stuff.

Browse Source
This commit is contained in:
OBattler
2025-03-17 00:43:18 +01:00
parent f55736c86b
commit bb1b666010
3 changed files with 3 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cdrom/cdrom.c
View File

@@ -1796,11 +1796,8 @@ cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, const int msf)
position), the rest are stuff like ISRC etc., which can be all zeroes. position), the rest are stuff like ISRC etc., which can be all zeroes.
*/ */
case 0x00: case 0x00:
if (dev->bus_type == CDROM_BUS_ATAPI) { if (dev->bus_type == CDROM_BUS_ATAPI)
// pclog("Format 0 on ATAPI\n");
break; break;
}
// pclog("Format 0 on SCSI\n");
diff = 0; diff = 0;
fallthrough; fallthrough;
case 0x01: case 0x01:
@@ -1847,9 +1844,6 @@ cdrom_get_current_subchannel(cdrom_t *dev, uint8_t *b, const int msf)
b[10] = (dat >> 8) & 0xff; b[10] = (dat >> 8) & 0xff;
b[11] = dat & 0xff; b[11] = dat & 0xff;
} }
// pclog("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
// b[ 0], b[ 1], b[ 2], b[ 3], b[ 4], b[ 5], b[ 6], b[ 7],
// b[ 8], b[ 9], b[10], b[11]);
if (b[0] != 0x00) if (b[0] != 0x00)
break; break;
base += 12; base += 12;

61
src/disk/hdc_ide.c
View File

@@ -1091,7 +1091,6 @@ ide_atapi_callback(ide_t *ide)
ide_irq_raise(ide); ide_irq_raise(ide);
break; break;
case PHASE_DATA_IN_DMA: case PHASE_DATA_IN_DMA:
// pclog("Reading block %i (%i, %i)... ", ide->sc->sector_len + 1, ide->sc->block_len, ide->sc->packet_len);
if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 && if (!IDE_ATAPI_IS_EARLY && !ide_boards[ide->board]->force_ata3 &&
(bm != NULL) && bm->dma) { (bm != NULL) && bm->dma) {
if (ide->sc->block_len == 0) { if (ide->sc->block_len == 0) {
@@ -1119,16 +1118,13 @@ ide_atapi_callback(ide_t *ide)
default: default:
break; break;
case 0: case 0:
// pclog("ERROR\n");
if (ide->bus_master_error) if (ide->bus_master_error)
ide->bus_master_error(ide->sc); ide->bus_master_error(ide->sc);
break; break;
case 2: case 2:
// pclog("WAIT\n");
ide_atapi_command_bus(ide); ide_atapi_command_bus(ide);
break; break;
case 3: case 3:
// pclog("DONE\n");
/* Reached EOT - terminate the command as there's nothing /* Reached EOT - terminate the command as there's nothing
more to transfer. */ more to transfer. */
ide->sc->packet_status = PHASE_COMPLETE; ide->sc->packet_status = PHASE_COMPLETE;
@@ -1138,7 +1134,6 @@ ide_atapi_callback(ide_t *ide)
ide->command_stop(ide->sc); ide->command_stop(ide->sc);
fallthrough; fallthrough;
case 1: case 1:
// pclog("NEXT\n");
if ((ide->sc->packet_status == PHASE_COMPLETE) && if ((ide->sc->packet_status == PHASE_COMPLETE) &&
(ide->sc->callback == 0.0)) (ide->sc->callback == 0.0))
ide_atapi_callback(ide); ide_atapi_callback(ide);
@@ -1214,7 +1209,6 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
ide->tf->pos = dev->request_pos = 0; ide->tf->pos = dev->request_pos = 0;
if (dev->block_len == 0) { if (dev->block_len == 0) {
// pclog("ide_atapi_pio_request(): Processing instant command...\n");
if (out && (ide->phase_data_out != NULL)) if (out && (ide->phase_data_out != NULL))
ide->phase_data_out(dev); ide->phase_data_out(dev);
else if (!out && (ide->command_stop != NULL)) else if (!out && (ide->command_stop != NULL))
@@ -1254,21 +1248,10 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
if (dev->block_len != 0) { if (dev->block_len != 0) {
if (out) { if (out) {
if (ide->write != NULL) { if (ide->write != NULL)
#if 0
pclog("ide_atapi_pio_request(): Continuing write command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->write(dev); ide->write(dev);
}
if (dev->sector_len == 0) { if (dev->sector_len == 0) {
#if 0
pclog("ide_atapi_pio_request(): Ending write command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->sc->packet_status = PHASE_COMPLETE; ide->sc->packet_status = PHASE_COMPLETE;
ide->sc->callback = 0.0; ide->sc->callback = 0.0;
@@ -1279,11 +1262,6 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
} }
} else { } else {
if (dev->sector_len == 0) { if (dev->sector_len == 0) {
#if 0
pclog("ide_atapi_pio_request(): Ending read command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
if (ide->command_stop != NULL) if (ide->command_stop != NULL)
ide->command_stop(dev); ide->command_stop(dev);
@@ -1291,14 +1269,8 @@ ide_atapi_pio_request(ide_t *ide, uint8_t out)
ide->sc->callback = 0.0; ide->sc->callback = 0.0;
ide_atapi_callback(ide); ide_atapi_callback(ide);
} else if (ide->read != NULL) { } else if (ide->read != NULL)
#if 0
pclog("ide_atapi_pio_request(): Continuing read command "
"(dev->sector_len = %i)...\n", dev->sector_len);
#endif
ide->read(dev); ide->read(dev);
}
} }
} }
} }
@@ -1332,26 +1304,6 @@ ide_atapi_packet_read(ide_t *ide)
/* Time for a DRQ. */ /* Time for a DRQ. */
ide_atapi_pio_request(ide, 0); ide_atapi_pio_request(ide, 0);
} }
#if 0
else if ((dev->block_len != 0) &&
(dev->sector_len != 0) &&
((dev->request_pos % dev->block_len) == 0)) {
if (dev->sector_len == 0) {
// pclog("ide_atapi_packet_read(): Ending read command (dev->sector_len = %i)...\n", dev->sector_len);
if (ide->command_stop != NULL)
ide->command_stop(ide->sc);
ide->sc->packet_status = PHASE_COMPLETE;
ide->sc->callback = 0.0;
ide_atapi_callback(ide);
} else if (ide->read != NULL) {
// pclog("ide_atapi_packet_read(): Continuing read command (dev->sector_len = %i)...\n", dev->sector_len);
ide->read(dev);
}
}
#endif
} }
return ret; return ret;
@@ -1386,15 +1338,6 @@ ide_atapi_packet_write(ide_t *ide, const uint16_t val)
/* Time for a DRQ. */ /* Time for a DRQ. */
ide_atapi_pio_request(ide, 1); ide_atapi_pio_request(ide, 1);
} }
#if 0
else if ((dev->block_len != 0) &&
((dev->request_pos % dev->block_len) == 0) &&
(ide->write != NULL)) {
// pclog("ide_atapi_packet_write(): Continuing write command (dev->sector_len = %i)...\n", dev->sector_len);
ide->write(dev);
}
#endif
} else if (dev->packet_status == PHASE_IDLE) { } else if (dev->packet_status == PHASE_IDLE) {
if (ide->tf->pos >= 12) { if (ide->tf->pos >= 12) {
ide->tf->pos = 0; ide->tf->pos = 0;

16
src/scsi/scsi_cdrom.c
View File

@@ -663,8 +663,6 @@ scsi_cdrom_bus_speed(scsi_cdrom_t *dev)
static void static void
scsi_cdrom_set_period(scsi_cdrom_t *dev) scsi_cdrom_set_period(scsi_cdrom_t *dev)
{ {
// const uint8_t cmd = dev->current_cdb[0];
scsi_cdrom_log(dev->log, "Current speed: %ix\n", dev->drv->cur_speed); scsi_cdrom_log(dev->log, "Current speed: %ix\n", dev->drv->cur_speed);
dev->callback = 0; dev->callback = 0;
@@ -689,7 +687,6 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
/* 44100 * 16 bits * 2 channels = 176400 bytes per second */ /* 44100 * 16 bits * 2 channels = 176400 bytes per second */
bytes_per_second = 176400.0; bytes_per_second = 176400.0;
bytes_per_second *= (double) dev->drv->cur_speed; bytes_per_second *= (double) dev->drv->cur_speed;
// pclog("Current speed: %ix\n", dev->drv->cur_speed);
} else { } else {
bytes_per_second = scsi_cdrom_bus_speed(dev); bytes_per_second = scsi_cdrom_bus_speed(dev);
if (bytes_per_second == 0.0) { if (bytes_per_second == 0.0) {
@@ -711,7 +708,6 @@ scsi_cdrom_set_period(scsi_cdrom_t *dev)
(dev->packet_len / dev->block_len)); (dev->packet_len / dev->block_len));
period *= ((double) num) * 2352.0; period *= ((double) num) * 2352.0;
// pclog("[%02X] Calculated period for %i * 2352 bytes\n", cmd, num);
} }
scsi_cdrom_log(dev->log, "Sector transfer period: %" PRIu64 " us\n", scsi_cdrom_log(dev->log, "Sector transfer period: %" PRIu64 " us\n",
(uint64_t) period); (uint64_t) period);
@@ -1082,7 +1078,6 @@ scsi_cdrom_read_data(scsi_cdrom_t *dev, const int msf, const int type, const int
dev->sector_len--; dev->sector_len--;
// pclog("Sector read to buffer position %08X\n", dev->buffer_pos);
dev->buffer_pos += temp_len; dev->buffer_pos += temp_len;
} }
} }
@@ -2470,7 +2465,6 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
break; break;
case GPCMD_REZERO_UNIT: case GPCMD_REZERO_UNIT:
// pclog("Rezero unit\n");
dev->was_cached = 0; dev->was_cached = 0;
scsi_cdrom_stop(sc); scsi_cdrom_stop(sc);
dev->requested_blocks = 0; dev->requested_blocks = 0;
@@ -2505,7 +2499,6 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
case GPCMD_SCAN_PIONEER: case GPCMD_SCAN_PIONEER:
case GPCMD_AUDIO_SCAN: case GPCMD_AUDIO_SCAN:
// pclog("Audio scan\n");
scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS); scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
dev->was_cached = 0; dev->was_cached = 0;
@@ -2552,7 +2545,6 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
scsi_cdrom_buf_alloc(dev, 65536); scsi_cdrom_buf_alloc(dev, 65536);
toc_format = cdb[2] & 0xf; toc_format = cdb[2] & 0xf;
// pclog("READ TOC format %1X\n", toc_format);
if (toc_format == 0) if (toc_format == 0)
toc_format = (cdb[9] >> 6) & 3; toc_format = (cdb[9] >> 6) & 3;
@@ -3170,20 +3162,16 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
msf = 0; msf = 0;
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[7] << 8) | cdb[8]; len = (cdb[7] << 8) | cdb[8];
// pclog("Play audio (10)\n");
break; break;
case GPCMD_PLAY_AUDIO_12: case GPCMD_PLAY_AUDIO_12:
msf = 0; msf = 0;
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
// pclog("Play audio (12)\n");
break; break;
case GPCMD_PLAY_AUDIO_MSF: case GPCMD_PLAY_AUDIO_MSF:
msf = 1; msf = 1;
pos = (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8]; len = (cdb[6] << 16) | (cdb[7] << 8) | cdb[8];
// pclog("Play audio MSF: %2i:%02i.%02i-%2i:%02i.%02i\n",
// cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8]);
break; break;
case GPCMD_PLAY_AUDIO_TRACK_INDEX: case GPCMD_PLAY_AUDIO_TRACK_INDEX:
msf = 2; msf = 2;
@@ -3192,19 +3180,16 @@ scsi_cdrom_command(scsi_common_t *sc, const uint8_t *cdb)
len = cdb[7]; len = cdb[7];
} else } else
ret = 0; ret = 0;
// pclog("Play audio track index\n");
break; break;
case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10: case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10:
msf = 0x100 | cdb[6]; msf = 0x100 | cdb[6];
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[7] << 8) | cdb[8]; len = (cdb[7] << 8) | cdb[8];
// pclog("Play audio track relative (10)\n");
break; break;
case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12: case GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12:
msf = 0x100 | cdb[10]; msf = 0x100 | cdb[10];
pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5]; pos = (cdb[2] << 24) | (cdb[3] << 16) | (cdb[4] << 8) | cdb[5];
len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; len = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9];
// pclog("Play audio track relative (12)\n");
break; break;
default: default:
@@ -3505,7 +3490,6 @@ atapi_out:
case GPCMD_SEEK_6: case GPCMD_SEEK_6:
case GPCMD_SEEK_10: case GPCMD_SEEK_10:
// pclog("Seek\n");
scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS); scsi_cdrom_set_phase(dev, SCSI_PHASE_STATUS);
dev->was_cached = 0; dev->was_cached = 0;