Skip to content
Permalink
Browse files

cleanup: include/: move counter.h to drivers/counter.h

move counter.h to drivers/counter.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 25, 2019
1 parent 17ddd17 commit 7e7a9bdf88193228807488c5918ef73046098e31
@@ -11,7 +11,7 @@
* crossing clock domains (no pun intended). Use accordingly.
*/

#include <counter.h>
#include <drivers/counter.h>
#include <device.h>
#include <soc.h>

@@ -12,7 +12,7 @@
#include <soc.h>
#include <em_cmu.h>
#include <em_rtcc.h>
#include <counter.h>
#include <drivers/counter.h>

#include <logging/log.h>
LOG_MODULE_REGISTER(counter_gecko, CONFIG_COUNTER_LOG_LEVEL);
@@ -5,7 +5,7 @@
*/

#include <syscall_handler.h>
#include <counter.h>
#include <drivers/counter.h>

/* For those APIs that just take one argument which is a counter driver
* instance and return an integral value
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <counter.h>
#include <drivers/counter.h>
#include <device.h>
#include "clock_freq.h"
#include "epit.h"
@@ -16,7 +16,7 @@
#include <misc/util.h>
#include <kernel.h>
#include <soc.h>
#include <counter.h>
#include <drivers/counter.h>

#include <logging/log.h>

@@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <counter.h>
#include <drivers/counter.h>
#include <fsl_rtc.h>
#include <logging/log.h>

@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <counter.h>
#include <drivers/counter.h>
#include <drivers/clock_control.h>
#include <drivers/clock_control/nrf_clock_control.h>
#include <nrfx_rtc.h>
@@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <counter.h>
#include <drivers/counter.h>
#include <nrfx_timer.h>

#define LOG_LEVEL CONFIG_COUNTER_LOG_LEVEL
@@ -9,7 +9,7 @@
#include <device.h>
#include <init.h>

#include <counter.h>
#include <drivers/counter.h>

#include "qm_aon_counters.h"

@@ -9,7 +9,7 @@
#include <device.h>
#include <init.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <counter.h>
#include <drivers/counter.h>
#include <power/power.h>
#include <soc.h>
#include <misc/util.h>
@@ -8,7 +8,7 @@

#include <device.h>
#include <drivers/interrupt_controller/ioapic.h>
#include <counter.h>
#include <drivers/counter.h>
#include <init.h>
#include <kernel.h>
#include <power/power.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <counter.h>
#include <drivers/counter.h>
#include <device.h>
#include <soc.h>

@@ -6,7 +6,7 @@
#ifndef ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_
#define ZEPHYR_DRIVERS_COUNTER_DUALTIMER_CMSDK_APB_H_

#include <counter.h>
#include <drivers/counter.h>

#ifdef __cplusplus
extern "C" {
@@ -6,7 +6,7 @@
#ifndef ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_
#define ZEPHYR_DRIVERS_COUNTER_TIMER_CMSDK_APB_H_

#include <counter.h>
#include <drivers/counter.h>

#ifdef __cplusplus
extern "C" {
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <counter.h>
#include <drivers/counter.h>
#include <device.h>
#include <errno.h>
#include <init.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <counter.h>
#include <drivers/counter.h>
#include <device.h>
#include <errno.h>
#include <init.h>

0 comments on commit 7e7a9bd

Please sign in to comment.
You can’t perform that action at this time.