Skip to content
Snippets Groups Projects
Commit a397c791 authored by Martine Lenders's avatar Martine Lenders Committed by GitHub
Browse files

Merge pull request #6349 from haukepetersen/mv_msp430_common

cpu: moved msp430-common to msp430_common
parents 1e06934d 63599e25
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 11 deletions
MODULE = cpu MODULE = cpu
DIRS = $(RIOTCPU)/msp430-common periph DIRS = $(RIOTCPU)/msp430_common periph
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/ INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/
include $(RIOTCPU)/msp430-common/Makefile.include include $(RIOTCPU)/msp430_common/Makefile.include
export USEMODULE += periph export USEMODULE += periph
File moved
INCLUDES += -I$(RIOTCPU)/msp430-common/include/ INCLUDES += -I$(RIOTCPU)/msp430_common/include/
export UNDEF += $(BINDIR)/msp430_common/startup.o export UNDEF += $(BINDIR)/msp430_common/startup.o
export USEMODULE += msp430_common export USEMODULE += msp430_common
......
File moved
File moved
...@@ -35,20 +35,38 @@ extern "C" { ...@@ -35,20 +35,38 @@ extern "C" {
#define EOVERFLOW (65) #define EOVERFLOW (65)
#endif #endif
/**
* @brief Definition of `time_t` for the MSP430
*
* @todo Remove once msp430 libc supports `time_t`
*/
typedef unsigned long time_t; typedef unsigned long time_t;
/**
* @brief Definition of `struct timespec` for the MSP430
*
* @todo Remove once msp430 libc supports `struct timespec`
*/
struct timespec { struct timespec {
time_t tv_sec; /* Seconds */ time_t tv_sec; /**< seconds */
long tv_nsec; /* Nanoseconds */ long tv_nsec; /**< nanoseconds */
}; };
/* TODO: remove once msp430 libc supports struct timeval */ /**
* @brief Definition of `struct timeval` for the MSP430
*
* @todo Remove once msp430 libc supports struct timeval
*/
struct timeval { struct timeval {
time_t tv_sec; time_t tv_sec; /**< seconds */
time_t tv_usec; time_t tv_usec; /**< microseconds */
}; };
/* TODO: remove once msp430 libc supports clockid_t */ /**
* @brief Definition of `clockid_t` for the MSP430
*
* @todo Remove once msp430 libc supports clockid_t
*/
typedef int clockid_t; typedef int clockid_t;
#ifdef __cplusplus #ifdef __cplusplus
......
File moved
File moved
File moved
File moved
...@@ -2,6 +2,6 @@ MODULE =cpu ...@@ -2,6 +2,6 @@ MODULE =cpu
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
DIRS = $(RIOTCPU)/msp430-common periph DIRS = $(RIOTCPU)/msp430_common periph
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
include $(RIOTCPU)/msp430-common/Makefile.include include $(RIOTCPU)/msp430_common/Makefile.include
export USEMODULE += periph periph_common uart_stdio export USEMODULE += periph periph_common uart_stdio
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment