Skip to content

Commit 9f107d2

Browse files
committed
CM3DS: merge the two system header files into one
This commit does not bring functional changes. Here is the list of changes: - merge CMSDK_CM3DS.h and SMM_MPS2.h into CM3DS.h - remove unused code - split copyright headers from first comment of each file Change-Id: I79b7ee01689439b7d2fde9d13035a5edf17f69ff Signed-off-by: Hugues de Valon <[email protected]>
1 parent cabef4d commit 9f107d2

24 files changed

+186
-754
lines changed

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PeripheralNames.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,6 @@ typedef enum {
6161
SPI_NC = (SPI_4 + 1)
6262
} SPIName;
6363

64-
typedef enum {
65-
PWM_1 = 0,
66-
PWM_2,
67-
PWM_3,
68-
PWM_4,
69-
PWM_5,
70-
PWM_6,
71-
PWM_7,
72-
PWM_8,
73-
PWM_9,
74-
PWM_10,
75-
PWM_11
76-
} PWMName;
77-
78-
#define STDIO_UART_TX USBTX
79-
#define STDIO_UART_RX USBRX
80-
#define STDIO_UART UART_1
81-
82-
#define MBED_UART0 MCC_TX, MCC_RX
83-
#define MBED_UART1 USBTX, USBRX
84-
#define MBED_UART2 XB_TX, XB_RX
85-
#define MBED_UART3 SH0_TX, SH0_RX
86-
#define MBED_UART4 SH1_TX, SH1_RX
87-
#define MBED_UARTUSB USBTX, USBRX
88-
8964
#ifdef __cplusplus
9065
}
9166
#endif

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PinNames.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818

1919
#include "cmsis.h"
2020

21+
/* Pins used by mbed OS to identify STDIO UART pins */
22+
#define STDIO_UART_TX USBTX
23+
#define STDIO_UART_RX USBRX
24+
2125
#ifdef __cplusplus
2226
extern "C" {
2327
#endif
@@ -27,8 +31,6 @@ typedef enum {
2731
PIN_OUTPUT
2832
} PinDirection;
2933

30-
#define PORT_SHIFT 5
31-
3234
typedef enum {
3335
/* MPS2 EXP Pin Names */
3436
EXP0 = 0,

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/SDK/fpga.c

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

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/SDK/fpga.h

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

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/cmsdk_ticker.h

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

3333
#include <stdbool.h>
3434

35-
#include "CMSDK_CM3DS.h"
35+
#include "CM3DS.h"
3636
#include "timer_cmsdk_drv.h"
3737

3838
#define SEC_TO_USEC_MULTIPLIER 1000000U

targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* mbed Microcontroller Library
2-
* Copyright (c) 2006-2017 ARM Limited
2+
* Copyright (c) 2006-2018 ARM Limited
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,6 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
17+
/*
18+
* This file is included by every HAL implementations.
19+
*/
1620
#ifndef MBED_DEVICE_H
1721
#define MBED_DEVICE_H
1822

0 commit comments

Comments
 (0)