Skip to content

CM3DS Maintenance Pull Request: Cleaning #6696

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 4 commits into from
Apr 27, 2018
Merged

CM3DS Maintenance Pull Request: Cleaning #6696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f107d2
CM3DS: merge the two system header files into one
hug-dev Apr 20, 2018
b68ef39
CM3DS: fix clock frequency value
hug-dev Apr 20, 2018
17b3cb1
CM3DS: fix compiler warnings
hug-dev Apr 20, 2018
e4b4a2f
CM3DS: switch us_ticker HAL to the tick domain
hug-dev Apr 19, 2018
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
25 changes: 0 additions & 25 deletions targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PeripheralNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,6 @@ typedef enum {
SPI_NC = (SPI_4 + 1)
} SPIName;

typedef enum {
PWM_1 = 0,
PWM_2,
PWM_3,
PWM_4,
PWM_5,
PWM_6,
PWM_7,
PWM_8,
PWM_9,
PWM_10,
PWM_11
} PWMName;

#define STDIO_UART_TX USBTX
#define STDIO_UART_RX USBRX
#define STDIO_UART UART_1

#define MBED_UART0 MCC_TX, MCC_RX
#define MBED_UART1 USBTX, USBRX
#define MBED_UART2 XB_TX, XB_RX
#define MBED_UART3 SH0_TX, SH0_RX
#define MBED_UART4 SH1_TX, SH1_RX
#define MBED_UARTUSB USBTX, USBRX

#ifdef __cplusplus
}
#endif
Expand Down
6 changes: 4 additions & 2 deletions targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/PinNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

#include "cmsis.h"

/* Pins used by mbed OS to identify STDIO UART pins */
#define STDIO_UART_TX USBTX
#define STDIO_UART_RX USBRX

#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -27,8 +31,6 @@ typedef enum {
PIN_OUTPUT
} PinDirection;

#define PORT_SHIFT 5

typedef enum {
/* MPS2 EXP Pin Names */
EXP0 = 0,
Expand Down
90 changes: 0 additions & 90 deletions targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/SDK/fpga.c
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/SDK/fpga.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/cmsdk_ticker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <stdbool.h>

#include "CMSDK_CM3DS.h"
#include "CM3DS.h"
#include "timer_cmsdk_drv.h"

#define SEC_TO_USEC_MULTIPLIER 1000000U
Expand Down
6 changes: 5 additions & 1 deletion targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2017 ARM Limited
* Copyright (c) 2006-2018 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,6 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/*
* This file is included by every HAL implementations.
*/
#ifndef MBED_DEVICE_H
#define MBED_DEVICE_H

Expand Down
Loading