From e8adff46835aec3166ead5cef47851a0f72ad48e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 16 Feb 2017 14:12:32 +0100
Subject: [PATCH] modtrzezormsg: extract touch.h

---
 .../extmod/modtrezormsg/modtrezormsg-stmhal.h | 37 ++---------------
 micropython/extmod/modtrezormsg/touch.h       | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 micropython/extmod/modtrezormsg/touch.h

diff --git a/micropython/extmod/modtrezormsg/modtrezormsg-stmhal.h b/micropython/extmod/modtrezormsg/modtrezormsg-stmhal.h
index 9fd21a87..1e393687 100644
--- a/micropython/extmod/modtrezormsg/modtrezormsg-stmhal.h
+++ b/micropython/extmod/modtrezormsg/modtrezormsg-stmhal.h
@@ -5,26 +5,15 @@
  * see LICENSE file for details
  */
 
+#include "touch.h"
+
 extern struct _USBD_HandleTypeDef hUSBDDevice;
 extern uint8_t USBD_HID_SendReport(struct _USBD_HandleTypeDef *pdev, uint8_t *report, uint16_t len);
 extern int USBD_HID_Rx(uint8_t *buf, uint32_t len, uint32_t timeout);
 
-extern I2C_HandleTypeDef I2CHandle1;
-extern void i2c_init(I2C_HandleTypeDef *i2c);
-extern HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-
 void msg_init(void)
 {
-    I2C_InitTypeDef *init = &(I2CHandle1.Init);
-    init->OwnAddress1 = 0xFE; // master
-    init->ClockSpeed = 400000;
-    init->DutyCycle = I2C_DUTYCYCLE_16_9;
-    init->AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
-    init->DualAddressMode = I2C_DUALADDRESS_DISABLED;
-    init->GeneralCallMode = I2C_GENERALCALL_DISABLED;
-    init->NoStretchMode   = I2C_NOSTRETCH_DISABLED;
-    init->OwnAddress2     = 0;
-    i2c_init(&I2CHandle1);
+    touch_init();
 }
 
 ssize_t msg_recv(uint8_t *iface, uint8_t *buf, size_t len)
@@ -45,23 +34,5 @@ ssize_t msg_send(uint8_t iface, const uint8_t *buf, size_t len)
 // this should match values used in trezorui_poll_sdl_event() in modtrezorui/display-unix.h
 uint32_t msg_poll_ui_event(void)
 {
-    static uint8_t data[16], old_data[16];
-    if (HAL_OK != HAL_I2C_Master_Receive(&I2CHandle1, 56 << 1, data, 16, 1)) {
-        return 0; // read failure
-    }
-    if (0 == memcmp(data, old_data, 16)) {
-        return 0; // no new event
-    }
-    uint32_t r = 0;
-    if (old_data[2] == 0 && data[2] == 1) {
-        r = 0x00010000 + (data[4] << 8) + data[6]; // touch start
-    } else
-    if (old_data[2] == 1 && data[2] == 1) {
-        r = 0x00020000 + (data[4] << 8) + data[6]; // touch move
-    }
-    if (old_data[2] == 1 && data[2] == 0) {
-        r = 0x00040000 + (data[4] << 8) + data[6]; // touch end
-    }
-    memcpy(old_data, data, 16);
-    return r;
+    return touch_event();
 }
diff --git a/micropython/extmod/modtrezormsg/touch.h b/micropython/extmod/modtrezormsg/touch.h
new file mode 100644
index 00000000..40a02759
--- /dev/null
+++ b/micropython/extmod/modtrezormsg/touch.h
@@ -0,0 +1,40 @@
+extern I2C_HandleTypeDef I2CHandle1;
+extern void i2c_init(I2C_HandleTypeDef *i2c);
+extern HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+
+void touch_init(void)
+{
+    I2C_InitTypeDef *init = &(I2CHandle1.Init);
+    init->OwnAddress1 = 0xFE; // master
+    init->ClockSpeed = 400000;
+    init->DutyCycle = I2C_DUTYCYCLE_16_9;
+    init->AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
+    init->DualAddressMode = I2C_DUALADDRESS_DISABLED;
+    init->GeneralCallMode = I2C_GENERALCALL_DISABLED;
+    init->NoStretchMode   = I2C_NOSTRETCH_DISABLED;
+    init->OwnAddress2     = 0;
+    i2c_init(&I2CHandle1);
+}
+
+uint32_t touch_event(void)
+{
+    static uint8_t data[16], old_data[16];
+    if (HAL_OK != HAL_I2C_Master_Receive(&I2CHandle1, 56 << 1, data, 16, 1)) {
+        return 0; // read failure
+    }
+    if (0 == memcmp(data, old_data, 16)) {
+        return 0; // no new event
+    }
+    uint32_t r = 0;
+    if (old_data[2] == 0 && data[2] == 1) {
+        r = 0x00010000 + (data[4] << 8) + data[6]; // touch start
+    } else
+    if (old_data[2] == 1 && data[2] == 1) {
+        r = 0x00020000 + (data[4] << 8) + data[6]; // touch move
+    }
+    if (old_data[2] == 1 && data[2] == 0) {
+        r = 0x00040000 + (data[4] << 8) + data[6]; // touch end
+    }
+    memcpy(old_data, data, 16);
+    return r;
+}