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

Use LOAPIC timer Kconfig options

Browse source 
Removes the LOAPIC timer macros from board.h as they are no longer required
since appropriate Kconfig options exist to use in their stead.

Change-Id: Id0b509eba7cce1839b400f95b989bf886322e1a8
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-27 14:45:41 -04:00 committed by Anas Nashif
parent 32fd4dc25c
commit 658bb54ed1
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/platforms/ia32/board.h
View file

@ -93,12 +93,6 @@ the 'ia32' platform.
#define LOAPIC_BASE_ADRS LOAPIC_BASE_ADRS_PHYS #define LOAPIC_BASE_ADRS LOAPIC_BASE_ADRS_PHYS
/* local APIC timer definitions */
#define LOAPIC_TIMER_IRQ IOAPIC_NUM_RTES
#define LOAPIC_TIMER_INT_PRI 2
#define LOAPIC_VEC_BASE(x) (x + 32 + IOAPIC_NUM_RTES)
#define LOAPIC_TIMER_VEC LOAPIC_VEC_BASE(0)
/* serial port (aka COM port) information */ /* serial port (aka COM port) information */
#define COM1_BASE_ADRS 0x3f8 #define COM1_BASE_ADRS 0x3f8

1
arch/x86/platforms/ia32_pci/board.h
View file

@ -113,7 +113,6 @@ the 'ia32_pci' platform.
* IRQ28 -> LOAPIC_LINT1 * IRQ28 -> LOAPIC_LINT1
* IRQ29 -> LOAPIC_ERROR * IRQ29 -> LOAPIC_ERROR
*/ */
#define LOAPIC_VEC_BASE(x) (x + INT_VEC_IRQ0 + IOAPIC_NUM_RTES)
/* PCI definitions */ /* PCI definitions */
#define PCI_BUS_NUMBERS 2 #define PCI_BUS_NUMBERS 2

13
drivers/timer/loapic_timer.c
View file

@ -59,8 +59,6 @@ After reset, the timer is initialized to zero.
* following constants: * following constants:
* *
* LOAPIC_BASE_ADRS * LOAPIC_BASE_ADRS
* LOAPIC_TIMER_IRQ
* LOAPIC_TIMER_INT_PRI
* *
* NOTE: CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC must be provided by either the * NOTE: CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC must be provided by either the
* platform configuration file or the project configuration file. * platform configuration file or the project configuration file.
@ -110,8 +108,9 @@ After reset, the timer is initialized to zero.
extern int32_t _sys_idle_elapsed_ticks; extern int32_t _sys_idle_elapsed_ticks;
#endif /* TIMER_SUPPORTS_TICKLESS */ #endif /* TIMER_SUPPORTS_TICKLESS */
IRQ_CONNECT_STATIC(loapic, LOAPIC_TIMER_IRQ, LOAPIC_TIMER_INT_PRI, IRQ_CONNECT_STATIC(loapic, CONFIG_LOAPIC_TIMER_IRQ,
_timer_int_handler, 0); CONFIG_LOAPIC_TIMER_IRQ_PRIORITY,
_timer_int_handler, 0);
static uint32_t __noinit counterLoadVal; /* computed counter 0 static uint32_t __noinit counterLoadVal; /* computed counter 0
initial count value */ initial count value */
@ -560,13 +559,13 @@ int _sys_clock_driver_init(struct device *device)
* still * still
* has to be programmed into the interrupt controller. * has to be programmed into the interrupt controller.
*/ */
IRQ_CONFIG(loapic, LOAPIC_TIMER_IRQ); IRQ_CONFIG(loapic, CONFIG_LOAPIC_TIMER_IRQ);
_loApicTimerTicklessIdleSkew(); _loApicTimerTicklessIdleSkew();
/* Everything has been configured. It is now safe to enable the /* Everything has been configured. It is now safe to enable the
* interrupt */ * interrupt */
irq_enable(LOAPIC_TIMER_IRQ); irq_enable(CONFIG_LOAPIC_TIMER_IRQ);
return 0; return 0;
} }
@ -624,7 +623,7 @@ void timer_disable(void)
/* disable interrupt in the interrupt controller */ /* disable interrupt in the interrupt controller */
irq_disable(LOAPIC_TIMER_IRQ); irq_disable(CONFIG_LOAPIC_TIMER_IRQ);
} }
#endif /* CONFIG_SYSTEM_TIMER_DISABLE */ #endif /* CONFIG_SYSTEM_TIMER_DISABLE */

2
samples/nanokernel/test/test_context/src/context.c
View file

@ -74,7 +74,7 @@ This module tests the following CPU and context related routines:
#if defined(CONFIG_HPET_TIMER) #if defined(CONFIG_HPET_TIMER)
#define TICK_IRQ CONFIG_HPET_TIMER_IRQ #define TICK_IRQ CONFIG_HPET_TIMER_IRQ
#elif defined(CONFIG_LOAPIC_TIMER) #elif defined(CONFIG_LOAPIC_TIMER)
#define TICK_IRQ LOAPIC_TIMER_IRQ #define TICK_IRQ CONFIG_LOAPIC_TIMER_IRQ
#elif defined(CONFIG_PIT) #elif defined(CONFIG_PIT)
#define TICK_IRQ PIT_INT_LVL #define TICK_IRQ PIT_INT_LVL
#elif defined(CONFIG_CPU_CORTEX_M3_M4) #elif defined(CONFIG_CPU_CORTEX_M3_M4)