sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #241 from gsmcmullin/no_magic_vtor 

Use vector_table symbol for assignment of SCB_VTOR.
This commit is contained in:
Gareth McMullin 2017-06-22 16:31:09 -07:00 committed by GitHub
parent e9cdd5ec56 2eb2f8edd7
commit 40ac8e1004
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platforms/native/platform.c
View File

@ -161,7 +161,8 @@ void platform_init(void)
GPIO_CNF_INPUT_PULL_UPDOWN, GPIO0); GPIO_CNF_INPUT_PULL_UPDOWN, GPIO0);
} }
/* Relocate interrupt vector table here */ /* Relocate interrupt vector table here */
SCB_VTOR = 0x2000; extern int vector_table;
SCB_VTOR = (uint32_t)&vector_table;
platform_timing_init(); platform_timing_init();
cdcacm_init(); cdcacm_init();

4
src/platforms/stlink/platform.c
View File

@ -101,7 +101,9 @@ void platform_init(void)
gpio_set_mode(LED_PORT, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(LED_PORT, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, led_idle_run); GPIO_CNF_OUTPUT_PUSHPULL, led_idle_run);
SCB_VTOR = 0x2000; /* Relocate interrupt vector table here */ /* Relocate interrupt vector table here */
extern int vector_table;
SCB_VTOR = (uint32_t)&vector_table;
platform_timing_init(); platform_timing_init();
cdcacm_init(); cdcacm_init();

4
src/platforms/swlink/platform.c
View File

@ -77,7 +77,9 @@ void platform_init(void)
data |= AFIO_MAPR_TIM2_REMAP_PARTIAL_REMAP1; data |= AFIO_MAPR_TIM2_REMAP_PARTIAL_REMAP1;
AFIO_MAPR = data; AFIO_MAPR = data;
SCB_VTOR = 0x2000; // Relocate interrupt vector table here /* Relocate interrupt vector table here */
extern int vector_table;
SCB_VTOR = (uint32_t)&vector_table;
platform_timing_init(); platform_timing_init();
cdcacm_init(); cdcacm_init();