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

More sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-09 23:46:54 -04:00
parent 0d1d069af4
commit ee695e71f9
218 changed files with 6282 additions and 3845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/scsi/scsi_pcscsi.c
View File

@@ -149,7 +149,7 @@
#define SBAC_STATUS (1 << 24)
#define SBAC_PABTEN (1 << 25)
typedef struct {
typedef struct esp_t {
mem_mapping_t mmio_mapping;
mem_mapping_t ram_mapping;
char *nvr_path;
@@ -188,10 +188,10 @@ typedef struct {
int mca;
uint16_t Base;
uint8_t HostID, DmaChannel;
uint8_t HostID;
uint8_t DmaChannel;
struct
{
struct {
uint8_t mode;
uint8_t status;
int pos;
@@ -952,9 +952,9 @@ esp_write_response(esp_t *dev)
}
static void
esp_callback(void *p)
esp_callback(void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
if (dev->dma_enabled || dev->do_cmd || ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_PAD)) {
if ((dev->rregs[ESP_CMD] & CMD_CMD) == CMD_TI) {
@@ -1029,7 +1029,7 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
switch (saddr) {
case ESP_TCHI:
dev->tchi_written = 1;
/* fall through */
[[fallthrough]];
case ESP_TCLO:
case ESP_TCMID:
esp_log("Transfer count regs %02x = %i\n", saddr, val);
@@ -1134,6 +1134,9 @@ esp_reg_write(esp_t *dev, uint32_t saddr, uint32_t val)
esp_log("ESP Disable Selection\n");
esp_raise_irq(dev);
break;
default:
break;
}
break;
case ESP_WBUSID:
@@ -1259,6 +1262,9 @@ esp_pci_dma_write(esp_t *dev, uint16_t saddr, uint32_t val)
dev->dma_regs[DMA_STAT] &= ~(val & mask);
}
break;
default:
break;
}
}
@@ -1361,44 +1367,49 @@ esp_io_pci_write(esp_t *dev, uint32_t addr, uint32_t val, unsigned int size)
}
static void
esp_pci_io_writeb(uint16_t addr, uint8_t val, void *p)
esp_pci_io_writeb(uint16_t addr, uint8_t val, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
esp_io_pci_write(dev, addr, val, 1);
}
static void
esp_pci_io_writew(uint16_t addr, uint16_t val, void *p)
esp_pci_io_writew(uint16_t addr, uint16_t val, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
esp_io_pci_write(dev, addr, val, 2);
}
static void
esp_pci_io_writel(uint16_t addr, uint32_t val, void *p)
esp_pci_io_writel(uint16_t addr, uint32_t val, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
esp_io_pci_write(dev, addr, val, 4);
}
static uint8_t
esp_pci_io_readb(uint16_t addr, void *p)
esp_pci_io_readb(uint16_t addr, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
return esp_io_pci_read(dev, addr, 1);
}
static uint16_t
esp_pci_io_readw(uint16_t addr, void *p)
esp_pci_io_readw(uint16_t addr, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
return esp_io_pci_read(dev, addr, 2);
}
static uint32_t
esp_pci_io_readl(uint16_t addr, void *p)
esp_pci_io_readl(uint16_t addr, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
return esp_io_pci_read(dev, addr, 4);
}
@@ -1549,6 +1560,9 @@ dc390_write_eeprom(esp_t *dev, int ena, int clk, int dat)
esp_log("EEPROM Write enable command\n");
eeprom->wp = 0;
break;
default:
break;
}
} else {
esp_log("EEPROM Read, write or erase word\n");
@@ -1622,9 +1636,9 @@ uint8_t esp_pci_regs[256];
bar_t esp_pci_bar[2];
static uint8_t
esp_pci_read(int func, int addr, void *p)
esp_pci_read(UNUSED(int func), int addr, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
// esp_log("ESP PCI: Reading register %02X\n", addr & 0xff);
@@ -1695,15 +1709,18 @@ esp_pci_read(int func, int addr, void *p)
case 0x40 ... 0x4f:
return esp_pci_regs[addr];
default:
break;
}
return 0;
}
static void
esp_pci_write(int func, int addr, uint8_t val, void *p)
esp_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
{
esp_t *dev = (esp_t *) p;
esp_t *dev = (esp_t *) priv;
uint8_t valxor;
int eesk;
int eedi;
@@ -1799,11 +1816,14 @@ esp_pci_write(int func, int addr, uint8_t val, void *p)
case 0x40 ... 0x4f:
esp_pci_regs[addr] = val;
return;
default:
break;
}
}
static void *
dc390_init(const device_t *info)
dc390_init(UNUSED(const device_t *info))
{
esp_t *dev;
@@ -1872,6 +1892,9 @@ ncr53c90_in(uint16_t port, void *priv)
case 0x0c:
ret = dev->dma_86c01.status;
break;
default:
break;
}
}
@@ -1995,7 +2018,7 @@ ncr53c90_mca_feedb(void *priv)
}
static void *
ncr53c90_mca_init(const device_t *info)
ncr53c90_mca_init(UNUSED(const device_t *info))
{
esp_t *dev;