From 96c57d72becaaad79d87548d1c8bcbf01f8064dc Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 5 Jul 2023 13:06:16 -0400 Subject: [PATCH] Fix compile failure --- src/acpi.c | 4 ++-- src/pic.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index ca62186a6..644829de9 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -406,7 +406,7 @@ acpi_reg_read_intel(int size, uint16_t addr, void *priv) static uint32_t acpi_reg_read_intel_ich2(int size, uint16_t addr, void *priv) { - acpi_t *dev = (acpi_t *) p; + acpi_t *dev = (acpi_t *) priv; uint32_t ret = 0x00000000; int shift16; int shift32; @@ -1133,7 +1133,7 @@ acpi_reg_write_intel_ich2(int size, uint16_t addr, uint8_t val, void *priv) break; default: - acpi_reg_write_common_regs(size, addr, val, p); + acpi_reg_write_common_regs(size, addr, val, priv); if ((addr == 0x04) && !!(val & 4) && !!(dev->regs.smi_en & 4)) { dev->regs.smi_sts = 0x00000004; acpi_raise_smi(dev, 1); diff --git a/src/pic.c b/src/pic.c index 5d283590d..60e4bec5c 100644 --- a/src/pic.c +++ b/src/pic.c @@ -545,7 +545,7 @@ pic_set_pci(void) io_sethandler(i + 0x0080, 0x0002, pic_read, NULL, NULL, pic_write, NULL, NULL, &pic2); } - for (i = 0xff20; i < 0xff40; i += 4) { + for (uint16_t i = 0xff20; i < 0xff40; i += 4) { io_sethandler(i, 0x0002, pic_read, NULL, NULL, pic_write, NULL, NULL, &pic); io_sethandler(i + 0x0080, 0x0002, pic_read, NULL, NULL, pic_write, NULL, NULL, &pic2); }