CVS commit: src/sys/arch/macppc/dev

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Fri Sep 15 21:31:25 UTC 2017

Modified Files:
        src/sys/arch/macppc/dev: dbcool_ki2c.c deq.c

Log Message:
ki2c uses i2c addresses with the direction bit shifted out now, adjust
masking accordingly


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/dev/dbcool_ki2c.c \
    src/sys/arch/macppc/dev/deq.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/arch/macppc/dev/dbcool_ki2c.c
diff -u src/sys/arch/macppc/dev/dbcool_ki2c.c:1.8 src/sys/arch/macppc/dev/dbcool_ki2c.c:1.9
--- src/sys/arch/macppc/dev/dbcool_ki2c.c:1.8	Tue Dec 13 08:16:40 2011
+++ src/sys/arch/macppc/dev/dbcool_ki2c.c	Fri Sep 15 21:31:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool_ki2c.c,v 1.8 2011/12/13 08:16:40 riastradh Exp $ */
+/*	$NetBSD: dbcool_ki2c.c,v 1.9 2017/09/15 21:31:25 macallan Exp $ */
 
 /*-
  * Copyright (C) 2005 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool_ki2c.c,v 1.8 2011/12/13 08:16:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool_ki2c.c,v 1.9 2017/09/15 21:31:25 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -83,7 +83,7 @@ dbcool_ki2c_attach(device_t parent, devi
 	aprint_naive("\n");
 
 	sc->sc_dc.dc_tag = ka->ka_tag;
-	sc->sc_dc.dc_addr = ka->ka_addr & 0xfe;
+	sc->sc_dc.dc_addr = ka->ka_addr & 0x7f;
 	sc->sc_dc.dc_readreg = dbcool_ki2c_readreg;
 	sc->sc_dc.dc_writereg = dbcool_ki2c_writereg;
 
Index: src/sys/arch/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.8 src/sys/arch/macppc/dev/deq.c:1.9
--- src/sys/arch/macppc/dev/deq.c:1.8	Mon Dec 20 00:25:37 2010
+++ src/sys/arch/macppc/dev/deq.c	Fri Sep 15 21:31:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: deq.c,v 1.8 2010/12/20 00:25:37 matt Exp $	*/
+/*	$NetBSD: deq.c,v 1.9 2017/09/15 21:31:25 macallan Exp $	*/
 
 /*-
  * Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
  */
  
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.8 2010/12/20 00:25:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.9 2017/09/15 21:31:25 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -81,7 +81,7 @@ deq_attach(device_t parent, device_t sel
 	node = ka->ka_node;
 	sc->sc_node = node;
 	sc->sc_parent = parent;
-	sc->sc_address = ka->ka_addr & 0xfe;
+	sc->sc_address = (ka->ka_addr & 0x7f);
 	sc->sc_i2c = ka->ka_tag;
 	aprint_normal(" Apple Digital Equalizer, addr 0x%x\n", sc->sc_address);
 }