GIGA touch - convert callback to simple forward instead of processing in the fixups.c

Also add clear out the callback in the initVariant such that if new program is launched it does not use old address

Author: KurtE

loader/fixups.c

@@ -48,10 +48,34 @@ SYS_INIT(disable_mpu_rasr_xn, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT)
 #include <zephyr/input/input.h>
 
 // experiment to try to capture touch screen events
+#define GIGA_TOUCH_SET_CB
+#ifdef GIGA_TOUCH_SET_CB
+// This version we just register a callback function with the zephyr
+// object, which then allows are Arduino Code to register a call back
+// to be called...
+
+
+void (*_giga_touch_callback)(struct input_event *evt, void *user_data) = 0;
+
+void registerGigaTouchCallback(void (*cb)(struct input_event *evt, void *user_data)) {	
+	_giga_touch_callback = cb;
+}
+
+
+void touch_event_callback(struct input_event *evt, void *user_data)
+{
+    //printk("touch_event_callback(%p %p): %p %u %u %u %d\n", evt, user_data,
+    //        evt->dev, evt->sync, evt->type, evt->code, evt->value);
+	if (_giga_touch_callback) {
+		(*_giga_touch_callback)(evt, user_data);
+
+	}
+}
+#else
 typedef struct {
-	int32_t x;
-	int32_t y;
-	int32_t pressed;
+	size_t x;
+	size_t y;
+	bool pressed;
 } touch_point_t;
 
 touch_point_t last_touch_point;
@@ -84,18 +108,22 @@ void touch_event_callback(struct input_event *evt, void *user_data)
 		k_sem_give(&touch_event_sync);
 	}
 }
+#endif
+
 static const struct device *const touch_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_touch));
 INPUT_CALLBACK_DEFINE(touch_dev, touch_event_callback, NULL);
 
 
+
 int camera_ext_clock_enable(void)
 {
 	int ret;
 	uint32_t rate;
 
+#ifndef GIGA_TOUCH_SET_CB
 	// Hack in init semaphore for touch events
 	k_sem_init(&touch_event_sync, 0, 1);
-
+#endif
 
 	const struct device *cam_ext_clk_dev = DEVICE_DT_GET(DT_NODELABEL(pwmclock));
 

loader/llext_exports.c

@@ -131,7 +131,9 @@ FORCE_EXPORT_SYM(video_buffer_alloc);
 FORCE_EXPORT_SYM(video_buffer_release);
 #endif
 #if defined(CONFIG_BOARD_ARDUINO_GIGA_R1) && defined(CONFIG_VIDEO)
-FORCE_EXPORT_SYM(getVideoTouchEvent)
+//FORCE_EXPORT_SYM(getVideoTouchEvent);
+FORCE_EXPORT_SYM(registerGigaTouchCallback);
+
 #endif
 
 #if defined(CONFIG_SHARED_MULTI_HEAP)

variants/arduino_giga_r1_stm32h747xx_m7/variant.cpp

@@ -6,3 +6,10 @@ void _on_1200_bps() {
     *(__IO uint32_t *)tmp = (uint32_t)0xDF59;
     NVIC_SystemReset();
 }
+
+extern "C" void registerGigaTouchCallback(void (*cb)(struct input_event *evt, void *user_data));
+void initVariant(void) {
+    // Make sure to set to NULL in case previous sketch or pvevious build of sketch 
+    // set a callback, whoes pointer may not be valid
+    registerGigaTouchCallback(nullptr);
+}