summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/arm/arm/hdmi_if.m4
-rw-r--r--sys/arm/ti/am335x/am335x_lcd.c4
-rw-r--r--sys/arm/ti/am335x/tda19988.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/sys/arm/arm/hdmi_if.m b/sys/arm/arm/hdmi_if.m
index 3d169aa..dcd6ccc 100644
--- a/sys/arm/arm/hdmi_if.m
+++ b/sys/arm/arm/hdmi_if.m
@@ -35,8 +35,10 @@ INTERFACE hdmi;
HEADER {
#include <sys/eventhandler.h>
- typedef void (*hdmi_event_hook)(void *, int);
+ typedef void (*hdmi_event_hook)(void *, device_t, int);
EVENTHANDLER_DECLARE(hdmi_event, hdmi_event_hook);
+
+ #define HDMI_EVENT_CONNECTED 0
}
#
diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index cf4941d..8121ef5 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -800,7 +800,7 @@ done:
}
static void
-am335x_lcd_hdmi_event(void *arg)
+am335x_lcd_hdmi_event(void *arg, device_t hdmi, int event)
{
struct am335x_lcd_softc *sc;
const struct videomode *videomode;
@@ -1001,7 +1001,7 @@ am335x_lcd_attach(device_t dev)
am335x_lcd_configure(sc);
else
sc->sc_hdmi_evh = EVENTHANDLER_REGISTER(hdmi_event,
- am335x_lcd_hdmi_event, sc, 0);
+ am335x_lcd_hdmi_event, sc, EVENTHANDLER_PRI_ANY);
return (0);
}
diff --git a/sys/arm/ti/am335x/tda19988.c b/sys/arm/ti/am335x/tda19988.c
index 07f41f1..891adcd 100644
--- a/sys/arm/ti/am335x/tda19988.c
+++ b/sys/arm/ti/am335x/tda19988.c
@@ -635,7 +635,7 @@ tda19988_read_edid(struct tda19988_softc *sc)
}
}
- EVENTHANDLER_INVOKE(hdmi_event, 0);
+ EVENTHANDLER_INVOKE(hdmi_event, sc->sc_dev, HDMI_EVENT_CONNECTED);
done:
if (sc->sc_version == TDA19988)
tda19988_reg_set(sc, TDA_TX4, TX4_PD_RAM);
OpenPOWER on IntegriCloud