Module Name: src Committed By: msaitoh Date: Tue Aug 6 01:53:47 UTC 2019
Modified Files: src/sys/dev/acpi: acpi_ec.c Log Message: - Make the case that width < 8 behave as the same as before. Pointed out by Joerg. - Change "switch" to "if" for simplify. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/acpi/acpi_ec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/acpi/acpi_ec.c diff -u src/sys/dev/acpi/acpi_ec.c:1.76 src/sys/dev/acpi/acpi_ec.c:1.77 --- src/sys/dev/acpi/acpi_ec.c:1.76 Mon Aug 5 10:12:04 2019 +++ src/sys/dev/acpi/acpi_ec.c Tue Aug 6 01:53:47 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_ec.c,v 1.76 2019/08/05 10:12:04 msaitoh Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.77 2019/08/06 01:53:47 msaitoh Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.76 2019/08/05 10:12:04 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.77 2019/08/06 01:53:47 msaitoh Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -679,20 +679,15 @@ acpiec_space_handler(uint32_t func, ACPI if (func == ACPI_READ) *value = 0; - do { - switch (func) { - case ACPI_READ: + for (addr = paddr; addr < (paddr + width / 8); addr++, reg++) { + if (func == ACPI_READ) rv = acpiec_read(dv, addr, reg); - break; - case ACPI_WRITE: + else rv = acpiec_write(dv, addr, *reg); - break; - } + if (rv != AE_OK) break; - addr++; - reg++; - } while (addr < (paddr + width / 8)); + } return rv; }