[Horus] Compilation fix

This commit is contained in:
Bertrand Songis
2016-01-09 11:19:01 +01:00
parent 1ff32c64f5
commit 595a191be4
7 changed files with 41 additions and 38 deletions
+14 -14
View File
@@ -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"
};
+1 -1
View File
@@ -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) {
@@ -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;
}
}
+1 -1
View File
@@ -20,7 +20,7 @@
#include "../../opentx.h"
const uint8_t LBM_SPLASH[] __attribute__((aligned(32))) = {
const uint8_t LBM_SPLASH[] __DMA = {
#include "splash.lbm"
};