Date: Mon, 17 Feb 2020 20:22:10 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358044 - head/sys/arm/allwinner Message-ID: <202002172022.01HKMAKS074330@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Feb 17 20:22:10 2020 New Revision: 358044 URL: https://svnweb.freebsd.org/changeset/base/358044 Log: Merge r358030 from the clang1000-import branch: Work around new clang 10.0.0 -Werror warning: sys/arm/allwinner/aw_cir.c:208:41: error: converting the result of '<<' to a boolean; did you mean '((1 & 255) << 23) != 0'? [-Werror,-Wint-in-bool-context] active_delay = (AW_IR_ACTIVE_T + 1) * (AW_IR_ACTIVE_T_C ? 128 : 1); ^ sys/arm/allwinner/aw_cir.c:130:39: note: expanded from macro 'AW_IR_ACTIVE_T_C' #define AW_IR_ACTIVE_T_C ((1 & 0xff) << 23) ^ Add the != 0 part to indicate that we indeed want to compare against zero. MFC after: 3 days Modified: head/sys/arm/allwinner/aw_cir.c Directory Properties: head/ (props changed) Modified: head/sys/arm/allwinner/aw_cir.c ============================================================================== --- head/sys/arm/allwinner/aw_cir.c Mon Feb 17 20:19:43 2020 (r358043) +++ head/sys/arm/allwinner/aw_cir.c Mon Feb 17 20:22:10 2020 (r358044) @@ -205,7 +205,7 @@ aw_ir_decode_packets(struct aw_ir_softc *sc) device_printf(sc->dev, "sc->dcnt = %d\n", sc->dcnt); /* Find Lead 1 (bit separator) */ - active_delay = (AW_IR_ACTIVE_T + 1) * (AW_IR_ACTIVE_T_C ? 128 : 1); + active_delay = (AW_IR_ACTIVE_T + 1) * (AW_IR_ACTIVE_T_C != 0 ? 128 : 1); len = 0; len += (active_delay >> 1); if (bootverbose)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002172022.01HKMAKS074330>