From a2ebdcdbc12db3092669f17fdfc1114579a8b1de Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Thu, 10 Jan 2019 15:32:10 +0100
Subject: [PATCH] [ion/f730] Fix includes for the right PLATFORM

---
 ion/src/f730/backlight.h                 | 1 +
 ion/src/f730/bench/command/adc.cpp       | 2 +-
 ion/src/f730/bench/command/backlight.cpp | 2 +-
 ion/src/f730/bench/command/display.cpp   | 2 +-
 ion/src/f730/bench/command/led.cpp       | 2 +-
 ion/src/f730/bench/command/print.cpp     | 2 +-
 ion/src/f730/bench/command/vblank.cpp    | 2 +-
 ion/src/f730/usb/calculator.cpp          | 6 +++---
 ion/src/f730/usb/dfu_interface.cpp       | 2 +-
 ion/src/f730/usb/dfu_relocated.cpp       | 6 +++---
 ion/src/f730/usb/stack/device.cpp        | 2 +-
 ion/src/f730/usb/stack/endpoint0.cpp     | 2 +-
 12 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ion/src/f730/backlight.h b/ion/src/f730/backlight.h
index 026fcd537..527bc1344 100644
--- a/ion/src/f730/backlight.h
+++ b/ion/src/f730/backlight.h
@@ -2,6 +2,7 @@
 #define ION_DEVICE_BACKLIGHT_H
 
 #include <ion/backlight.h>
+#include "regs/regs.h"
 
 namespace Ion {
 namespace Backlight {
diff --git a/ion/src/f730/bench/command/adc.cpp b/ion/src/f730/bench/command/adc.cpp
index 8c3e677a4..26f86c0a9 100644
--- a/ion/src/f730/bench/command/adc.cpp
+++ b/ion/src/f730/bench/command/adc.cpp
@@ -1,7 +1,7 @@
 #include "command.h"
 #include <ion.h>
 #include <poincare/print_float.h>
-#include <ion/src/device/led.h>
+#include <ion/src/f730/led.h>
 
 namespace Ion {
 namespace Device {
diff --git a/ion/src/f730/bench/command/backlight.cpp b/ion/src/f730/bench/command/backlight.cpp
index b4a7f2d9f..86e630c55 100644
--- a/ion/src/f730/bench/command/backlight.cpp
+++ b/ion/src/f730/bench/command/backlight.cpp
@@ -1,6 +1,6 @@
 #include "command.h"
 #include <ion.h>
-#include <ion/src/device/backlight.h>
+#include <ion/src/f730/backlight.h>
 
 namespace Ion {
 namespace Device {
diff --git a/ion/src/f730/bench/command/display.cpp b/ion/src/f730/bench/command/display.cpp
index 553e6e54a..61b74c322 100644
--- a/ion/src/f730/bench/command/display.cpp
+++ b/ion/src/f730/bench/command/display.cpp
@@ -1,6 +1,6 @@
 #include "command.h"
 #include <ion.h>
-#include <ion/src/device/display.h>
+#include <ion/src/f730/display.h>
 #include <poincare/integer.h>
 
 namespace Ion {
diff --git a/ion/src/f730/bench/command/led.cpp b/ion/src/f730/bench/command/led.cpp
index 43f7fcac1..4d6f80e81 100644
--- a/ion/src/f730/bench/command/led.cpp
+++ b/ion/src/f730/bench/command/led.cpp
@@ -1,6 +1,6 @@
 #include "command.h"
 #include <ion.h>
-#include <ion/src/device/led.h>
+#include <ion/src/f730/led.h>
 
 namespace Ion {
 namespace Device {
diff --git a/ion/src/f730/bench/command/print.cpp b/ion/src/f730/bench/command/print.cpp
index 8b5eb3bfc..fa73e6234 100644
--- a/ion/src/f730/bench/command/print.cpp
+++ b/ion/src/f730/bench/command/print.cpp
@@ -1,6 +1,6 @@
 #include "command.h"
 #include <ion.h>
-#include <ion/src/device/led.h>
+#include <ion/src/f730/led.h>
 #include <kandinsky.h>
 
 namespace Ion {
diff --git a/ion/src/f730/bench/command/vblank.cpp b/ion/src/f730/bench/command/vblank.cpp
index 3c6971061..d292cab26 100644
--- a/ion/src/f730/bench/command/vblank.cpp
+++ b/ion/src/f730/bench/command/vblank.cpp
@@ -1,6 +1,6 @@
 #include "command.h"
 #include <ion.h>
-#include <ion/src/device/display.h>
+#include <ion/src/f730/display.h>
 
 namespace Ion {
 namespace Device {
diff --git a/ion/src/f730/usb/calculator.cpp b/ion/src/f730/usb/calculator.cpp
index fc23c1512..47150f053 100644
--- a/ion/src/f730/usb/calculator.cpp
+++ b/ion/src/f730/usb/calculator.cpp
@@ -1,8 +1,8 @@
 #include "calculator.h"
 #include <ion/usb.h>
-#include <ion/src/device/regs/regs.h>
-#include <ion/src/device/device.h>
-#include <ion/src/device/keyboard.h>
+#include <ion/src/f730/regs/regs.h>
+#include <ion/src/f730/device.h>
+#include <ion/src/f730/keyboard.h>
 
 namespace Ion {
 namespace USB {
diff --git a/ion/src/f730/usb/dfu_interface.cpp b/ion/src/f730/usb/dfu_interface.cpp
index 029cce703..395576cc6 100644
--- a/ion/src/f730/usb/dfu_interface.cpp
+++ b/ion/src/f730/usb/dfu_interface.cpp
@@ -1,6 +1,6 @@
 #include "dfu_interface.h"
 #include <string.h>
-#include <ion/src/device/flash.h>
+#include <ion/src/f730/flash.h>
 
 namespace Ion {
 namespace USB {
diff --git a/ion/src/f730/usb/dfu_relocated.cpp b/ion/src/f730/usb/dfu_relocated.cpp
index 41566e2a0..6f4191ea8 100644
--- a/ion/src/f730/usb/dfu_relocated.cpp
+++ b/ion/src/f730/usb/dfu_relocated.cpp
@@ -1,7 +1,7 @@
 #include <ion/usb.h>
 #include <string.h>
 #include <assert.h>
-#include <ion/src/device/device.h>
+#include <ion/src/f730/device.h>
 
 extern char _stack_end;
 extern char _dfu_bootloader_flash_start;
@@ -60,11 +60,11 @@ void DFU() {
 
   /* To have the right debug symbols for the reallocated code, break here and:
    *  - Get the address of the new .text section
-   *        In a terminal: arm-none-eabi-readelf -a ion/src/device/usb/dfu.elf
+   *        In a terminal: arm-none-eabi-readelf -a ion/src/f730/usb/dfu.elf
    *  - Delete the current symbol table
    *        symbol-file
    *  - Add the new symbol table, with the address of the new .text section
-   *        add-symbol-file ion/src/device/usb/dfu.elf 0x20038000
+   *        add-symbol-file ion/src/f730/usb/dfu.elf 0x20038000
    */
 
   dfu_bootloader_entry(true);
diff --git a/ion/src/f730/usb/stack/device.cpp b/ion/src/f730/usb/stack/device.cpp
index 27bf6d5de..cd2d7fb5b 100644
--- a/ion/src/f730/usb/stack/device.cpp
+++ b/ion/src/f730/usb/stack/device.cpp
@@ -1,5 +1,5 @@
 #include "device.h"
-#include <ion/src/device/regs/regs.h>
+#include <ion/src/f730/regs/regs.h>
 
 namespace Ion {
 namespace USB {
diff --git a/ion/src/f730/usb/stack/endpoint0.cpp b/ion/src/f730/usb/stack/endpoint0.cpp
index df41e4bd3..957a577f2 100644
--- a/ion/src/f730/usb/stack/endpoint0.cpp
+++ b/ion/src/f730/usb/stack/endpoint0.cpp
@@ -1,6 +1,6 @@
 #include "endpoint0.h"
 #include <string.h>
-#include <ion/src/device/regs/regs.h>
+#include <ion/src/f730/regs/regs.h>
 #include "device.h"
 #include "interface.h"
 #include "request_recipient.h"