Skip to content

Commit

Permalink
esp.c: rename data_in_ready to to data_ready
Browse files Browse the repository at this point in the history
This field is currently used to handle deferred interrupts for the DATA IN phase
but the code will soon be updated to do the same for the DATA OUT phase.

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-58-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 b46a43a commit 8dded6d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ static void do_command_phase(ESPState *s)
* Switch to DATA IN phase but wait until initial data xfer is
* complete before raising the command completion interrupt
*/
s->data_in_ready = false;
s->data_ready = false;
esp_set_phase(s, STAT_DI);
} else {
esp_set_phase(s, STAT_DO);
Expand Down Expand Up @@ -859,12 +859,12 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
s->async_len = len;
s->async_buf = scsi_req_get_buf(req);

if (!to_device && !s->data_in_ready) {
if (!to_device && !s->data_ready) {
/*
* Initial incoming data xfer is complete so raise command
* completion interrupt
*/
s->data_in_ready = true;
s->data_ready = true;
s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s);
}
Expand Down Expand Up @@ -1241,7 +1241,7 @@ const VMStateDescription vmstate_esp = {
VMSTATE_UINT32_TEST(mig_cmdlen, ESPState, esp_is_before_version_5),
VMSTATE_UINT32(do_cmd, ESPState),
VMSTATE_UINT32_TEST(mig_dma_left, ESPState, esp_is_before_version_5),
VMSTATE_BOOL_TEST(data_in_ready, ESPState, esp_is_version_5),
VMSTATE_BOOL_TEST(data_ready, ESPState, esp_is_version_5),
VMSTATE_UINT8_TEST(cmdfifo_cdb_offset, ESPState, esp_is_version_5),
VMSTATE_FIFO8_TEST(fifo, ESPState, esp_is_version_5),
VMSTATE_FIFO8_TEST(cmdfifo, ESPState, esp_is_version_5),
Expand Down
2 changes: 1 addition & 1 deletion include/hw/scsi/esp.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct ESPState {
uint8_t lun;
uint32_t do_cmd;

bool data_in_ready;
bool data_ready;
uint8_t ti_cmd;
int dma_enabled;

Expand Down

0 comments on commit 8dded6d

Please sign in to comment.