ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4471 from c1728p9/workshop_rebase_4042 

[Silicon Labs] Fix compile warnings and ticker test failure
pull/4478/head^2
Sam Grove 2017-06-08 15:53:55 -05:00 committed by GitHub
parent 9122ed60cd 29bef6fd05
commit c136c1330f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
targets/TARGET_Silicon_Labs/TARGET_EFM32/common/objects.h
View File

@ -37,9 +37,9 @@ extern "C" {
#endif
typedef struct {
PinName pin:8;
PinMode mode:6;
PinDirection dir:2;
PinName pin;
PinMode mode;
PinDirection dir;
} gpio_t;
#if DEVICE_ANALOGIN
@ -85,9 +85,9 @@ struct pwmout_s {
#if DEVICE_INTERRUPTIN
struct gpio_irq_s {
PinName pin:8; // Pin number 4 least significant bits, port number 4 most significant bits
uint32_t risingEdge:1;
uint32_t fallingEdge:1;
PinName pin;
uint8_t risingEdge;
uint8_t fallingEdge;
};
#endif

2
targets/TARGET_Silicon_Labs/TARGET_EFM32/lp_ticker.c
View File

@ -95,7 +95,6 @@ void lp_ticker_set_interrupt(timestamp_t timestamp)
inline void lp_ticker_disable_interrupt()
{
RTC_IntDisable(RTC_IF_COMP0);
lp_ticker_free();
}
inline void lp_ticker_clear_interrupt()
@ -164,7 +163,6 @@ void lp_ticker_set_interrupt(timestamp_t timestamp)
inline void lp_ticker_disable_interrupt()
{
RTCC_IntDisable(RTCC_IF_CC0);
lp_ticker_free();
}
inline void lp_ticker_clear_interrupt()