Merge pull request #6349 from haukepetersen/mv_msp430_common

cpu: moved msp430-common to msp430_common
7 years ago · a397c79187
parent 1e06934d39 63599e25b4
commit a397c79187
19 changed files with 29 additions and 11 deletions
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@ -1,5 +1,5 @@
 MODULE = cpu

-DIRS = $(RIOTCPU)/msp430-common periph
+DIRS = $(RIOTCPU)/msp430_common periph

 include $(RIOTBASE)/Makefile.base
--- a/cpu/cc430/Makefile.include
+++ b/cpu/cc430/Makefile.include
@ -1,5 +1,5 @@
 INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/

-include $(RIOTCPU)/msp430-common/Makefile.include
+include $(RIOTCPU)/msp430_common/Makefile.include

 export USEMODULE += periph
--- a/cpu/msp430_common/Makefile
+++ b/cpu/msp430_common/Makefile
--- a/cpu/msp430_common/Makefile.include
+++ b/cpu/msp430_common/Makefile.include
@ -1,4 +1,4 @@
-INCLUDES += -I$(RIOTCPU)/msp430-common/include/
+INCLUDES += -I$(RIOTCPU)/msp430_common/include/

 export UNDEF += $(BINDIR)/msp430_common/startup.o
 export USEMODULE += msp430_common
--- a/cpu/msp430_common/cpu.c
+++ b/cpu/msp430_common/cpu.c
--- a/cpu/msp430_common/include/cpu.h
+++ b/cpu/msp430_common/include/cpu.h
--- a/cpu/msp430_common/include/cpu_conf.h
+++ b/cpu/msp430_common/include/cpu_conf.h
--- a/cpu/msp430_common/include/msp430_types.h
+++ b/cpu/msp430_common/include/msp430_types.h
@ -35,20 +35,38 @@ extern "C" {
 #define EOVERFLOW   (65)
 #endif

+/**
+ * @brief   Definition of `time_t` for the MSP430
+ *
+ * @todo    Remove once msp430 libc supports `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 {
-    time_t  tv_sec;   /* Seconds */
-    long  tv_nsec;    /* Nanoseconds */
+    time_t  tv_sec;     /**< seconds */
+    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 {
-    time_t tv_sec;
-    time_t tv_usec;
+    time_t tv_sec;      /**< seconds */
+    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;

 #ifdef __cplusplus
--- a/cpu/msp430_common/include/stdio.h
+++ b/cpu/msp430_common/include/stdio.h
--- a/cpu/msp430_common/include/stdlib.h
+++ b/cpu/msp430_common/include/stdlib.h
--- a/cpu/msp430_common/include/sys/time.h
+++ b/cpu/msp430_common/include/sys/time.h
--- a/cpu/msp430_common/include/sys/types.h
+++ b/cpu/msp430_common/include/sys/types.h
--- a/cpu/msp430_common/include/time.h
+++ b/cpu/msp430_common/include/time.h
--- a/cpu/msp430_common/include/unistd.h
+++ b/cpu/msp430_common/include/unistd.h
--- a/cpu/msp430_common/irq.c
+++ b/cpu/msp430_common/irq.c
--- a/cpu/msp430_common/msp430-main.c
+++ b/cpu/msp430_common/msp430-main.c
--- a/cpu/msp430_common/startup.c
+++ b/cpu/msp430_common/startup.c
--- a/cpu/msp430fxyz/Makefile
+++ b/cpu/msp430fxyz/Makefile
@ -2,6 +2,6 @@ MODULE =cpu

 include $(RIOTCPU)/$(CPU)/Makefile.include

-DIRS = $(RIOTCPU)/msp430-common periph
+DIRS = $(RIOTCPU)/msp430_common periph

 include $(RIOTBASE)/Makefile.base
--- a/cpu/msp430fxyz/Makefile.include
+++ b/cpu/msp430fxyz/Makefile.include
@ -1,3 +1,3 @@
-include $(RIOTCPU)/msp430-common/Makefile.include
+include $(RIOTCPU)/msp430_common/Makefile.include

 export USEMODULE += periph periph_common uart_stdio