modtrezorio: remove mocks

SConscript.unix

@@ -222,8 +222,11 @@ SOURCE_UNIX = [
     'vendor/micropython/ports/unix/moduselect.c',
     'vendor/micropython/ports/unix/alloc.c',
     'embed/unix/common.c',
-    'embed/unix/touch.c',
     'embed/unix/flash.c',
+    'embed/unix/sdcard.c',
+    'embed/unix/sbu.c',
+    'embed/unix/touch.c',
+    'embed/unix/usb.c',
 ]
 
 SOURCE_EMIT_NATIVE = ['vendor/micropython/py/emitnative.c']

embed/extmod/modtrezorconfig/norcow.c

@@ -3,7 +3,7 @@
 #include "norcow.h"
 
 #include "common.h"
-#include "../../trezorhal/flash.h"
+#include "flash.h"
 
 #ifndef NORCOW_SECTORS
 #define NORCOW_SECTORS {FLASH_SECTOR_STORAGE_1, FLASH_SECTOR_STORAGE_2}

embed/extmod/modtrezorconfig/norcow.h

@@ -2,7 +2,7 @@
 #define __NORCOW_H__
 
 #include <stdint.h>
-#include "../../trezorhal/secbool.h"
+#include "secbool.h"
 
 /*
  * Storage parameters:

embed/extmod/modtrezorconfig/storage.c

@@ -9,7 +9,8 @@
 
 #include "common.h"
 #include "norcow.h"
-#include "../../trezorhal/flash.h"
+#include "flash.h"
+
 #include "py/runtime.h"
 #include "py/obj.h"
 

embed/extmod/modtrezorconfig/storage.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "../../trezorhal/secbool.h"
+#include "secbool.h"
 #include "py/obj.h"
 
 void storage_init(void);

embed/extmod/modtrezorio/modtrezorio-flash.h

@@ -5,7 +5,7 @@
  * see LICENSE file for details
  */
 
-#include "../../trezorhal/flash.h"
+#include "flash.h"
 
 /// class FlashOTP:
 ///     '''

embed/extmod/modtrezorio/modtrezorio-msg.h

@@ -8,15 +8,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined TREZOR_STM32
 #include "usb.h"
 #include "touch.h"
-#include "pendsv.h"
-#elif defined TREZOR_UNIX
-#include "unix-msg-mock.h"
-#else
-#error Unsupported TREZOR port. Only STM32 and UNIX ports are supported.
-#endif
+
+void pendsv_kbd_intr(void);
+void mp_hal_set_vcp_iface(int iface_num);
 
 #define TOUCH_IFACE (255)
 #define POLL_READ  (0x0000)

embed/extmod/modtrezorio/modtrezorio-sbu.h

@@ -5,13 +5,7 @@
  * see LICENSE file for details
  */
 
-#if defined TREZOR_STM32
 #include "sbu.h"
-#elif defined TREZOR_UNIX
-#include "unix-sbu-mock.h"
-#else
-#error Unsupported TREZOR port. Only STM32 and UNIX ports are supported.
-#endif
 
 /// class SBU:
 ///     '''

embed/extmod/modtrezorio/modtrezorio-sdcard.h

@@ -5,13 +5,7 @@
  * see LICENSE file for details
  */
 
-#if defined TREZOR_STM32
 #include "sdcard.h"
-#elif defined TREZOR_UNIX
-#include "unix-sdcard-mock.h"
-#else
-#error Unsupported TREZOR port. Only STM32 and UNIX ports are supported.
-#endif
 
 /// class SDCard:
 ///     '''

embed/unix/common.h

@@ -1,7 +1,7 @@
 #ifndef __TREZORUNIX_COMMON_H__
 #define __TREZORUNIX_COMMON_H__
 
-#include "../trezorhal/secbool.h"
+#include "secbool.h"
 
 void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
 

embed/unix/flash.c

@@ -14,10 +14,10 @@
 #include <sys/types.h>
 
 #include "common.h"
-#include "../trezorhal/flash.h"
+#include "flash.h"
 
 #ifndef FLASH_FILE
-#define FLASH_FILE "/var/tmp/trezor.config"
+#define FLASH_FILE "/var/tmp/trezor.flash"
 #endif
 
 #define SECTOR_COUNT 24

embed/unix/flash.h

@@ -0,0 +1 @@
+../trezorhal/flash.h

embed/unix/sbu.c

@@ -5,7 +5,7 @@
  * see LICENSE file for details
  */
 
-#include "../../trezorhal/sbu.h"
+#include "sbu.h"
 
 void sbu_init(void)
 {

embed/unix/sbu.h

@@ -0,0 +1 @@
+../trezorhal/sbu.h

embed/unix/sdcard.c

@@ -5,7 +5,7 @@
  * see LICENSE file for details
  */
 
-#include "../../trezorhal/sdcard.h"
+#include "sdcard.h"
 
 void sdcard_init(void) {
 }

embed/unix/sdcard.h

@@ -0,0 +1 @@
+../trezorhal/sdcard.h

embed/unix/secbool.h

@@ -0,0 +1 @@
+../trezorhal/secbool.h

embed/unix/touch.c

@@ -11,7 +11,7 @@
 #endif
 
 #include "options.h"
-#include "embed/trezorhal/touch.h"
+#include "touch.h"
 
 void __shutdown(void);
 

embed/unix/touch.h

@@ -0,0 +1 @@
+../trezorhal/touch.h

embed/unix/usb.c

@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../trezorhal/usb.h"
-#include "../../trezorhal/touch.h"
+#include "usb.h"
+#include "touch.h"
 
 void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
 

embed/unix/usb.h

@@ -0,0 +1 @@
+../trezorhal/usb.h

embed/unix/usb_hid-defs.h

@@ -0,0 +1 @@
+../trezorhal/usb_hid-defs.h

embed/unix/usb_vcp-defs.h

@@ -0,0 +1 @@
+../trezorhal/usb_vcp-defs.h