From b6ab7c8e3941846d05b13fec380e81f483e0bb32 Mon Sep 17 00:00:00 2001 From: t-moe Date: Sun, 10 May 2015 14:54:07 +0200 Subject: [PATCH] Fixed compiler warning in tft and screen module. --- common/gui/screen.c | 8 ++++---- common/tft/tft.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/gui/screen.c b/common/gui/screen.c index a8a34ea..23315f0 100644 --- a/common/gui/screen.c +++ b/common/gui/screen.c @@ -1,8 +1,8 @@ #include "screen.h" -static volatile SCREEN_STRUCT* screen_list = NULL; -static volatile SCREEN_STRUCT* screen_current = NULL; +static SCREEN_STRUCT* screen_list = NULL; +static SCREEN_STRUCT* screen_current = NULL; static volatile SCREEN_STRUCT* screen_goto = NULL; SCREEN_STRUCT* gui_screen_get_current() { @@ -11,7 +11,7 @@ SCREEN_STRUCT* gui_screen_get_current() { void gui_screen_update() { if(screen_goto!=NULL) { //we received the task to switch the screen - SCREEN_STRUCT* go = screen_goto; //Backup volatile variable + SCREEN_STRUCT* go = (SCREEN_STRUCT*) screen_goto; //Backup volatile variable screen_goto=NULL; if(go->next!=NULL) { //we're going back if(go->next!=screen_current) return; //list corrupted? @@ -26,7 +26,7 @@ void gui_screen_update() { } } go->on_enter(go); - screen_current = go; + screen_current =go; } if(screen_current!=NULL) { //A screen has been set diff --git a/common/tft/tft.c b/common/tft/tft.c index 67fc977..2395668 100644 --- a/common/tft/tft.c +++ b/common/tft/tft.c @@ -2,6 +2,7 @@ #include "ll_tft.h" #include #include +#include bool tft_init() { return ll_tft_init();