From 729aa24f1bc38c8f0717963a7ce09ce83d0c51d0 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 21 Aug 2023 20:22:20 -0400 Subject: [PATCH] More linting in src/chipset --- src/chipset/olivetti_eva.c | 3 ++- src/chipset/opti602.c | 5 +++-- src/chipset/opti822.c | 4 ++-- src/chipset/sis_85c496.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chipset/olivetti_eva.c b/src/chipset/olivetti_eva.c index 2f43a01f1..1f5eacc6c 100644 --- a/src/chipset/olivetti_eva.c +++ b/src/chipset/olivetti_eva.c @@ -102,8 +102,9 @@ olivetti_eva_write(uint16_t addr, uint8_t val, void *priv) static uint8_t olivetti_eva_read(uint16_t addr, void *priv) { - olivetti_eva_t *dev = (olivetti_eva_t *) priv; + const olivetti_eva_t *dev = (olivetti_eva_t *) priv; uint8_t ret = 0xff; + switch (addr) { case 0x065: ret = dev->reg_065; diff --git a/src/chipset/opti602.c b/src/chipset/opti602.c index f95df4784..3b5614ff4 100644 --- a/src/chipset/opti602.c +++ b/src/chipset/opti602.c @@ -29,6 +29,7 @@ #include <86box/smram.h> #include <86box/port_92.h> #include <86box/chipset.h> +#include <86box/plat_unused.h> typedef struct opti602_t { uint8_t idx; @@ -73,7 +74,7 @@ opti602_gpio_write(uint16_t addr, uint8_t val, void *priv) static uint8_t opti602_gpio_read(uint16_t addr, void *priv) { - opti602_t *dev = (opti602_t *) priv; + const opti602_t *dev = (opti602_t *) priv; uint8_t ret = 0xff; ret = dev->gpio[addr - dev->gpio_base]; @@ -195,7 +196,7 @@ opti602_close(void *priv) } static void * -opti602_init(const device_t *info) +opti602_init(UNUSED(const device_t *info)) { opti602_t *dev = (opti602_t *) calloc(1, sizeof(opti602_t)); diff --git a/src/chipset/opti822.c b/src/chipset/opti822.c index ad6db361a..3e9316f2b 100644 --- a/src/chipset/opti822.c +++ b/src/chipset/opti822.c @@ -384,9 +384,9 @@ opti822_reset(void *priv) } static void -opti822_close(void *p) +opti822_close(void *priv) { - opti822_t *dev = (opti822_t *) p; + opti822_t *dev = (opti822_t *) priv; free(dev); } diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c index 88618b1a0..19ecc10dd 100644 --- a/src/chipset/sis_85c496.c +++ b/src/chipset/sis_85c496.c @@ -616,9 +616,9 @@ sis_85c496_reset(void *priv) } static void -sis_85c496_close(void *p) +sis_85c496_close(void *priv) { - sis_85c496_t *dev = (sis_85c496_t *) p; + sis_85c496_t *dev = (sis_85c496_t *) priv; smram_del(dev->smram);