Constification

This commit is contained in:
Jasmine Iwanek
2023-08-06 19:24:38 -04:00
parent 405a382d1c
commit 57b5800a0c
9 changed files with 22 additions and 17 deletions

View File

@@ -318,7 +318,7 @@ intel_815ep_write(int func, int addr, uint8_t val, void *priv)
static uint8_t
intel_815ep_read(int func, int addr, void *priv)
{
intel_815ep_t *dev = (intel_815ep_t *) priv;
const intel_815ep_t *dev = (intel_815ep_t *) priv;
intel_815ep_log("Intel 815EP MCH: dev->regs[%02x] (%02x)\n", addr, dev->pci_conf[addr]);

View File

@@ -165,8 +165,8 @@ intel_ich2_nvr_handler(intel_ich2_t *dev)
static void
intel_ich2_trap_update(void *priv)
{
intel_ich2_t *dev = (intel_ich2_t *) priv;
uint16_t temp_addr = 0;
const intel_ich2_t *dev = (intel_ich2_t *) priv;
uint16_t temp_addr = 0;
/* Hard Drives */
intel_ich2_device_trap_setup(0x48, 0x01, 0x1f0, 8, dev->trap_device[0]); // HDD's don't have a decode bit
@@ -760,7 +760,7 @@ intel_ich2_write(int func, int addr, uint8_t val, void *priv)
static uint8_t
intel_ich2_read(int func, int addr, void *priv)
{
intel_ich2_t *dev = (intel_ich2_t *) priv;
const intel_ich2_t *dev = (intel_ich2_t *) priv;
if (func == 0) {
intel_ich2_log("Intel ICH2 LPC: dev->regs[%02x] (%02x)\n", addr, dev->pci_conf[func][addr]);

View File

@@ -1296,7 +1296,9 @@ cpu_set(void)
x86_setopcodes(ops_386, ops_pentium_0f, dynarec_ops_386, dynarec_ops_pentium_0f);
else
x86_setopcodes(ops_386, ops_c6x86mx_0f, dynarec_ops_386, dynarec_ops_c6x86mx_0f);
// x86_setopcodes(ops_386, ops_c6x86_0f, dynarec_ops_386, dynarec_ops_c6x86_0f);
#if 0
x86_setopcodes(ops_386, ops_c6x86_0f, dynarec_ops_386, dynarec_ops_c6x86_0f);
#endif
# else
if (cpu_s->cpu_type == CPU_Cx6x86MX)
x86_setopcodes(ops_386, ops_c6x86mx_0f);

View File

@@ -115,7 +115,7 @@ nsc366_fscm_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
nsc366_fscm_read(uint16_t addr, void *priv)
{
nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
const nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
addr &= 0x000f;
@@ -207,7 +207,7 @@ nsc366_vlm_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
nsc366_vlm_read(uint16_t addr, void *priv)
{
nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
const nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
addr &= 0x000f;
@@ -297,7 +297,7 @@ nsc366_tms_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
nsc366_tms_read(uint16_t addr, void *priv)
{
nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
const nsc366_hwm_t *dev = (nsc366_hwm_t *) priv;
addr &= 0x000f;

View File

@@ -109,7 +109,7 @@ intel_ich2_gpio_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
intel_ich2_gpio_read(uint16_t addr, void *priv)
{
intel_ich2_gpio_t *dev = (intel_ich2_gpio_t *) priv;
const intel_ich2_gpio_t *dev = (intel_ich2_gpio_t *) priv;
addr -= dev->gpio_addr;

View File

@@ -262,7 +262,7 @@ it8702_write(uint16_t addr, uint8_t val, void *priv)
it8702_ldn(dev);
break;
case 0xf0 ... 0xf0:
case 0xf0:
if (dev->ldn < 11)
dev->d_spec[dev->index & 0x0f][dev->ldn] = val;
@@ -278,7 +278,7 @@ it8702_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
it8702_read(uint16_t addr, void *priv)
{
it8702_t *dev = (it8702_t *) priv;
const it8702_t *dev = (it8702_t *) priv;
if (addr == 0x2e) {
return dev->index;

View File

@@ -326,7 +326,7 @@ nsc366_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
nsc366_read(uint16_t addr, void *priv)
{
nsc366_t *dev = (nsc366_t *) priv;
const nsc366_t *dev = (nsc366_t *) priv;
if (addr & 1) {
switch (dev->index) {

View File

@@ -257,7 +257,7 @@ w83627hf_hwm_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
w83627hf_hwm_read(uint16_t addr, void *priv)
{
w83627hf_t *dev = (w83627hf_t *) priv;
const w83627hf_t *dev = (w83627hf_t *) priv;
switch (addr) {
case 0x295:
@@ -304,6 +304,7 @@ w83627hf_hwm_read(uint16_t addr, void *priv)
default:
break;
}
break;
case 0x4f:
if (dev->hwm_regs[0x4e] & 0x80)
@@ -318,6 +319,7 @@ w83627hf_hwm_read(uint16_t addr, void *priv)
default:
return 0xff;
}
return 0xff;
default:
return 0xff;
@@ -909,11 +911,11 @@ w83627hf_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
w83627hf_read(UNUSED(uint16_t addr), void *priv)
{
w83627hf_t *dev = (w83627hf_t *) priv;
const w83627hf_t *dev = (w83627hf_t *) priv;
if ((dev->index >= 0x00) && (dev->index <= 0x2f))
if (dev->index <= 0x2f)
return dev->regs[dev->index];
else if ((dev->index >= 0x30) && (dev->index <= 0xff) && (dev->regs[7] >= 0) && (dev->regs[7] <= 0x0b))
else if ((dev->index >= 0x30) && (dev->index <= 0xff) && (dev->regs[7] <= 0x0b))
return dev->dev_regs[dev->regs[7]][dev->index];
else
return 0xff;

View File

@@ -143,7 +143,8 @@ intel_ac97_write(uint16_t addr, uint8_t val, void *priv)
static uint8_t
intel_ac97_read(uint16_t addr, void *priv)
{
intel_ac97_t *dev = (intel_ac97_t *) priv;
const intel_ac97_t *dev = (intel_ac97_t *) priv;
addr -= dev->ac97_base;
if (addr < 0x40) {