Merge pull request 'feat/touch : code cleanup' (#42) from Yatis/gint:feat/touch into dev

Reviewed-on: https://git.planet-casio.com/Lephenixnoir/gint/pulls/42

include/gint/intc.h

@@ -52,6 +52,11 @@ enum {
 	INTC_SPU_DSP1,
 	/* USB communication */
 	INTC_USB,
+    /* I2C */
+    INTC_I2C_AL,
+    INTC_I2C_TACK,
+    INTC_I2C_WAIT,
+    INTC_I2C_DTE,
 };
 
 //---

include/gint/mpu/i2c.h

@@ -0,0 +1,74 @@
+#ifndef GINT_MPU_I2C_H
+#define GINT_MPU_I2C_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gint/defs/attributes.h>
+#include <gint/defs/types.h>
+
+//---
+//	SH7305 I2C Bus Interface. Refer to:
+//	  "Renesas SH7724 User's Manual: Hardware"
+//	  Section 32: "I2C Bus Interface (I2C)"
+//---
+
+/* sh7305_i2c_t - I2C peripheral definition */
+typedef struct {
+    // read/write register
+    uint8_t ICDR;
+    pad(3);
+
+    // control register
+    byte_union(ICCR,
+        uint8_t ICE     :1;
+        uint8_t RACK    :1;
+        uint8_t         :1;
+        uint8_t TRS     :1;
+        uint8_t         :1;
+        uint8_t BBSY    :1;
+        uint8_t         :1;
+        uint8_t SCP     :1;
+    );
+    pad(3);
+
+    // status register
+    byte_union(ICSR,
+        uint8_t SCLM    :1;
+        uint8_t SDAM    :1;
+        uint8_t         :1;
+        uint8_t BUSY    :1;
+        uint8_t AL      :1;
+        uint8_t TACK    :1;
+        uint8_t WAIT    :1;
+        uint8_t DTE     :1;
+    );
+    pad(3);
+
+    // interrupt control register
+    byte_union(ICIC,
+        uint8_t         :1;
+        uint8_t         :1;
+        uint8_t         :1;
+        uint8_t         :1;
+        uint8_t ALE     :1;
+        uint8_t TACKE   :1;
+        uint8_t WAITE   :1;
+        uint8_t DTEE    :1;
+    );
+    pad(3);
+
+    // clock control registers
+    uint8_t ICCL;
+    pad(3);
+    uint8_t ICCH;
+} GPACKED(1) sh7305_i2c_t;
+
+#define SH7305_I2C  (*((volatile sh7305_i2c_t *)0xa4470000))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GINT_MPU_I2C_H */

include/gint/touch.h

@@ -8,22 +8,26 @@
 extern "C" {
 #endif
 
+#include <gint/config.h>
+
+#if GINT_HW_CP
+
 /* touch_calib - tounch-screen calibration information */
 typedef struct {
-    int x_mul;
+    int x_base;
     int x_div;
-    int y_mul;
+    int y_base;
     int y_div;
     int dual_debounce_frame;
     int dual_sensi_entry;
     int dual_sensi_leave;
-} touch_calib;
+} touch_calibration_t;
 
 /* touch_calib_get() - get calibration information */
-extern int touch_calib_get(touch_calib *calib);
+extern int touch_calib_get(touch_calibration_t *calib);
 
 /* touch_calib_set() - set calibration information */
-extern int touch_calib_set(touch_calib *calib);
+extern int touch_calib_set(touch_calibration_t *calib);
 
 // low-level API
 
@@ -32,6 +36,8 @@ extern int touch_calib_set(touch_calib *calib);
 /* touch_next_event() - get the next touchscreen event */
 extern key_event_t touch_next_event(void);
 
+#endif /* GINT_HW_CP */
+
 #ifdef __cplusplus
 }
 #endif

src/intc/intc.c

@@ -71,6 +71,11 @@ static struct info {
 	{ IPRC, 0x000f, IMR4, 0x08, _ },
 	/* USB */
 	{ IPRF, 0x00f0, IMR9, 0x02, _ /* Driver not SH3-compatible yet */ },
+    /* I2C */
+    { IPRH, 0x000f, IMR7, 0x10, _ },
+    { IPRH, 0x000f, IMR7, 0x20, _ },
+    { IPRH, 0x000f, IMR7, 0x40, _ },
+    { IPRH, 0x000f, IMR7, 0x80, _ },
 };
 
 /* Compact SH3 VBR-space scheme

src/touch/adconv.c

@@ -1,10 +1,13 @@
 //---
-// gint:touchscreen:adconv  - 0x84 register data conversion
+// gint:touch:adconv  - 0x84 register data conversion
 //---
 #include <stdlib.h>
 
 #include <gint/defs/util.h>
 #include <gint/cpu.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./adconv.h"
 #include "./i2c.h"
@@ -49,8 +52,8 @@ static int _adconv_check_dual(
 // Public
 //---
 
-/* touchscreen_adconv_get_raw() - read 0x84 register using I2C */
+/* touch_adconv_get_raw() - read 0x84 register using I2C */
-int touchscreen_adconv_get_raw(struct _touch_adraw *adraw)
+int touch_adconv_get_raw(struct _touch_adraw *adraw)
 {
     volatile uint8_t *IO_PRDR = (void*)0xa405013c;
 
@@ -72,8 +75,8 @@ int touchscreen_adconv_get_raw(struct _touch_adraw *adraw)
     return 1;
 }
 
-/* touchscreen_adconv_convert() - perform the raw conversion */
+/* touch_adconv_convert() - perform the raw conversion */
-int touchscreen_adconv_get_conv(
+int touch_adconv_get_conv(
     struct _touch_adconv *adconv,
     struct _touch_adraw *adraw,
     int type
@@ -90,22 +93,22 @@ int touchscreen_adconv_get_conv(
     return 2;
 }
 
-/* touchscreen_adconv_get_dots() - generate dots information */
+/* touch_adconv_get_dots() - generate dots information */
-int touchscreen_adconv_get_dots(
+int touch_adconv_get_dots(
     struct _touch_addots *dots,
     struct _touch_adconv *adconv,
     int type
 ) {
     int x_div;
-    int x_mul;
+    int x_base;
     int y_div;
-    int y_mul;
+    int y_base;
 
     cpu_atomic_start();
     x_div = __touch_drv_info.calibration.x_div;
-    x_mul = __touch_drv_info.calibration.x_mul;
+    x_base = __touch_drv_info.calibration.x_base;
     y_div = __touch_drv_info.calibration.y_div;
-    y_mul = __touch_drv_info.calibration.y_mul;
+    y_base = __touch_drv_info.calibration.y_base;
     switch (type)
     {
         case 0:
@@ -119,8 +122,8 @@ int touchscreen_adconv_get_dots(
             break;
         case 1:
             dots->type = TS_DOTS_TYPE_SINGLE;
-            dots->x1 = ((adconv->x1 - x_mul) * 0x100) / x_div;
+            dots->x1 = ((adconv->x1 - x_base) * 0x100) / x_div;
-            dots->y1 = ((adconv->y1 - y_mul) * 0x100) / y_div;
+            dots->y1 = ((adconv->y1 - y_base) * 0x100) / y_div;
             dots->z1 = adconv->z1;
             dots->x2 = 0;
             dots->y2 = 0;
@@ -128,14 +131,16 @@ int touchscreen_adconv_get_dots(
             break;
         case 2:
             dots->type = TS_DOTS_TYPE_DUAL;
-            dots->x1 = ((adconv->x1 - x_mul) * 0x100) / x_div;
+            dots->x1 = ((adconv->x1 - x_base) * 0x100) / x_div;
-            dots->y1 = ((adconv->y1 - y_mul) * 0x100) / y_div;
+            dots->y1 = ((adconv->y1 - y_base) * 0x100) / y_div;
             dots->z1 = adconv->z1;
-            dots->x2 = ((adconv->x2 - x_mul) * 0x100) / x_div;
+            dots->x2 = ((adconv->x2 - x_base) * 0x100) / x_div;
-            dots->y2 = ((adconv->y2 - y_mul) * 0x100) / y_div;
+            dots->y2 = ((adconv->y2 - y_base) * 0x100) / y_div;
             dots->z2 = adconv->z2;
             break;
     }
     cpu_atomic_end();
     return type;
 }
+
+#endif /* GINT_HW_CP */

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
@@ -57,21 +64,27 @@ struct _touch_addots
 // Public
 //---
 
-/* touchscreen_adconv_get_raw() - read 0x84 register using I2C */
+/* touch_adconv_get_raw() - read 0x84 register using I2C */
-extern int touchscreen_adconv_get_raw(struct _touch_adraw *adraw);
+extern int touch_adconv_get_raw(struct _touch_adraw *adraw);
 
-/* touchscreen_adconv_get_conv() - perform the raw conversion */
+/* touch_adconv_get_conv() - perform the raw conversion */
-extern int touchscreen_adconv_get_conv(
+extern int touch_adconv_get_conv(
     struct _touch_adconv *adconv,
     struct _touch_adraw *adraw,
     int type
 );
 
-/* touchscreen_adconv_get_dots() - generate dots information */
+/* touch_adconv_get_dots() - generate dots information */
-extern int touchscreen_adconv_get_dots(
+extern int touch_adconv_get_dots(
     struct _touch_addots *dots,
     struct _touch_adconv *adconv,
     int type
 );
 
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GINT_TOUCH_ADCONV_H */

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"
@@ -27,9 +30,9 @@ static void _touch_configure(void)
     __touch_drv_info.prev_evt.type = KEYEV_NONE;
     __touch_drv_info.prev_evt.x = 0xffff;
     __touch_drv_info.prev_evt.y = 0xffff;
-    __touch_drv_info.calibration.x_mul = 0x20b;
+    __touch_drv_info.calibration.x_base = 0x20b;
     __touch_drv_info.calibration.x_div = 0x9b6;
-    __touch_drv_info.calibration.y_mul = 0x0f4;
+    __touch_drv_info.calibration.y_base = 0x0f4;
     __touch_drv_info.calibration.y_div = 0x66f;
     __touch_drv_info.calibration.dual_debounce_frame = 0;
     __touch_drv_info.calibration.dual_sensi_entry = 0x18;
@@ -72,16 +75,16 @@ static void _touch_hpoweroff(void)
     i2c_hpoweroff();
 }
 
-/* _touch_unbin() - unbind from gint to casio */
+/* _touch_unbind() - unbind from gint to casio */
-static void _touch_unbin(void)
+static void _touch_unbind(void)
 {
-    i2c_unbin();
+    i2c_unbind();
 }
 
-/* _touch_funbin() - funbind from casio to gint */
+/* _touch_funbind() - funbind from casio to gint */
-static void _touch_funbin(void)
+static void _touch_funbind(void)
 {
-    i2c_funbin();
+    i2c_funbind();
 }
 
 //---
@@ -100,8 +103,10 @@ gint_driver_t drv_touch = {
     .hpowered   = _touch_hpowered,
     .hpoweron   = _touch_hpoweron,
     .hpoweroff  = _touch_hpoweroff,
-    .unbind     = _touch_unbin,
+    .unbind     = _touch_unbind,
-    .funbind    = _touch_funbin,
+    .funbind    = _touch_funbind,
     .state_size = sizeof(touch_state_t),
 };
-GINT_DECLARE_DRIVER(16, drv_touch);
+GINT_DECLARE_DRIVER(24, drv_touch);
+
+#endif /* GINT_HW_CP */

src/touch/driver.h

@@ -1,17 +1,30 @@
 #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
 {
-    touch_calib calibration;
+    touch_calibration_t calibration;
     key_event_t prev_evt;
     struct {
         bool prev_is_dual;
     } adinfo;
 };
 
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GINT_TOUCH_DRIVER_H */

src/touch/i2c.c

@@ -1,5 +1,5 @@
 //---
-// gint:touchscreen:i2c - I2C driver
+// gint:touch:i2c - I2C driver
 //---
 #include <string.h>
 
@@ -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"
 
@@ -45,14 +48,7 @@ static void _i2c_hw_start_operation(void)
     SH7305_I2C.ICIC.TACKE   = 1;
     SH7305_I2C.ICIC.WAITE   = 0;
     SH7305_I2C.ICIC.DTEE    = 1;
-
+    SH7305_I2C.ICCR.byte    = 0x94;
-    __auto_type iccr = SH7305_I2C.ICCR;
-    iccr.ICE     = 1;
-    iccr.RACK    = 0;
-    iccr.TRS     = 1;
-    iccr.BBSY    = 1;
-    iccr.SCP     = 0;
-    SH7305_I2C.ICCR = iccr;
 }
 
 /* i2c_request_await() - await async operation */
@@ -228,18 +224,20 @@ void i2c_configure(void)
     __i2c_request.status = I2C_REQ_STATUS_FINISHED;
 
     // Enable interrupt
-    SH7305_INTC._->IPRH.I2C = 1;
+    intc_priority(INTC_I2C_AL,   1);
-    SH7305_INTC.MSKCLR->IMR7 |= 0xf0;
+    intc_priority(INTC_I2C_TACK, 1);
+    intc_priority(INTC_I2C_WAIT, 1);
+    intc_priority(INTC_I2C_DTE,  1);
 }
 
-/* i2c_unbin() - unbind from gint to casio */
+/* i2c_unbind() - unbind from gint to casio */
-void i2c_unbin(void)
+void i2c_unbind(void)
 {
     _i2c_request_await();
 }
 
-/* i2c_funbin() - funbind from casio to gint */
+/* i2c_funbind() - funbind from casio to gint */
-void i2c_funbin(void)
+void i2c_funbind(void)
 {
     if (i2c_hpowered() == false)
         return;
@@ -252,3 +250,5 @@ void i2c_funbin(void)
     SH7305_I2C.ICCR.ICE = 0;
     SH7305_I2C.ICDR = 0;
 }
+
+#endif /* GINT_HW_CP */

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
@@ -66,61 +73,8 @@ extern volatile struct i2c_request_info __i2c_request;
 // Hardware information
 //---
 
-typedef struct {
-    // read/write register
-    uint8_t ICDR;
-    pad(3);
-
-    // control register
-    byte_union(ICCR,
-        uint8_t ICE     :1;
-        uint8_t RACK    :1;
-        uint8_t         :1;
-        uint8_t TRS     :1;
-        uint8_t         :1;
-        uint8_t BBSY    :1;
-        uint8_t         :1;
-        uint8_t SCP     :1;
-    );
-    pad(3);
-
-    // status register
-    byte_union(ICSR,
-        uint8_t SCLM    :1;
-        uint8_t SDAM    :1;
-        uint8_t         :1;
-        uint8_t BUSY    :1;
-        uint8_t AL      :1;
-        uint8_t TACK    :1;
-        uint8_t WAIT    :1;
-        uint8_t DTE     :1;
-    );
-    pad(3);
-
-    // interrupt control register
-    byte_union(ICIC,
-        uint8_t         :1;
-        uint8_t         :1;
-        uint8_t         :1;
-        uint8_t         :1;
-        uint8_t ALE     :1;
-        uint8_t TACKE   :1;
-        uint8_t WAITE   :1;
-        uint8_t DTEE    :1;
-    );
-    pad(3);
-
-    // clock control registers
-    uint8_t ICCL;
-    pad(3);
-    uint8_t ICCH;
-} GPACKED(1) sh7305_i2c_t;
-
-#define SH7305_I2C  (*((volatile sh7305_i2c_t *)0xa4470000))
-
-// state and world-switch
-
 #include <gint/drivers/states.h>
+#include <gint/mpu/i2c.h>
 
 /* i2c_configure() - driver/hardware configuration */
 extern void i2c_configure(void);
@@ -140,10 +94,16 @@ extern void i2c_hpoweron(void);
 /* i2c_hpoweroff() - power off the module */
 extern void i2c_hpoweroff(void);
 
-/* i2c_funbin() - funbind from casio to gint */
+/* i2c_funbind() - funbind from casio to gint */
-extern void i2c_funbin(void);
+extern void i2c_funbind(void);
 
-/* i2c_unbin() - unbind from gint to casio */
+/* i2c_unbind() - unbind from gint to casio */
-extern void i2c_unbin(void);
+extern void i2c_unbind(void);
+
+#endif /* GINT_HW_CP */
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* GINT_TOUCH_I2C_H */

src/touch/i2c_inth.c

@@ -1,7 +1,10 @@
 //---
-// gint:touchscreen:i2c_inth - I2C interrupt handlers
+// 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 */

src/touch/touch.c

@@ -1,10 +1,13 @@
 //---
-// gint:touch   - touchscreen driver (high-level)
+// gint:touch   - touch driver (high-level)
 //----
 #include <string.h>
 
 #include <gint/touch.h>
 #include <gint/cpu.h>
+#include <gint/config.h>
+
+#if GINT_HW_CP
 
 #include "./i2c.h"
 #include "./adconv.h"
@@ -24,26 +27,26 @@ extern struct _touch_drv_info __touch_drv_info;
 // user-API
 
 /* touch_calib_get() - get calibration information */
-int touch_calib_get(touch_calib *calib)
+int touch_calib_get(touch_calibration_t *calib)
 {
     if (calib == NULL)
         return -1;
-    memcpy(calib, &__touch_drv_info.calibration, sizeof(touch_calib));
+    memcpy(calib, &__touch_drv_info.calibration, sizeof(*calib));
     return 0;
 }
 
 /* touch_calib_set() - set calibration information */
-int touch_calib_set(touch_calib *calib)
+int touch_calib_set(touch_calibration_t *calib)
 {
     if (calib == NULL)
         return -1;
-    memcpy(&__touch_drv_info.calibration, calib, sizeof(touch_calib));
+    memcpy(&__touch_drv_info.calibration, calib, sizeof(*calib));
     return 0;
 }
 
 // low-level API
 
-/* touch_next_event() - get the next touchscreen event */
+/* touch_next_event() - get the next touch event */
 key_event_t touch_next_event(void)
 {
     struct _touch_adconv adconv;
@@ -53,11 +56,11 @@ key_event_t touch_next_event(void)
     int type;
 
     evt.type = KEYEV_TOUCH_RELEASE;
-    type = touchscreen_adconv_get_raw(&adraw);
+    type = touch_adconv_get_raw(&adraw);
     if (type != 0)
     {
-        type = touchscreen_adconv_get_conv(&adconv, &adraw, type);
+        type = touch_adconv_get_conv(&adconv, &adraw, type);
-        type = touchscreen_adconv_get_dots(&addots, &adconv, type);
+        type = touch_adconv_get_dots(&addots, &adconv, type);
         if (type == 1)
         {
             evt.type = KEYEV_TOUCH_DRAG;
@@ -88,3 +91,5 @@ key_event_t touch_next_event(void)
     cpu_atomic_end();
     return evt;
 }
+
+#endif /* GINT_HW_CP */