Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/sunxi When deciding to delay (rather than kpaus...



details:   https://anonhg.NetBSD.org/src/rev/be8d5a2b2478
branches:  trunk
changeset: 847438:be8d5a2b2478
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Dec 23 00:24:02 2019 +0000

description:
When deciding to delay (rather than kpause), pay attention to
I2C_F_POLL, not 'cold'.

diffstat:

 sys/arch/arm/sunxi/sunxi_hdmi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6ab897affbec -r be8d5a2b2478 sys/arch/arm/sunxi/sunxi_hdmi.c
--- a/sys/arch/arm/sunxi/sunxi_hdmi.c   Sun Dec 22 23:50:43 2019 +0000
+++ b/sys/arch/arm/sunxi/sunxi_hdmi.c   Mon Dec 23 00:24:02 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.8 2019/12/22 23:23:30 thorpej Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.8 2019/12/22 23:23:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -408,7 +408,7 @@
                val = HDMI_READ(sc, SUNXI_A31_HDMI_DDC_CTRL_REG);
                if ((val & SUNXI_A31_HDMI_DDC_CTRL_ACCESS_CMD_START) == 0)
                        break;
-               if (cold)
+               if (flags & I2C_F_POLL)
                        delay(1000);
                else
                        kpause("hdmiddc", false, mstohz(10), &sc->sc_exec_lock);



Home | Main Index | Thread Index | Old Index