aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2015-07-14 21:26:10 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2015-07-14 21:26:10 +0900
commita48ffaef47bdd48efe4c5df5361ba3897e441796 (patch)
tree23d50bd845ec0d826be2526a1c190bba43635eb4
parent27f71ff5c093f740c78a28644e3be2843c660b7d (diff)
fix sys.c
-rw-r--r--example-cdc/sys.c4
-rw-r--r--example-cdc/sys.h12
2 files changed, 14 insertions, 2 deletions
diff --git a/example-cdc/sys.c b/example-cdc/sys.c
index 968b133..586a79f 100644
--- a/example-cdc/sys.c
+++ b/example-cdc/sys.c
@@ -253,7 +253,7 @@ static int
flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
{
int status;
- uint32_t flash_end = FLASH_START + (*FLASH_SIZE_REG)*1024;
+ uint32_t flash_end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
if (dst_addr < FLASH_START || dst_addr + len > flash_end)
return 0;
@@ -309,7 +309,7 @@ static void __attribute__((naked))
flash_erase_all_and_exec (void (*entry)(void))
{
uint32_t addr = FLASH_START;
- uint32_t end = FLASH_START + (*FLASH_SIZE_REG)*1024;
+ uint32_t end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
uint32_t page_size = 1024;
int r;
diff --git a/example-cdc/sys.h b/example-cdc/sys.h
index 25d33f1..3127341 100644
--- a/example-cdc/sys.h
+++ b/example-cdc/sys.h
@@ -1,4 +1,16 @@
+#define BOARD_ID_CQ_STARM 0xc5480875
+#define BOARD_ID_FST_01_00 0x613870a9
+#define BOARD_ID_FST_01 0x696886af
+#define BOARD_ID_MAPLE_MINI 0x7a445272
+#define BOARD_ID_OLIMEX_STM32_H103 0xf92bb594
+#define BOARD_ID_STBEE_MINI 0x1f341961
+#define BOARD_ID_STBEE 0x945c37e8
+#define BOARD_ID_STM32_PRIMER2 0x21e5798d
+#define BOARD_ID_STM8S_DISCOVERY 0x2f0976bb
+
extern const uint8_t sys_version[8];
+extern const uint32_t sys_board_id;
+extern const uint8_t sys_board_name[];
typedef void (*handler)(void);
extern handler vector[16];