deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix use of noreturn attribute.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-10-11 17:01:53 +09:00
parent c191d86bf2
commit 55b011a721
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2017-10-11 NIIBE Yutaka <gniibe@fsij.org>
* mcu/sys-stm32f103.h (nonreturn_handler0, nonreturn_handler1): New.
2017-10-10 NIIBE Yutaka <gniibe@fsij.org> 2017-10-10 NIIBE Yutaka <gniibe@fsij.org>
* mcu/usb-usbip.c (usbip_run_server): Shutdown support. * mcu/usb-usbip.c (usbip_run_server): Shutdown support.

9
mcu/sys-stm32f103.h
View File

@@ -21,6 +21,8 @@ extern const uint8_t sys_board_name[];
#endif #endif
typedef void (*handler)(void); typedef void (*handler)(void);
typedef void (*nonreturn_handler0)(void)__attribute__((noreturn));
typedef void (*nonreturn_handler1)(void *)__attribute__((noreturn));
extern handler vector[16]; extern handler vector[16];
static inline const uint8_t * static inline const uint8_t *
@@ -90,10 +92,9 @@ flash_protect (void)
static inline void __attribute__((noreturn)) static inline void __attribute__((noreturn))
flash_erase_all_and_exec (void (*entry)(void)) flash_erase_all_and_exec (void (*entry)(void))
{ {
void (*func) (void (*)(void)) = (void (*)(void (*)(void)))vector[9]; nonreturn_handler1 func = (nonreturn_handler1) vector[9] ;
(*func) (entry); (*func) (entry);
for (;;);
} }
static inline void static inline void
@@ -111,7 +112,9 @@ usb_lld_sys_shutdown (void)
static inline void __attribute__((noreturn)) static inline void __attribute__((noreturn))
nvic_system_reset (void) nvic_system_reset (void)
{ {
(*vector[12]) (); nonreturn_handler0 func = (nonreturn_handler0)vector[12];
(func) ();
} }
#ifdef REQUIRE_CLOCK_GPIO_SETTING_IN_SYS #ifdef REQUIRE_CLOCK_GPIO_SETTING_IN_SYS