Skip to content

Commit 1f3003f

Browse files
committed
[EFM32] Small fixes
* Use mbed_error * Include cmsis headers by default when grabbing device.h * Get rid of enum to uint casting in pinmap
1 parent 4df6986 commit 1f3003f

File tree

9 files changed

+6
-83
lines changed

9 files changed

+6
-83
lines changed

targets/TARGET_Silicon_Labs/TARGET_EFM32/analogout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#if DEVICE_ANALOGOUT
2626

2727
#include "mbed_assert.h"
28-
#include "error.h"
28+
#include "mbed_error.h"
2929
#include "analogout_api.h"
3030
#include "pinmap.h"
3131
#include "pinmap_function.h"

targets/TARGET_Silicon_Labs/TARGET_EFM32/common/device.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#ifndef MBED_DEVICE_H
2424
#define MBED_DEVICE_H
2525

26+
#include "cmsis.h"
2627
#include "objects.h"
2728
#include "device_peripherals.h"
2829

targets/TARGET_Silicon_Labs/TARGET_EFM32/common/error.h

Lines changed: 0 additions & 74 deletions
This file was deleted.

targets/TARGET_Silicon_Labs/TARGET_EFM32/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void pin_function(PinName pin, int function)
3535

3636
void pin_mode(PinName pin, PinMode mode)
3737
{
38-
MBED_ASSERT((0xFFFFFF00 |pin) != NC);
38+
MBED_ASSERT(pin != NC);
3939

4040
/* Enable GPIO clock if not already done */
4141
if (!gpio_clock_inited) {

targets/TARGET_Silicon_Labs/TARGET_EFM32/pinmap_function.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "pinmap_function.h"
2525
#include "PinNames.h"
26-
#include "error.h"
26+
#include "mbed_error.h"
2727

2828
/**
2929
* Get the value of the function field for a pin in a pinmap

targets/TARGET_Silicon_Labs/TARGET_EFM32/pwmout_api.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include "mbed_assert.h"
2929
#include "pwmout_api.h"
30-
#include "cmsis.h"
3130
#include "pinmap.h"
3231
#include "PeripheralPins.h"
3332
#include "device_peripherals.h"

targets/TARGET_Silicon_Labs/TARGET_EFM32/sleep.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
#include "sleep_api.h"
2828
#include "sleepmodes.h"
29-
#include "cmsis.h"
3029
#include "em_emu.h"
3130
#include "critical.h"
3231

targets/TARGET_Silicon_Labs/TARGET_EFM32/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "PeripheralPins.h"
3030
#include "pinmap.h"
3131
#include "pinmap_function.h"
32-
#include "error.h"
32+
#include "mbed_error.h"
3333

3434
#include "dma_api.h"
3535
#include "dma_api_HAL.h"

targets/TARGET_Silicon_Labs/TARGET_EFM32/us_ticker.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323

2424
#include <stddef.h>
2525
#include "us_ticker_api.h"
26-
#include "cmsis.h"
26+
#include "device.h"
2727
#include "mbed_assert.h"
2828
#include "em_cmu.h"
2929
#include "em_timer.h"
30-
#include "device_peripherals.h"
31-
#include "device.h"
3230
#include "clocking.h"
3331
#include "sleep_api.h"
3432
#include "sleepmodes.h"

0 commit comments

Comments
 (0)