[rtems-libbsd commit] tsc_lpc32xx.c: Update due to API changes
Sebastian Huber
sebh at rtems.org
Tue Sep 29 12:10:26 UTC 2020
Module: rtems-libbsd
Branch: 6-freebsd-12
Commit: 6b38edaf2172b3715f61087d5bf3ae3c9bfbe382
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=6b38edaf2172b3715f61087d5bf3ae3c9bfbe382
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Sep 23 07:40:07 2020 +0200
tsc_lpc32xx.c: Update due to API changes
---
rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
index c37bd86..2142068 100644
--- a/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
+++ b/rtemsbsd/sys/dev/input/touchscreen/tsc_lpc32xx.c
@@ -270,10 +270,10 @@ lpc_tsc_init(struct lpc_tsc_softc *sc)
TSCWRITE4(sc, LPC32XX_TSC_CON, tmp | LPC32XX_TSC_ADCCON_AUTO_EN);
}
-static void
-lpc_tsc_ev_close(struct evdev_dev *evdev, void *data)
+static int
+lpc_tsc_ev_close(struct evdev_dev *evdev)
{
- struct lpc_tsc_softc *sc = (struct lpc_tsc_softc *)data;
+ struct lpc_tsc_softc *sc = evdev_get_softc(evdev);
uint32_t tmp;
LPC_TSC_LOCK_ASSERT(sc);
@@ -283,12 +283,14 @@ lpc_tsc_ev_close(struct evdev_dev *evdev, void *data)
TSCWRITE4(sc, LPC32XX_TSC_CON, tmp);
lpc_adc_module_disable(sc);
+
+ return (0);
}
static int
-lpc_tsc_ev_open(struct evdev_dev *evdev, void *data)
+lpc_tsc_ev_open(struct evdev_dev *evdev)
{
- struct lpc_tsc_softc *sc = (struct lpc_tsc_softc *)data;
+ struct lpc_tsc_softc *sc = evdev_get_softc(evdev);
LPC_TSC_LOCK_ASSERT(sc);
More information about the vc
mailing list