Another round of sonarlint work

This commit is contained in:
Jasmine Iwanek
2023-06-28 13:46:28 -04:00
parent b750471e5c
commit 1116aadb6f
135 changed files with 2425 additions and 1355 deletions

View File

@@ -9,14 +9,15 @@
#include <86box/io.h>
#include <86box/pci.h>
#include <86box/pci_dummy.h>
#include <86box/plat_unused.h>
typedef struct
{
typedef struct pci_dummy_t {
uint8_t pci_regs[256];
bar_t pci_bar[2];
uint8_t card, interrupt_on;
uint8_t card;
uint8_t interrupt_on;
} pci_dummy_t;
static void
@@ -29,12 +30,12 @@ pci_dummy_interrupt(int set, pci_dummy_t *dev)
}
static uint8_t
pci_dummy_read(uint16_t Port, void *p)
pci_dummy_read(uint16_t port, void *priv)
{
pci_dummy_t *dev = (pci_dummy_t *) p;
pci_dummy_t *dev = (pci_dummy_t *) priv;
uint8_t ret = 0xff;
switch (Port & 0x20) {
switch (port & 0x20) {
case 0x00:
ret = 0x1a;
break;
@@ -60,48 +61,54 @@ pci_dummy_read(uint16_t Port, void *p)
dev->interrupt_on = 0;
}
break;
default:
break;
}
return ret;
}
static uint16_t
pci_dummy_readw(uint16_t Port, void *p)
pci_dummy_readw(uint16_t port, void *priv)
{
return pci_dummy_read(Port, p);
return pci_dummy_read(port, priv);
}
static uint32_t
pci_dummy_readl(uint16_t Port, void *p)
pci_dummy_readl(uint16_t port, void *priv)
{
return pci_dummy_read(Port, p);
return pci_dummy_read(port, priv);
}
static void
pci_dummy_write(uint16_t Port, uint8_t Val, void *p)
pci_dummy_write(uint16_t port, UNUSED(uint8_t val), void *priv)
{
pci_dummy_t *dev = (pci_dummy_t *) p;
pci_dummy_t *dev = (pci_dummy_t *) priv;
switch (Port & 0x20) {
switch (port & 0x20) {
case 0x06:
if (!dev->interrupt_on) {
dev->interrupt_on = 1;
pci_dummy_interrupt(1, dev);
}
break;
default:
break;
}
}
static void
pci_dummy_writew(uint16_t Port, uint16_t Val, void *p)
pci_dummy_writew(uint16_t port, uint16_t val, void *priv)
{
pci_dummy_write(Port, Val & 0xFF, p);
pci_dummy_write(port, val & 0xFF, priv);
}
static void
pci_dummy_writel(uint16_t Port, uint32_t Val, void *p)
pci_dummy_writel(uint16_t port, uint32_t val, void *priv)
{
pci_dummy_write(Port, Val & 0xFF, p);
pci_dummy_write(port, val & 0xFF, priv);
}
static void
@@ -172,7 +179,9 @@ pci_dummy_pci_read(int func, int addr, void *priv)
break;
}
// pclog("AB0B:071A: PCI_Read(%d, %04X) = %02X\n", func, addr, ret);
#if 0
pclog("AB0B:071A: PCI_Read(%d, %04X) = %02X\n", func, addr, ret);
#endif
return ret;
}
@@ -183,7 +192,9 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
pci_dummy_t *dev = (pci_dummy_t *) priv;
uint8_t valxor;
// pclog("AB0B:071A: PCI_Write(%d, %04X, %02X)\n", func, addr, val);
#if 0
pclog("AB0B:071A: PCI_Write(%d, %04X, %02X)\n", func, addr, val);
#endif
if (func == 0x00)
switch (addr) {
@@ -225,6 +236,9 @@ pci_dummy_pci_write(int func, int addr, uint8_t val, void *priv)
pclog("AB0B:071A Device %02X: IRQ now: %i\n", dev->card, val);
dev->pci_regs[addr] = val;
return;
default:
break;
}
}
@@ -252,7 +266,7 @@ pci_dummy_close(void *priv)
}
static void *
pci_dummy_card_init(const device_t *info)
pci_dummy_card_init(UNUSED(const device_t *info))
{
pci_dummy_t *dev = (pci_dummy_t *) calloc(1, sizeof(pci_dummy_t));