From 57b5800a0c3c72b9a31b2d2346397e398ebef503 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 6 Aug 2023 19:24:38 -0400 Subject: [PATCH] Constification --- src/chipset/intel_815ep.c | 2 +- src/chipset/intel_ich2.c | 6 +++--- src/cpu/cpu.c | 4 +++- src/device/hwm_nsc366.c | 6 +++--- src/device/intel_ich2_gpio.c | 2 +- src/sio/sio_it8702.c | 4 ++-- src/sio/sio_nsc366.c | 2 +- src/sio/sio_w83627hf.c | 10 ++++++---- src/sound/snd_ac97_intel.c | 3 ++- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/chipset/intel_815ep.c b/src/chipset/intel_815ep.c index 0aaf7648e..fcf984bbf 100644 --- a/src/chipset/intel_815ep.c +++ b/src/chipset/intel_815ep.c @@ -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]); diff --git a/src/chipset/intel_ich2.c b/src/chipset/intel_ich2.c index 9db6265db..c2503bd51 100644 --- a/src/chipset/intel_ich2.c +++ b/src/chipset/intel_ich2.c @@ -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]); diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 5d2b5ac78..0af92ff6a 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -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); diff --git a/src/device/hwm_nsc366.c b/src/device/hwm_nsc366.c index aa83f437e..c96c21d0c 100644 --- a/src/device/hwm_nsc366.c +++ b/src/device/hwm_nsc366.c @@ -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; diff --git a/src/device/intel_ich2_gpio.c b/src/device/intel_ich2_gpio.c index 76299517d..4ffa12dbe 100644 --- a/src/device/intel_ich2_gpio.c +++ b/src/device/intel_ich2_gpio.c @@ -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; diff --git a/src/sio/sio_it8702.c b/src/sio/sio_it8702.c index 0a7fa105d..c358b1358 100644 --- a/src/sio/sio_it8702.c +++ b/src/sio/sio_it8702.c @@ -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; diff --git a/src/sio/sio_nsc366.c b/src/sio/sio_nsc366.c index ef51a35a1..776851f93 100644 --- a/src/sio/sio_nsc366.c +++ b/src/sio/sio_nsc366.c @@ -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) { diff --git a/src/sio/sio_w83627hf.c b/src/sio/sio_w83627hf.c index 4a14cf9e1..00238a0a6 100644 --- a/src/sio/sio_w83627hf.c +++ b/src/sio/sio_w83627hf.c @@ -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; diff --git a/src/sound/snd_ac97_intel.c b/src/sound/snd_ac97_intel.c index ba6cb0006..69c28d6aa 100644 --- a/src/sound/snd_ac97_intel.c +++ b/src/sound/snd_ac97_intel.c @@ -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) {