Skip to content

[Silicon Labs] Fix compile warnings and ticker test failure #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2017
Merged

[Silicon Labs] Fix compile warnings and ticker test failure #4042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions targets/TARGET_Silicon_Labs/TARGET_EFM32/common/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -84,9 +84,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

Expand Down
2 changes: 0 additions & 2 deletions targets/TARGET_Silicon_Labs/TARGET_EFM32/lp_ticker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down