[src/trunk]: src/sys/arch/macppc/dev ki2c uses i2c addresses with the directi...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d5dbf07da37b
branches:  trunk
changeset: 356296:d5dbf07da37b
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Sep 15 21:31:25 2017 +0000

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

diffstat:

 sys/arch/macppc/dev/dbcool_ki2c.c |  6 +++---
 sys/arch/macppc/dev/deq.c         |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r a3d6c5d5a757 -r d5dbf07da37b sys/arch/macppc/dev/dbcool_ki2c.c
--- a/sys/arch/macppc/dev/dbcool_ki2c.c Fri Sep 15 21:27:46 2017 +0000
+++ b/sys/arch/macppc/dev/dbcool_ki2c.c Fri Sep 15 21:31:25 2017 +0000
@@ -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 @@
        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;
 
diff -r a3d6c5d5a757 -r d5dbf07da37b sys/arch/macppc/dev/deq.c
--- a/sys/arch/macppc/dev/deq.c Fri Sep 15 21:27:46 2017 +0000
+++ b/sys/arch/macppc/dev/deq.c Fri Sep 15 21:31:25 2017 +0000
@@ -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 @@
        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);
 }