diff mbox series

[11/88] esp.c: remove unused case from esp_pdma_read()

Message ID	20240112125420.514425-12-mark.cave-ayland@ilande.co.uk
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, laurent@vivier.eu, thuth@redhat.com, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 12:53:03 +0000 Message-Id: <20240112125420.514425-12-mark.cave-ayland@ilande.co.uk> In-Reply-To: <20240112125420.514425-1-mark.cave-ayland@ilande.co.uk> References: <20240112125420.514425-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [PATCH 11/88] esp.c: remove unused case from esp_pdma_read() Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Series	esp: rework ESP emulation to use a SCSI phase-based state machine \| expand [00/88] esp: rework ESP emulation to use a SCSI phase-based state machine [01/88] esp: don't clear cmdfifo when esp_select() fails in get_cmd() [02/88] esp: move existing request cancel check into esp_select() [03/88] esp.c: add FIFO wraparound support to esp_fifo_pop_buf() [04/88] esp: remove FIFO clear from esp_select() [05/88] esp: move esp_select() to ESP selection commands from get_cmd() [06/88] esp: update esp_set_tc() to set STAT_TC flag [07/88] esp: start removal of manual STAT_TC setting when transfer counter reaches zero [08/88] esp: move command execution logic to new esp_run_cmd() function [09/88] esp: update TC check logic in do_dma_pdma_cb() to check for TC == 0 [10/88] esp: move buffer and TC logic into separate to/from device paths in esp_do_dma() [11/88] esp.c: remove unused case from esp_pdma_read() [12/88] esp.c: don't accumulate directly into cmdfifo [13/88] esp.c: decrement the TC during MESSAGE OUT and COMMAND phases [14/88] esp.c: introduce esp_set_phase() helper function [15/88] esp.c: remove another set of manual STAT_TC updates [16/88] esp.c: remove MacOS TI workaround that pads FIFO transfers to ESP_FIFO_SZ [17/88] esp.c: don't reset the TC and ESP_RSEQ state when executing a SCSI command [18/88] esp.c: don't clear RFLAGS register when DMA is complete [19/88] esp: remove zero transfer size check from esp_do_dma() [20/88] esp.c: update condition for esp_dma_done() in esp_do_dma() from device path [21/88] esp.c: update condition for esp_dma_done() in esp_do_dma() to device path [22/88] esp.c: ensure that the PDMA callback is called for every device read [23/88] esp.c: don't immediately raise INTR_BS if SCSI data needed in esp_do_dma() [24/88] esp.c: remove TC adjustment in esp_do_dma() from device path [25/88] esp.c: remove unaligned adjustment in do_dma_pdma_cb() to device path [26/88] esp.c: remove unneeded if() check in esp_transfer_data() [27/88] esp.c: update end of transfer logic at the end of esp_transfer_data() [28/88] esp.c: consolidate async_len and TC == 0 checks in do_dma_pdma_cb() and esp_do_dma() [29/88] esp.c: fix premature end of phase logic esp_command_complete [30/88] esp.c: move TC and FIFO check logic into esp_dma_done() [31/88] esp.c: rename esp_dma_done() to esp_dma_ti_check() [32/88] esp.c: copy PDMA logic for transfers to device from do_dma_pdma_cb() to esp_do_dma() [33/88] esp.c: copy logic for do_cmd transfers from do_dma_pdma_cb() to esp_do_dma() [34/88] esp.c: update esp_do_dma() bypass if async_len is zero to include non-zero transfer check [35/88] esp.c: move end of SCSI transfer check after TC adjustment in do_dma_pdma_cb() [36/88] esp.c: remove s_without_satn_pdma_cb() PDMA callback [37/88] esp.c: introduce esp_get_phase() function [38/88] esp.c: convert esp_do_dma() to switch statement based upon SCSI phase [39/88] esp.c: convert do_dma_pdma_db() to switch statement based upon SCSI phase [40/88] esp.c: convert esp_do_nodma() to switch statement based upon SCSI phase [41/88] esp.c: convert esp_do_dma() do_cmd path to check for SCSI phase instead [42/88] esp.c: convert do_dma_pdma_cb() do_cmd path to check for SCSI phase instead [43/88] esp.c: convert esp_do_nodma() do_cmd path to check for SCSI phase instead [44/88] esp.c: convert esp_reg_write() do_cmd path to check for SCSI phase instead [45/88] esp.c: remove do_cmd from ESPState [46/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in esp_do_dma() [47/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in do_dma_pdma_cb() [48/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in esp_do_nodma() [49/88] esp.c: move CMD_SELATN end of message phase detection to esp_do_dma() and do_dma_pdma_cb() [50/88] esp.c: move CMD_TI end of message phase detection to esp_do_dma() and do_dma_pdma_cb() [51/88] esp.c: don't use get_cmd() for CMD_SEL DMA commands [52/88] esp.c: move CMD_SELATNS end of command logic to esp_do_dma() and do_dma_pdma_cb() [53/88] esp.c: replace do_dma_pdma_cb() with esp_do_dma() [54/88] esp.c: move CMD_ICCS command logic to esp_do_dma() [55/88] esp.c: always use esp_do_dma() in pdma_cb() [56/88] esp.c: remove unused PDMA callback implementation [57/88] esp.c: rename data_in_ready to to data_ready [58/88] esp.c: separate logic based upon ESP command in esp_command_complete() [59/88] esp.c: separate logic based upon ESP command in esp_transfer_data() [60/88] esp.c: use deferred interrupts for both DATA IN and DATA OUT phases [61/88] esp.c: remove DATA IN phase logic when reading from FIFO [62/88] esp.c: zero command register when TI command terminates due to phase change [63/88] esp.c: remove unneeded ti_cmd field [64/88] esp.c: don't raise INTR_BS interrupt in DATA IN phase until TI command issued [65/88] esp.c: move non-DMA TI logic to separate esp_nodma_ti_dataout() function [66/88] esp.c: process non-DMA FIFO writes in esp_do_nodma() [67/88] esp.c: replace get_cmd() with esp_do_nodma() [68/88] esp.c: move write_response() non-DMA logic to esp_do_nodma() [69/88] esp.c: consolidate end of command sequence after ICCS command [70/88] esp.c: ensure that STAT_INT is cleared when reading ESP_RINTR [71/88] esp.c: don't clear the SCSI phase when reading ESP_RINTR [72/88] esp.c: handle TC underflow for DMA SCSI requests [73/88] esp.c: remove restriction on FIFO read access when DMA memory routines defined [74/88] esp.c: handle non-DMA FIFO writes used to terminate DMA commands [75/88] esp.c: improve ESP_RSEQ logic consolidation [76/88] esp.c: only transfer non-DMA COMMAND phase data for specific commands [77/88] esp.c: only transfer non-DMA MESSAGE OUT phase data for specific commands [78/88] esp.c: consolidate DMA and PDMA logic in DATA OUT phase [79/88] esp.c: consolidate DMA and PDMA logic in DATA IN phase [80/88] esp.c: consolidate DMA and PDMA logic in MESSAGE OUT phase [81/88] esp.c: remove redundant n variable in PDMA COMMAND phase [82/88] esp.c: consolidate DMA and PDMA logic in STATUS and MESSAGE IN phases [83/88] esp.c: replace n variable with len in esp_do_nodma() [84/88] esp.c: implement DMA Transfer Pad command for DATA phases [85/88] esp.c: rename irq_data IRQ to drq_irq [86/88] esp.c: keep track of the DRQ state during DMA [87/88] esp.c: switch TypeInfo registration to use DEFINE_TYPES() macro [88/88] esp.c: add my copyright to the file

Commit Message

Mark Cave-Ayland Jan. 12, 2024, 12:53 p.m. UTC

The do_cmd variable is only set for the MESSAGE OUT and COMMAND phases i.e.
those which involve transfers from the host to the SCSI bus, and so the unused
case can be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/scsi/esp.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 9893840255..6191c17f10 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -187,12 +187,7 @@  static uint8_t esp_pdma_read(ESPState *s)
 {
     uint8_t val;
 
-    if (s->do_cmd) {
-        val = esp_fifo_pop(&s->cmdfifo);
-    } else {
-        val = esp_fifo_pop(&s->fifo);
-    }
-
+    val = esp_fifo_pop(&s->fifo);
     return val;
 }