michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ia32_pci: Abstract device initialization

Browse source 
Abstracts the initialization of the following devices:
    LOAPIC, IOAPIC, and HPET TIMER
This allows for a more configurable ia32_pci platform.

Change-Id: I05d0d983c163be499dd967ffe0121290a4305c9e
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-08-06 11:33:02 -04:00 • committed by Anas Nashif
commit 097a1a17dc
1 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

42
arch/x86/platforms/ia32_pci/system.c
View file

@ -47,10 +47,44 @@ Handlers for the secondary serial port have not been added.
#include "board.h"
#include <drivers/uart.h>
#include <drivers/ioapic.h>
#include <drivers/loapic.h>
#include <drivers/pci/pci.h>
#include <drivers/pci/pci_mgr.h>
#ifdef CONFIG_LOAPIC
#include <drivers/loapic.h>
static inline void loapic_init(void)
{
_loapic_init();
}
#else
#define loapic_init() \
do { /* nothing */ \
} while ((0))
#endif
#ifdef CONFIG_IOAPIC
#include <drivers/ioapic.h>
static inline void ioapic_init(void)
{
_ioapic_init();
}
#else
#define ioapic_init() \
do { /* nothing */ \
} while ((0))
#endif
#ifdef CONFIG_HPET_TIMER
static inline void hpet_irq_set(void)
{
_ioapic_irq_set(HPET_TIMER0_IRQ, HPET_TIMER0_VEC, HPET_IOAPIC_FLAGS);
}
#else
#define hpet_irq_set() \
do { /* nothing */ \
} while ((0))
#endif
#if defined(CONFIG_PRINTK) || defined(CONFIG_STDOUT_CONSOLE)
/**
*
@ -108,10 +142,10 @@ static void console_init(void)
static int ia32_pci_init(struct device *arg)
{
ARG_UNUSED(arg);
_loapic_init();
_ioapic_init();
_ioapic_irq_set(HPET_TIMER0_IRQ, HPET_TIMER0_VEC, HPET_IOAPIC_FLAGS);
loapic_init(); /* NOP if not needed */
ioapic_init(); /* NOP if not needed */
hpet_irq_set(); /* NOP if not needed */
console_init(); /* NOP if not needed */