riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://ukleos.des-mesh.net/home/git/ukleos

Browse Source
This commit is contained in:
Oliver Hahm 2011-03-25 11:42:33 +01:00
commit 2a0a912a61
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chronos/drivers/display.c
View File

@ -57,7 +57,7 @@ void display_symbol(uint8_t symbol, uint8_t mode);
* Global Variable section */
/* Display flags */
volatile s_display_flags display;
volatile s_display_flags_t display;
/* Global return string for itoa function */
char itoa_str[8];

4
chronos/drivers/include/display.h
View File

@ -67,9 +67,9 @@ typedef union {
uint16_t update_acceleration : 1; // 1 = Acceleration data was updated
} flag;
uint16_t all_flags; // Shortcut to all display flags (for reset)
} s_display_flags;
} s_display_flags_t;
extern volatile s_display_flags display;
extern volatile s_display_flags_t display;
// Constants defined in library
extern const uint8_t lcd_font[];

8
msba2-common/drivers/msba2-uart0.c
View File

@ -49,13 +49,13 @@ and the mailinglist (subscription via web site)
* @note $Id$
*/
typedef struct toprint {
typedef struct toprint_t {
unsigned int len;
char content[];
}toprint;
}toprint_t;
#define QUEUESIZE 255
static volatile toprint* queue[QUEUESIZE];
static volatile toprint_t* queue[QUEUESIZE];
static volatile unsigned char queue_head = 0;
static volatile unsigned char queue_tail = 0;
static volatile unsigned char queue_items = 0;
@ -64,7 +64,7 @@ static volatile unsigned int actual_pos = 0;
static volatile unsigned int running = 0;
static volatile unsigned int fifo = 0;
static volatile toprint* actual = NULL;
static volatile toprint_t* actual = NULL;
static inline void enqueue(void) {
queue_items++;