From 60cd0d357dc0a90c6dfb7ffec26abe1711aa2d60 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Tue, 25 Nov 2014 15:03:54 +0100 Subject: [PATCH] periph_rtc: streamline lpc2387 and cc430 naming --- boards/avsextrem/Makefile.features | 2 +- boards/chronos/Makefile.features | 2 +- boards/msba2/Makefile.features | 2 +- cpu/cc430/Makefile | 2 +- cpu/cc430/Makefile.include | 2 ++ cpu/{lpc2387/rtc => cc430/periph}/Makefile | 0 cpu/cc430/{cc430-rtc.c => periph/rtc.c} | 4 ++-- cpu/lpc2387/Makefile | 3 --- cpu/lpc2387/{rtc/lpc2387-rtc.c => periph/rtc.c} | 0 examples/default/Makefile | 1 - 10 files changed, 8 insertions(+), 10 deletions(-) rename cpu/{lpc2387/rtc => cc430/periph}/Makefile (100%) rename cpu/cc430/{cc430-rtc.c => periph/rtc.c} (99%) rename cpu/lpc2387/{rtc/lpc2387-rtc.c => periph/rtc.c} (100%) diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features index af23a974c..a62395a35 100644 --- a/boards/avsextrem/Makefile.features +++ b/boards/avsextrem/Makefile.features @@ -1 +1 @@ -FEATURES_PROVIDED += transceiver +FEATURES_PROVIDED += transceiver periph_rtc diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features index 762734b95..5f9d34a50 100644 --- a/boards/chronos/Makefile.features +++ b/boards/chronos/Makefile.features @@ -1 +1 @@ -FEATURES_PROVIDED = transceiver +FEATURES_PROVIDED = transceiver periph_rtc diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features index ab02d7f76..66243c081 100644 --- a/boards/msba2/Makefile.features +++ b/boards/msba2/Makefile.features @@ -1 +1 @@ -FEATURES_PROVIDED += transceiver periph_pwm cpp +FEATURES_PROVIDED += transceiver periph_pwm periph_rtc cpp diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile index 9ea7e86c4..bea70e4d1 100644 --- a/cpu/cc430/Makefile +++ b/cpu/cc430/Makefile @@ -1,5 +1,5 @@ MODULE = cpu -DIRS = $(RIOTCPU)/msp430-common +DIRS = $(RIOTCPU)/msp430-common periph include $(RIOTBASE)/Makefile.base diff --git a/cpu/cc430/Makefile.include b/cpu/cc430/Makefile.include index cbad77615..4cf199e20 100644 --- a/cpu/cc430/Makefile.include +++ b/cpu/cc430/Makefile.include @@ -1,3 +1,5 @@ INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/ include $(RIOTCPU)/msp430-common/Makefile.include + +export USEMODULE += periph diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/cc430/periph/Makefile similarity index 100% rename from cpu/lpc2387/rtc/Makefile rename to cpu/cc430/periph/Makefile diff --git a/cpu/cc430/cc430-rtc.c b/cpu/cc430/periph/rtc.c similarity index 99% rename from cpu/cc430/cc430-rtc.c rename to cpu/cc430/periph/rtc.c index 3a235de69..3b7572e50 100644 --- a/cpu/cc430/cc430-rtc.c +++ b/cpu/cc430/periph/rtc.c @@ -8,8 +8,8 @@ */ /** - * @ingroup rtc - * @file cc430-rtc.c + * @ingroup driver_periph_rtc + * @file * @brief CC430 real time clock implementation * @author Oliver Hahm */ diff --git a/cpu/lpc2387/Makefile b/cpu/lpc2387/Makefile index bbe0498ed..0425bcfc6 100644 --- a/cpu/lpc2387/Makefile +++ b/cpu/lpc2387/Makefile @@ -10,9 +10,6 @@ endif ifneq (,$(filter mci,$(USEMODULE))) DIRS += mci endif -ifneq (,$(filter rtc,$(USEMODULE))) - DIRS += rtc -endif ifneq (,$(filter i2c,$(USEMODULE))) DIRS += i2c endif diff --git a/cpu/lpc2387/rtc/lpc2387-rtc.c b/cpu/lpc2387/periph/rtc.c similarity index 100% rename from cpu/lpc2387/rtc/lpc2387-rtc.c rename to cpu/lpc2387/periph/rtc.c diff --git a/examples/default/Makefile b/examples/default/Makefile index bdb43dba9..6c96ecea3 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -45,7 +45,6 @@ endif ifneq (,$(filter msba2,$(BOARD))) USEMODULE += sht11 USEMODULE += ltc4150 - USEMODULE += rtc USEMODULE += mci USEMODULE += config USEMODULE += random