forked from Imagelibrary/rtems
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
* irq/irq.h, irq/irq_init.c: Removed the definition of ASM_IRQ_VECTOR_BASE; this symbol was only use to initialize the irqBase member of the rtems_irq_global_settings struct. However, irqBase is an rtems_irq_symbolic_name, so using BSP_LOWEST_OFFSET is more appropriate.
This commit is contained in:
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* shared/irq/irq.h, shared/irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* shared/startup/bspstart.c: Eliminate PowerPC specific elements from
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
|
||||
|
||||
@@ -294,7 +294,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config)) {
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* clock/clock.c, startup/bspstart.c: Eliminate PowerPC specific
|
||||
|
||||
@@ -98,16 +98,11 @@
|
||||
#define MSE_SOURCE(_source) (((_source) >> 16) & 0x0000001F)
|
||||
#define PSE_SOURCE(_source) (((_source) >> 24) & 0x0000001F)
|
||||
|
||||
/*
|
||||
* Base index for the module specific irq handlers
|
||||
*/
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0
|
||||
#define BSP_PER_VECTOR_BASE BSP_ASM_IRQ_VECTOR_BASE /* 0 */
|
||||
/*
|
||||
* Peripheral IRQ handlers related definitions
|
||||
*/
|
||||
#define BSP_PER_IRQ_NUMBER 22
|
||||
#define BSP_PER_IRQ_LOWEST_OFFSET BSP_PER_VECTOR_BASE /* 0 */
|
||||
#define BSP_PER_IRQ_LOWEST_OFFSET 0
|
||||
#define BSP_PER_IRQ_MAX_OFFSET \
|
||||
(BSP_PER_IRQ_LOWEST_OFFSET + BSP_PER_IRQ_NUMBER - 1) /* 21 */
|
||||
/*
|
||||
@@ -288,7 +283,7 @@ typedef struct {
|
||||
*/
|
||||
rtems_irq_connect_data* irqHdlTbl;
|
||||
/*
|
||||
* actual value of BSP_PER_IRQ_VECTOR_BASE...
|
||||
* actual value of BSP_PER_IRQ_LOWEST_OFFSET...
|
||||
*/
|
||||
rtems_irq_symbolic_name irqBase;
|
||||
/*
|
||||
|
||||
@@ -250,7 +250,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config))
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
|
||||
|
||||
@@ -27,17 +27,11 @@
|
||||
* to interface the interrupt handler API
|
||||
*/
|
||||
|
||||
/*
|
||||
* Base index for the module specific irq handlers
|
||||
*/
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
#define BSP_IPIC_VECTOR_BASE BSP_ASM_IRQ_VECTOR_BASE
|
||||
|
||||
/*
|
||||
* Peripheral IRQ handlers related definitions
|
||||
*/
|
||||
#define BSP_IPIC_PER_IRQ_NUMBER 128
|
||||
#define BSP_IPIC_IRQ_LOWEST_OFFSET BSP_IPIC_VECTOR_BASE /* 0 */
|
||||
#define BSP_IPIC_IRQ_LOWEST_OFFSET 0
|
||||
#define BSP_IPIC_IRQ_MAX_OFFSET (BSP_IPIC_IRQ_LOWEST_OFFSET\
|
||||
+BSP_IPIC_PER_IRQ_NUMBER-1)
|
||||
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c, startup/bspstart.c.nocache: Eliminate PowerPC
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
|
||||
#include <rtems/irq.h>
|
||||
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
|
||||
#ifndef ASM
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -37,8 +35,6 @@ extern volatile unsigned int ppc_cached_irq_mask;
|
||||
* Symblolic IRQ names and related definitions.
|
||||
*/
|
||||
|
||||
/* Base vector for our SIU IRQ handlers. */
|
||||
#define BSP_SIU_VECTOR_BASE BSP_ASM_IRQ_VECTOR_BASE
|
||||
/*
|
||||
* SIU IRQ handler related definitions
|
||||
*/
|
||||
@@ -50,7 +46,7 @@ extern volatile unsigned int ppc_cached_irq_mask;
|
||||
* CAUTION : BSP_CPM_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
|
||||
*/
|
||||
#define BSP_CPM_IRQ_NUMBER 32
|
||||
#define BSP_CPM_IRQ_LOWEST_OFFSET (BSP_SIU_IRQ_NUMBER + BSP_SIU_VECTOR_BASE)
|
||||
#define BSP_CPM_IRQ_LOWEST_OFFSET (BSP_SIU_IRQ_NUMBER + BSP_IRQ_LOWEST_OFFSET)
|
||||
#define BSP_CPM_IRQ_MAX_OFFSET (BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1)
|
||||
/*
|
||||
* PowerPc exceptions handled as interrupt where a rtems managed interrupt
|
||||
|
||||
@@ -126,7 +126,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config)) {
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
#define LIBBSP_POWERPC_IRQ_H
|
||||
#include <rtems/irq.h>
|
||||
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
|
||||
#ifndef ASM
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -46,15 +44,12 @@ extern volatile unsigned int ppc_cached_irq_mask;
|
||||
* Symblolic IRQ names and related definitions.
|
||||
*/
|
||||
|
||||
/* Base vector for our SIU IRQ handlers. */
|
||||
#define BSP_SIU_VECTOR_BASE (BSP_ASM_IRQ_VECTOR_BASE)
|
||||
|
||||
/*
|
||||
* CPM IRQ handlers related definitions
|
||||
* CAUTION : BSP_CPM_IRQ_LOWEST_OFFSET should be equal to OPENPIC_VEC_SOURCE
|
||||
*/
|
||||
#define BSP_CPM_IRQ_NUMBER (64)
|
||||
#define BSP_CPM_IRQ_LOWEST_OFFSET (BSP_SIU_VECTOR_BASE)
|
||||
#define BSP_CPM_IRQ_LOWEST_OFFSET (0)
|
||||
#define BSP_CPM_IRQ_MAX_OFFSET (BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER - 1)
|
||||
/*
|
||||
* PowerPc exceptions handled as interrupt where a rtems managed interrupt
|
||||
|
||||
@@ -115,7 +115,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config)) {
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
/*#define BSP_SHARED_HANDLER_SUPPORT 1*/
|
||||
#include <rtems/irq.h>
|
||||
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
|
||||
#ifndef ASM
|
||||
|
||||
#define OneTierIrqPrioTbl 1
|
||||
|
||||
@@ -123,7 +123,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = BSPirqPrioTable;
|
||||
|
||||
#ifdef TRACE_IRQ_INIT
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Eliminate PowerPC specific elements from the CPU
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define ELCRM_INT1_LVL 0x2
|
||||
#define ELCRM_INT0_LVL 0x1
|
||||
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
/* PIC's command and mask registers */
|
||||
#define PIC_MASTER_COMMAND_IO_PORT 0x20 /* Master PIC command register */
|
||||
#define PIC_SLAVE_COMMAND_IO_PORT 0xa0 /* Slave PIC command register */
|
||||
@@ -69,8 +68,6 @@ extern "C" {
|
||||
* Symbolic IRQ names and related definitions
|
||||
*/
|
||||
|
||||
/* Base vector for our ISA IRQ handlers. */
|
||||
#define BSP_ISA_IRQ_VECTOR_BASE BSP_ASM_IRQ_VECTOR_BASE
|
||||
/*
|
||||
* ISA IRQ handler related definitions
|
||||
*/
|
||||
|
||||
@@ -327,7 +327,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config)) {
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define ELCRM_INT1_LVL 0x2
|
||||
#define ELCRM_INT0_LVL 0x1
|
||||
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
/* PIC's command and mask registers */
|
||||
#define PIC_MASTER_COMMAND_IO_PORT 0x20 /* Master PIC command register */
|
||||
#define PIC_SLAVE_COMMAND_IO_PORT 0xa0 /* Slave PIC command register */
|
||||
@@ -69,8 +68,6 @@ extern "C" {
|
||||
* rtems_irq_number Definitions
|
||||
*/
|
||||
|
||||
/* Base vector for our ISA IRQ handlers. */
|
||||
#define BSP_ISA_IRQ_VECTOR_BASE (BSP_ASM_IRQ_VECTOR_BASE)
|
||||
/*
|
||||
* ISA IRQ handler related definitions
|
||||
*/
|
||||
|
||||
@@ -351,7 +351,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
initial_config.irqNb = BSP_IRQ_NUMBER;
|
||||
initial_config.defaultEntry = defaultIrq;
|
||||
initial_config.irqHdlTbl = rtemsIrq;
|
||||
initial_config.irqBase = BSP_ASM_IRQ_VECTOR_BASE;
|
||||
initial_config.irqBase = BSP_LOWEST_OFFSET;
|
||||
initial_config.irqPrioTbl = irqPrioTable;
|
||||
|
||||
if (!BSP_rtems_irq_mngt_set(&initial_config)) {
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
2007-11-30 Till Straumann <strauman@slac.stanford.edu>
|
||||
|
||||
* irq/irq.h, irq/irq_init.c: Removed the definition
|
||||
of ASM_IRQ_VECTOR_BASE; this symbol was only use to
|
||||
initialize the irqBase member of the rtems_irq_global_settings
|
||||
struct. However, irqBase is an rtems_irq_symbolic_name,
|
||||
so using BSP_LOWEST_OFFSET is more appropriate.
|
||||
|
||||
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
|
||||
|
||||
* startup/bspstart.c: Now compiles and links.
|
||||
|
||||
@@ -27,17 +27,11 @@
|
||||
* to interface the interrupt handler API
|
||||
*/
|
||||
|
||||
/*
|
||||
* Base index for the module specific irq handlers
|
||||
*/
|
||||
#define BSP_ASM_IRQ_VECTOR_BASE 0x0
|
||||
#define BSP_OPBINTC_VECTOR_BASE BSP_ASM_IRQ_VECTOR_BASE
|
||||
|
||||
/*
|
||||
* Peripheral IRQ handlers related definitions
|
||||
*/
|
||||
#define BSP_OPBINTC_PER_IRQ_NUMBER XPAR_INTC_MAX_NUM_INTR_INPUTS
|
||||
#define BSP_OPBINTC_IRQ_LOWEST_OFFSET BSP_OPBINTC_VECTOR_BASE /* 0 */
|
||||
#define BSP_OPBINTC_IRQ_LOWEST_OFFSET 0
|
||||
#define BSP_OPBINTC_IRQ_MAX_OFFSET (BSP_OPBINTC_IRQ_LOWEST_OFFSET\
|
||||
+BSP_OPBINTC_PER_IRQ_NUMBER-1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user