From a1ccceb9c4ae6c541cc8aff05218d4818e41c876 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Fri, 12 Jan 2024 12:53:08 +0000 Subject: [PATCH] esp.c: remove MacOS TI workaround that pads FIFO transfers to ESP_FIFO_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 Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-17-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 6fd5c8767a..f41b2421f9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -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);