Skip to content

Commit

Permalink
esp.c: remove MacOS TI workaround that pads FIFO transfers to ESP_FIF…
Browse files Browse the repository at this point in the history
…O_SZ

This workaround is no longer required with the current code and so can be
removed.

[Note: whilst MacOS itself can boot correctly, removing this hack prevents
a bootable EMILE CDROM from working. This is caused by a separate bug which
will be fixed by a subsequent patch]

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-17-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  • Loading branch information
mcayland committed Feb 13, 2024
1 parent f0a24ee commit a1ccceb
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,18 +772,6 @@ static void esp_do_dma(ESPState *s)
s->async_buf += len;
s->async_len -= len;
s->ti_size -= len;

/*
* MacOS toolbox uses a TI length of 16 bytes for all commands, so
* commands shorter than this must be padded accordingly
*/
if (len < esp_get_tc(s) && esp_get_tc(s) <= ESP_FIFO_SZ) {
while (fifo8_num_used(&s->fifo) < ESP_FIFO_SZ) {
esp_fifo_push(&s->fifo, 0);
len++;
}
}

esp_set_tc(s, esp_get_tc(s) - len);
esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
esp_raise_drq(s);
Expand Down

0 comments on commit a1ccceb

Please sign in to comment.