merged trunk changes

This commit is contained in:
Markus Fröschle
2012-12-10 11:20:59 +00:00
parent d270a93d02
commit e96af7f2cc
28 changed files with 38 additions and 8128 deletions

View File

@@ -30,18 +30,13 @@
#include "bas_printf.h"
#include "bas_types.h"
#include "sd_card.h"
#include "diskio.h"
#include "ff.h"
#include <wait.h>
/* imported routines */
extern int mmu_init();
extern int vec_init();
extern int illegal_table_make();
/* wait...() routines moved to sysinit.c */
extern inline void wait(volatile uint32_t us);
extern inline volatile bool waitfor(volatile uint32_t us, int (*condition)(void));
/* Symbols from the linker script */
extern uint8_t _STRAM_END[];
#define STRAM_END ((uint32_t)_STRAM_END)