From 595a191be4f6c95363ccdcad05fcdac58640ef6a Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 9 Jan 2016 11:19:01 +0100
Subject: [PATCH] [Horus] Compilation fix

---
 radio/src/gui/horus/bitmaps.cpp               |  28 ++++++------
 radio/src/gui/horus/lcd.cpp                   |   2 +-
 .../src/gui/horus/menu_general_sdmanager.cpp  |   2 +-
 radio/src/gui/horus/splash.cpp                |   2 +-
 radio/src/opentx.cpp                          |   2 +-
 radio/src/targets/horus/lcd_driver.cpp        |  43 ++++++++++--------
 ...=> lcdDrawBitmapLoadAndDisplay_212x64.png} | Bin
 7 files changed, 41 insertions(+), 38 deletions(-)
 rename radio/src/tests/{lcd_bmpLoadAndDisplay_212x64.png => lcdDrawBitmapLoadAndDisplay_212x64.png} (100%)

diff --git a/radio/src/gui/horus/bitmaps.cpp b/radio/src/gui/horus/bitmaps.cpp
index 7e71b8768..84c5d16ec 100644
--- a/radio/src/gui/horus/bitmaps.cpp
+++ b/radio/src/gui/horus/bitmaps.cpp
@@ -200,31 +200,31 @@ const uint8_t * const LBM_MODEL_ICONS[] = {
  *  Model selection screen bitmaps
  */
 
-const uint8_t LBM_LIBRARY_ICON[] __attribute__((aligned(32))) = {
+const uint8_t LBM_LIBRARY_ICON[] __DMA = {
 #include "mask_library.lbm"
 };
 
-const uint8_t LBM_LIBRARY_SLOT[] __attribute__((aligned(32))) = {
+const uint8_t LBM_LIBRARY_SLOT[] __DMA = {
 #include "mask_library_slot.lbm"
 };
 
-const uint8_t LBM_LIBRARY_CURSOR[] __attribute__((aligned(32))) = {
+const uint8_t LBM_LIBRARY_CURSOR[] __DMA = {
 #include "mask_library_category_index.lbm"
 };
 
-const uint8_t LBM_SCORE0[] __attribute__((aligned(32))) = {
+const uint8_t LBM_SCORE0[] __DMA = {
 #include "mask_library_score_0.lbm"
 };
 
-const uint8_t LBM_SCORE1[] __attribute__((aligned(32))) = {
+const uint8_t LBM_SCORE1[] __DMA = {
 #include "mask_library_score_1.lbm"
 };
 
-const uint8_t LBM_STAR0[] __attribute__((aligned(32))) = {
+const uint8_t LBM_STAR0[] __DMA = {
 #include "mask_library_star_0.lbm"
 };
 
-const uint8_t LBM_STAR1[] __attribute__((aligned(32))) = {
+const uint8_t LBM_STAR1[] __DMA = {
 #include "mask_library_star_1.lbm"
 };
 
@@ -232,30 +232,30 @@ const uint8_t LBM_STAR1[] __attribute__((aligned(32))) = {
  * Other
  */
 
-const uint8_t LBM_ASTERISK[] __attribute__((aligned(32))) = {
+const uint8_t LBM_ASTERISK[] __DMA = {
 #include "asterisk.lbm"
 };
 
-const uint8_t LBM_POINT[] __attribute__((aligned(32))) = {
+const uint8_t LBM_POINT[] __DMA = {
 #include "mask_point.lbm"
 };
 
-const uint8_t LBM_CURVE_POINT[] __attribute__((aligned(32))) = {
+const uint8_t LBM_CURVE_POINT[] __DMA = {
 #include "mask_cvpoint.lbm"
 };
 
-const uint8_t LBM_CURVE_POINT_CENTER[] __attribute__((aligned(32))) = {
+const uint8_t LBM_CURVE_POINT_CENTER[] __DMA = {
 #include "mask_cvpoint_center.lbm"
 };
 
-const uint8_t LBM_CURVE_COORD_SHADOW[] __attribute__((aligned(32))) = {
+const uint8_t LBM_CURVE_COORD_SHADOW[] __DMA = {
 #include "mask_coord_shadow.lbm"
 };
 
-const uint8_t LBM_SHUTDOWN[] __attribute__((aligned(32))) = {
+const uint8_t LBM_SHUTDOWN[] __DMA = {
 #include "shutdown.lbm"
 };
 
-const uint8_t LBM_SLEEP[] __attribute__((aligned(32))) = {
+const uint8_t LBM_SLEEP[] __DMA = {
 #include "sleep.lbm"
 };
\ No newline at end of file
diff --git a/radio/src/gui/horus/lcd.cpp b/radio/src/gui/horus/lcd.cpp
index 2f979094a..5533d4b7a 100644
--- a/radio/src/gui/horus/lcd.cpp
+++ b/radio/src/gui/horus/lcd.cpp
@@ -888,7 +888,7 @@ void lcdDrawBitmap(coord_t x, coord_t y, const uint8_t * bmp, coord_t offset, co
   }
 
   if (scale == 0) {
-    lcdDrawBitmapDMA(x, y, width, height, bmp + 4 + offset*width*2);
+    lcdDrawBitmapDMA(x, y, width, height, bmp + 4 + offset * width * 2);
   }
   else if (scale < 0) {
     for (coord_t i=0, row=0; row<height; i+=1, row-=scale) {
diff --git a/radio/src/gui/horus/menu_general_sdmanager.cpp b/radio/src/gui/horus/menu_general_sdmanager.cpp
index 1a1c9020d..78e154eec 100644
--- a/radio/src/gui/horus/menu_general_sdmanager.cpp
+++ b/radio/src/gui/horus/menu_general_sdmanager.cpp
@@ -360,7 +360,7 @@ bool menuGeneralSdManager(evt_t _event)
   if (ext && (!strcasecmp(ext, BITMAPS_EXT) || !strcasecmp(ext, PNG_EXT) || !strcasecmp(ext, JPG_EXT))) {
     if (lastBitmap != menuVerticalPosition) {
       lastBitmap = menuVerticalPosition;
-      if (imgLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
+      if (bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
         ((uint32_t *)modelBitmap)[0] = 0;
       }
     }
diff --git a/radio/src/gui/horus/splash.cpp b/radio/src/gui/horus/splash.cpp
index 47a65e821..98ca439f4 100644
--- a/radio/src/gui/horus/splash.cpp
+++ b/radio/src/gui/horus/splash.cpp
@@ -20,7 +20,7 @@
 
 #include "../../opentx.h"
 
-const uint8_t LBM_SPLASH[] __attribute__((aligned(32))) = {
+const uint8_t LBM_SPLASH[] __DMA = {
 #include "splash.lbm"
 };
 
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index f4d5fc6e4..7201a9a22 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -29,7 +29,7 @@ Clipboard clipboard;
 #endif
 
 #if (defined(PCBTARANIS) || defined(PCBHORUS)) && defined(SDCARD)
-uint8_t modelBitmap[MODEL_BITMAP_SIZE] __attribute__((aligned(32)));
+uint8_t modelBitmap[MODEL_BITMAP_SIZE] __DMA;
 bool loadModelBitmap(char * name, uint8_t * bitmap)
 {
   uint8_t len = zlen(name, LEN_BITMAP_NAME);
diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp
index 3e1bd3785..3d35089b5 100644
--- a/radio/src/targets/horus/lcd_driver.cpp
+++ b/radio/src/targets/horus/lcd_driver.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../../opentx.h"
 
 #define HBP  42
@@ -467,6 +467,9 @@ void lcdDrawSolidFilledRectDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, u
 
 void lcdDrawBitmapDMA(uint16_t x, uint16_t y, uint16_t w, uint16_t h, const uint8_t * bitmap)
 {
+  if ((uint32_t(bitmap) & 0x03) != 0)
+    return;
+
   uint32_t addr = CurrentFrameBuffer + 2*(LCD_W*y + x);
 
   DMA2D_DeInit();
diff --git a/radio/src/tests/lcd_bmpLoadAndDisplay_212x64.png b/radio/src/tests/lcdDrawBitmapLoadAndDisplay_212x64.png
similarity index 100%
rename from radio/src/tests/lcd_bmpLoadAndDisplay_212x64.png
rename to radio/src/tests/lcdDrawBitmapLoadAndDisplay_212x64.png