CVS commit: src/sys/dev/acpi

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Apr 12 01:11:23 UTC 2020

Modified Files:
        src/sys/dev/acpi: acpi_ec.c

Log Message:
Revert acpi_ec.c 1.77.

We will do this another way.

ok msaitoh


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 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.77 src/sys/dev/acpi/acpi_ec.c:1.78
--- src/sys/dev/acpi/acpi_ec.c:1.77	Tue Aug  6 01:53:47 2019
+++ src/sys/dev/acpi/acpi_ec.c	Sun Apr 12 01:11:23 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.77 2019/08/06 01:53:47 msaitoh Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.78 2020/04/12 01:11:23 riastradh 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.77 2019/08/06 01:53:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.78 2020/04/12 01:11:23 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -679,15 +679,20 @@ acpiec_space_handler(uint32_t func, ACPI
 	if (func == ACPI_READ)
 		*value = 0;
 
-	for (addr = paddr; addr < (paddr + width / 8); addr++, reg++) {
-		if (func == ACPI_READ)
+	do {
+		switch (func) {
+		case ACPI_READ:
 			rv = acpiec_read(dv, addr, reg);
-		else
+			break;
+		case ACPI_WRITE:
 			rv = acpiec_write(dv, addr, *reg);
-
+			break;
+		}
 		if (rv != AE_OK)
 			break;
-	}
+		addr++;
+		reg++;
+	} while (addr < (paddr + width / 8));
 
 	return rv;
 }