motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

esp: checkpatch fixes

Browse source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210304221103.6369-2-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:22 +00:00
parent 91e92cad67
commit 94d5c79d32
1 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

52
hw/scsi/esp.c
View file

@ -241,8 +241,9 @@ static void handle_satn(ESPState *s)
} }
s->pdma_cb = satn_pdma_cb; s->pdma_cb = satn_pdma_cb;
len = get_cmd(s, buf, sizeof(buf)); len = get_cmd(s, buf, sizeof(buf));
if (len) if (len) {
do_cmd(s, buf); do_cmd(s, buf);
}
} }
static void s_without_satn_pdma_cb(ESPState *s) static void s_without_satn_pdma_cb(ESPState *s)
@ -398,8 +399,8 @@ static void esp_do_dma(ESPState *s)
* handle_ti_cmd() with do_cmd != NULL (see the assert()) * handle_ti_cmd() with do_cmd != NULL (see the assert())
*/ */
trace_esp_do_dma(s->cmdlen, len); trace_esp_do_dma(s->cmdlen, len);
assert (s->cmdlen <= sizeof(s->cmdbuf) && assert(s->cmdlen <= sizeof(s->cmdbuf) &&
len <= sizeof(s->cmdbuf) - s->cmdlen); len <= sizeof(s->cmdbuf) - s->cmdlen);
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len); s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len);
} else { } else {
@ -445,15 +446,18 @@ static void esp_do_dma(ESPState *s)
s->dma_left -= len; s->dma_left -= len;
s->async_buf += len; s->async_buf += len;
s->async_len -= len; s->async_len -= len;
if (to_device) if (to_device) {
s->ti_size += len; s->ti_size += len;
else } else {
s->ti_size -= len; s->ti_size -= len;
}
if (s->async_len == 0) { if (s->async_len == 0) {
scsi_req_continue(s->current_req); scsi_req_continue(s->current_req);
/* If there is still data to be read from the device then /*
complete the DMA operation immediately. Otherwise defer * If there is still data to be read from the device then
until the scsi layer has completed. */ * complete the DMA operation immediately. Otherwise defer
* until the scsi layer has completed.
*/
if (to_device || s->dma_left != 0 || s->ti_size == 0) { if (to_device || s->dma_left != 0 || s->ti_size == 0) {
return; return;
} }
@ -490,7 +494,8 @@ void esp_command_complete(SCSIRequest *req, size_t resid)
ESPState *s = req->hba_private; ESPState *s = req->hba_private;
if (s->rregs[ESP_RSTAT] & STAT_INT) { if (s->rregs[ESP_RSTAT] & STAT_INT) {
/* Defer handling command complete until the previous /*
* Defer handling command complete until the previous
* interrupt has been handled. * interrupt has been handled.
*/ */
trace_esp_command_complete_deferred(); trace_esp_command_complete_deferred();
@ -512,8 +517,10 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
if (s->dma_left) { if (s->dma_left) {
esp_do_dma(s); esp_do_dma(s);
} else if (s->dma_counter != 0 && s->ti_size <= 0) { } else if (s->dma_counter != 0 && s->ti_size <= 0) {
/* If this was the last part of a DMA transfer then the /*
completion interrupt is deferred to here. */ * If this was the last part of a DMA transfer then the
* completion interrupt is deferred to here.
*/
esp_dma_done(s); esp_dma_done(s);
} }
} }
@ -530,17 +537,18 @@ static void handle_ti(ESPState *s)
dmalen = s->rregs[ESP_TCLO]; dmalen = s->rregs[ESP_TCLO];
dmalen |= s->rregs[ESP_TCMID] << 8; dmalen |= s->rregs[ESP_TCMID] << 8;
dmalen |= s->rregs[ESP_TCHI] << 16; dmalen |= s->rregs[ESP_TCHI] << 16;
if (dmalen==0) { if (dmalen == 0) {
dmalen=0x10000; dmalen = 0x10000;
} }
s->dma_counter = dmalen; s->dma_counter = dmalen;
if (s->do_cmd) if (s->do_cmd) {
minlen = (dmalen < ESP_CMDBUF_SZ) ? dmalen : ESP_CMDBUF_SZ; minlen = (dmalen < ESP_CMDBUF_SZ) ? dmalen : ESP_CMDBUF_SZ;
else if (s->ti_size < 0) } else if (s->ti_size < 0) {
minlen = (dmalen < -s->ti_size) ? dmalen : -s->ti_size; minlen = (dmalen < -s->ti_size) ? dmalen : -s->ti_size;
else } else {
minlen = (dmalen < s->ti_size) ? dmalen : s->ti_size; minlen = (dmalen < s->ti_size) ? dmalen : s->ti_size;
}
trace_esp_handle_ti(minlen); trace_esp_handle_ti(minlen);
if (s->dma) { if (s->dma) {
s->dma_left = minlen; s->dma_left = minlen;
@ -605,8 +613,10 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr)
} }
break; break;
case ESP_RINTR: case ESP_RINTR:
/* Clear sequence step, interrupt register and all status bits /*
except TC */ * Clear sequence step, interrupt register and all status bits
* except TC
*/
old_val = s->rregs[ESP_RINTR]; old_val = s->rregs[ESP_RINTR];
s->rregs[ESP_RINTR] = 0; s->rregs[ESP_RINTR] = 0;
s->rregs[ESP_RSTAT] &= ~STAT_TC; s->rregs[ESP_RSTAT] &= ~STAT_TC;
@ -664,13 +674,13 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
} else { } else {
s->dma = 0; s->dma = 0;
} }
switch(val & CMD_CMD) { switch (val & CMD_CMD) {
case CMD_NOP: case CMD_NOP:
trace_esp_mem_writeb_cmd_nop(val); trace_esp_mem_writeb_cmd_nop(val);
break; break;
case CMD_FLUSH: case CMD_FLUSH:
trace_esp_mem_writeb_cmd_flush(val); trace_esp_mem_writeb_cmd_flush(val);
//s->ti_size = 0; /*s->ti_size = 0;*/
s->rregs[ESP_RINTR] = INTR_FC; s->rregs[ESP_RINTR] = INTR_FC;
s->rregs[ESP_RSEQ] = 0; s->rregs[ESP_RSEQ] = 0;
s->rregs[ESP_RFLAGS] = 0; s->rregs[ESP_RFLAGS] = 0;
@ -786,7 +796,7 @@ static const VMStateDescription vmstate_esp_pdma = {
}; };
const VMStateDescription vmstate_esp = { const VMStateDescription vmstate_esp = {
.name ="esp", .name = "esp",
.version_id = 4, .version_id = 4,
.minimum_version_id = 3, .minimum_version_id = 3,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {