Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sociox correct inverted logic to determine RMII...



details:   https://anonhg.NetBSD.org/src/rev/d5c94f51b28f
branches:  trunk
changeset: 1008485:d5c94f51b28f
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Tue Mar 24 03:08:02 2020 +0000

description:
correct inverted logic to determine RMII/MII

diffstat:

 sys/arch/arm/sociox/if_ave.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4a4c615369fb -r d5c94f51b28f sys/arch/arm/sociox/if_ave.c
--- a/sys/arch/arm/sociox/if_ave.c      Tue Mar 24 02:31:59 2020 +0000
+++ b/sys/arch/arm/sociox/if_ave.c      Tue Mar 24 03:08:02 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ave.c,v 1.14 2020/03/23 10:26:07 nisimura Exp $     */
+/*     $NetBSD: if_ave.c,v 1.15 2020/03/24 03:08:02 nisimura Exp $     */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ave.c,v 1.14 2020/03/23 10:26:07 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ave.c,v 1.15 2020/03/24 03:08:02 nisimura Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -396,7 +396,7 @@
            sc->sc_model, hwver >> 8, hwver & 0xff, phy_mode);
        aprint_normal_dev(self, "interrupt on %s\n", intrstr);
 
-       sc->sc_100mii = (strcmp(phy_mode, "rgmii") == 0) ? CFG_MII : 0;
+       sc->sc_100mii = (strcmp(phy_mode, "rgmii") != 0);
        sc->sc_desops = (sc->sc_model == 64) ? &ave64ops : &ave32ops;
 
        CSR_WRITE(sc, AVEGR, GR_GRST | GR_PHYRST);
@@ -522,7 +522,7 @@
 
        CSR_WRITE(sc, AVERXC, 0);       /* stop Rx first */
        CSR_WRITE(sc, AVEDESCC, 0);     /* stop Tx/Rx descriptor engine */
-       if (sc->sc_100mii & CFG_MII) {
+       if (sc->sc_100mii) {
                csr = CSR_READ(sc, AVERMIIC);
                CSR_WRITE(sc, AVERMIIC, csr &~ RMIIC_RST);
                DELAY(10);



Home | Main Index | Thread Index | Old Index