patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: timer: remove old kernel support

Browse source 
Change-Id: I64169402d6e3b6cb0e89beeceba8b5a3bf734cf4
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-11-07 10:18:41 -08:00
parent e004dec958
commit 9024a93bee
3 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/timer/cortex_m_systick.c
View file

@ -44,16 +44,6 @@
#include <sys_clock.h>
#include <drivers/system_timer.h>
#if !defined(CONFIG_KERNEL_V2)
#ifdef CONFIG_MICROKERNEL
#include <microkernel.h>
extern struct nano_stack _k_command_stack;
#endif /* CONFIG_MICROKERNEL */
#endif
/* running total of timer count */
static uint32_t clock_accumulated_count;
@ -600,11 +590,7 @@ int _sys_clock_driver_init(struct device *device)
* systick counter is a 24-bit down counter which is reset to "reload" value
* once it reaches 0.
*/
#ifdef CONFIG_KERNEL_V2
uint32_t k_cycle_get_32(void)
#else
uint32_t sys_cycle_get_32(void)
#endif
{
return clock_accumulated_count + (__scs.systick.strvr - __scs.systick.stcvr);
}

15
drivers/timer/hpet.c
View file

@ -62,17 +62,6 @@
#include <drivers/system_timer.h>
#include <nano_private.h>
#if !defined(CONFIG_KERNEL_V2)
#ifdef CONFIG_MICROKERNEL
#include <microkernel.h>
extern struct nano_stack _k_command_stack;
#endif /* CONFIG_MICROKERNEL */
#endif
#include <board.h>
/* HPET register offsets */
@ -617,11 +606,7 @@ int _sys_clock_driver_init(struct device *device)
* it will need to call _hpetMainCounterAtomic().
*/
#ifdef CONFIG_KERNEL_V2
uint32_t k_cycle_get_32(void)
#else
uint32_t sys_cycle_get_32(void)
#endif
{
return (uint32_t) *_HPET_MAIN_COUNTER_VALUE;
}

19
drivers/timer/loapic_timer.c
View file

@ -83,13 +83,6 @@
#include <arch/x86/irq_controller.h>
#include <power.h>
#include <device.h>
#if !defined(CONFIG_KERNEL_V2)
#ifdef CONFIG_MICROKERNEL
#include <microkernel.h>
#endif /* CONFIG_MICROKERNEL */
#endif
#include <board.h>
/* Local APIC Timer Bits */
@ -165,14 +158,6 @@ static uint32_t reg_timer_cfg_save;
#endif
#endif
/* externs */
#if !defined(CONFIG_KERNEL_V2)
#ifdef CONFIG_MICROKERNEL
extern struct nano_stack _k_command_stack;
#endif /* CONFIG_MICROKERNEL */
#endif
/**
*
* @brief Set the timer for periodic mode
@ -622,11 +607,7 @@ int sys_clock_device_ctrl(struct device *port, uint32_t ctrl_command,
*
* @return up counter of elapsed clock cycles
*/
#ifdef CONFIG_KERNEL_V2
uint32_t k_cycle_get_32(void)
#else
uint32_t sys_cycle_get_32(void)
#endif
{
uint32_t val; /* system clock value */