From b7859a16251b19cd3f6e3afdd7e9c8d5c92cbc95 Mon Sep 17 00:00:00 2001
From: Yann MAGNIN <yann.magnin@protonmail.com>
Date: Sun, 23 Mar 2025 17:27:00 +0100
Subject: [PATCH] touch: only enable touchscreen for FXCP400 + fix C++ header
 support

---
 include/gint/touch.h |  6 ++++++
 src/touch/adconv.c   |  5 +++++
 src/touch/adconv.h   | 13 +++++++++++++
 src/touch/driver.c   |  5 +++++
 src/touch/driver.h   | 13 +++++++++++++
 src/touch/i2c.c      |  5 +++++
 src/touch/i2c.h      | 13 +++++++++++++
 src/touch/i2c_inth.c |  5 +++++
 src/touch/touch.c    |  5 +++++
 9 files changed, 70 insertions(+)

diff --git a/include/gint/touch.h b/include/gint/touch.h
index 51e353f..0e65638 100644
--- a/include/gint/touch.h
+++ b/include/gint/touch.h
@@ -8,6 +8,10 @@
 extern "C" {
 #endif
 
+#include <gint/config.h>
+
+#if GINT_HW_CP
+
 /* touch_calib - tounch-screen calibration information */
 typedef struct {
     int x_base;
@@ -32,6 +36,8 @@ extern int touch_calib_set(touch_calibration_t *calib);
 /* touch_next_event() - get the next touchscreen event */
 extern key_event_t touch_next_event(void);
 
+#endif /* GINT_HW_CP */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/touch/adconv.c b/src/touch/adconv.c
index 66dad73..c007c02 100644
--- a/src/touch/adconv.c
+++ b/src/touch/adconv.c
@@ -5,6 +5,9 @@
 
 #include <gint/defs/util.h>
 #include <gint/cpu.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./adconv.h"
 #include "./i2c.h"
@@ -139,3 +142,5 @@ int touch_adconv_get_dots(
     cpu_atomic_end();
     return type;
 }
+
+#endif /* GINT_HW_CP */
diff --git a/src/touch/adconv.h b/src/touch/adconv.h
index c95d6a5..cf64b1b 100644
--- a/src/touch/adconv.h
+++ b/src/touch/adconv.h
@@ -1,7 +1,14 @@
 #ifndef GINT_TOUCH_ADCONV_H
 #define GINT_TOUCH_ADCONV_H 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <gint/defs/types.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 //---
 // Internals
@@ -74,4 +81,10 @@ extern int touch_adconv_get_dots(
     int type
 );
 
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GINT_TOUCH_ADCONV_H */
diff --git a/src/touch/driver.c b/src/touch/driver.c
index 7df11ce..078cacd 100644
--- a/src/touch/driver.c
+++ b/src/touch/driver.c
@@ -5,6 +5,9 @@
 
 #include <gint/drivers.h>
 #include <gint/drivers/states.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./driver.h"
 #include "./i2c.h"
@@ -105,3 +108,5 @@ gint_driver_t drv_touch = {
     .state_size = sizeof(touch_state_t),
 };
 GINT_DECLARE_DRIVER(24, drv_touch);
+
+#endif /* GINT_HW_CP */
diff --git a/src/touch/driver.h b/src/touch/driver.h
index fb3f422..f73cd1b 100644
--- a/src/touch/driver.h
+++ b/src/touch/driver.h
@@ -1,8 +1,15 @@
 #ifndef GINT_TOUCH_DRIVER_H
 #define GINT_TOUCH_DRIVER_H 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <gint/keyboard.h>
 #include <gint/touch.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 /* _touch_drv_info() - internal driver information */
 struct _touch_drv_info
@@ -14,4 +21,10 @@ struct _touch_drv_info
     } adinfo;
 };
 
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GINT_TOUCH_DRIVER_H */
diff --git a/src/touch/i2c.c b/src/touch/i2c.c
index 5894569..517f03a 100644
--- a/src/touch/i2c.c
+++ b/src/touch/i2c.c
@@ -8,6 +8,9 @@
 #include <gint/defs/call.h>
 #include <gint/cpu.h>
 #include <gint/intc.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./i2c.h"
 
@@ -247,3 +250,5 @@ void i2c_funbind(void)
     SH7305_I2C.ICCR.ICE = 0;
     SH7305_I2C.ICDR = 0;
 }
+
+#endif /* GINT_HW_CP */
diff --git a/src/touch/i2c.h b/src/touch/i2c.h
index a442c48..daf4ea5 100644
--- a/src/touch/i2c.h
+++ b/src/touch/i2c.h
@@ -1,8 +1,15 @@
 #ifndef GINT_TOUCH_I2C_H
 #define GINT_TOUCH_I2C_H 1
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <gint/defs/attributes.h>
 #include <gint/defs/types.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 //---
 // User API
@@ -93,4 +100,10 @@ extern void i2c_funbind(void);
 /* i2c_unbind() - unbind from gint to casio */
 extern void i2c_unbind(void);
 
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GINT_TOUCH_I2C_H */
diff --git a/src/touch/i2c_inth.c b/src/touch/i2c_inth.c
index 1b59809..233bcfd 100644
--- a/src/touch/i2c_inth.c
+++ b/src/touch/i2c_inth.c
@@ -2,6 +2,9 @@
 // gint:touch:i2c_inth - I2C interrupt handlers
 //---
 #include <gint/exc.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./i2c.h"
 
@@ -164,3 +167,5 @@ void i2c_inth_al(void)
 {
     gint_panic(0x10e0);
 }
+
+#endif /* GINT_HW_CP */
diff --git a/src/touch/touch.c b/src/touch/touch.c
index 2cfe2f8..f59efcb 100644
--- a/src/touch/touch.c
+++ b/src/touch/touch.c
@@ -5,6 +5,9 @@
 
 #include <gint/touch.h>
 #include <gint/cpu.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./i2c.h"
 #include "./adconv.h"
@@ -88,3 +91,5 @@ key_event_t touch_next_event(void)
     cpu_atomic_end();
     return evt;
 }
+
+#endif /* GINT_HW_CP */