claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yet more sonarlint fixes

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-05-29 01:30:51 -04:00
parent 2e6634da89
commit ed1b369abd
125 changed files with 2557 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/scsi/scsi_spock.c
View File

@@ -228,10 +228,9 @@ static void
spock_rethink_irqs(spock_t *scsi)
{
int irq_pending = 0;
int c;
if (!scsi->irq_status) {
for (c = 0; c < SCSI_ID_MAX; c++) {
for (uint8_t c = 0; c < SCSI_ID_MAX; c++) {
if (scsi->irq_requests[c] != IRQ_TYPE_NONE) {
/* Found IRQ */
scsi->irq_status = c | (scsi->irq_requests[c] << 4);
@@ -414,21 +413,21 @@ spock_rd_sge(spock_t *scsi, uint32_t Address, SGE *SG)
static int
spock_get_len(spock_t *scsi, scb_t *scb)
{
uint32_t DataToTransfer = 0, i = 0;
uint32_t DataToTransfer = 0;
spock_log("Data Buffer write: length %d, pointer 0x%04X\n",
scsi->data_len, scsi->data_ptr);
if (!scsi->data_len)
return (0);
return 0;
if (scb->enable & ENABLE_PT) {
for (i = 0; i < scsi->data_len; i += 8) {
for (uint32_t i = 0; i < scsi->data_len; i += 8) {
spock_rd_sge(scsi, scsi->data_ptr + i, &scb->sge);
DataToTransfer += scb->sge.sys_buf_byte_count;
}
return (DataToTransfer);
return DataToTransfer;
} else {
return (scsi->data_len);
}
@@ -437,8 +436,11 @@ spock_get_len(spock_t *scsi, scb_t *scb)
static void
spock_process_imm_cmd(spock_t *scsi)
{
int i, j = 0;
int adapter_id, phys_id, lun_id;
int i;
int j = 0;
int adapter_id;
int phys_id;
int lun_id;
scsi->assign = 0;
@@ -516,7 +518,8 @@ spock_process_imm_cmd(spock_t *scsi)
static void
spock_execute_cmd(spock_t *scsi, scb_t *scb)
{
int c, j = 0;
int c;
int j = 0;
int old_scb_state;
if (scsi->in_reset) {
@@ -847,7 +850,6 @@ spock_execute_cmd(spock_t *scsi, scb_t *scb)
static void
spock_process_scsi(spock_t *scsi, scb_t *scb)
{
int c;
double p;
scsi_device_t *sd;
@@ -910,7 +912,7 @@ spock_process_scsi(spock_t *scsi, scb_t *scb)
uint32_t Address;
if (scb->sge.sys_buf_byte_count > 0) {
for (c = 0; c < scsi->data_len; c += 8) {
for (uint32_t c = 0; c < scsi->data_len; c += 8) {
spock_rd_sge(scsi, scsi->data_ptr + c, &scb->sge);
Address = scb->sge.sys_buf_addr;
@@ -1077,7 +1079,6 @@ static void
spock_mca_reset(void *priv)
{
spock_t *scsi = (spock_t *) priv;
int i;
scsi->in_reset = 2;
scsi->cmd_timer = SPOCK_TIME * 50;
@@ -1089,7 +1090,7 @@ spock_mca_reset(void *priv)
scsi->basic_ctrl = 0;
/* Reset all devices on controller reset. */
for (i = 0; i < 8; i++) {
for (uint8_t i = 0; i < 8; i++) {
scsi_device_reset(&scsi_devices[scsi->bus][i]);
scsi->present[i] = 0;
}
@@ -1098,7 +1099,6 @@ spock_mca_reset(void *priv)
static void *
spock_init(const device_t *info)
{
int c;
spock_t *scsi = malloc(sizeof(spock_t));
memset(scsi, 0x00, sizeof(spock_t));
@@ -1128,7 +1128,7 @@ spock_init(const device_t *info)
scsi->cmd_timer = SPOCK_TIME * 50;
scsi->status = STATUS_BUSY;
for (c = 0; c < (SCSI_ID_MAX - 1); c++) {
for (uint8_t c = 0; c < (SCSI_ID_MAX - 1); c++) {
scsi->dev_id[c].phys_id = -1;
}