projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-ubi
[oweals/u-boot.git]
/
cpu
/
mpc5xx
/
interrupts.c
diff --git
a/cpu/mpc5xx/interrupts.c
b/cpu/mpc5xx/interrupts.c
index 7f6e1363e7402e18a360ebcc27cc6ee1aee780d9..167543fcf53789ad1b51733f428a1a253f308417 100644
(file)
--- a/
cpu/mpc5xx/interrupts.c
+++ b/
cpu/mpc5xx/interrupts.c
@@
-52,11
+52,11
@@
static struct interrupt_action irq_vecs[NR_IRQS];
int interrupt_init_cpu (ulong *decrementer_count)
{
int interrupt_init_cpu (ulong *decrementer_count)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
int vec;
/* Decrementer used here for status led */
int vec;
/* Decrementer used here for status led */
- *decrementer_count = get_tbclk () / C
FG
_HZ;
+ *decrementer_count = get_tbclk () / C
ONFIG_SYS
_HZ;
/* Disable all interrupts */
immr->im_siu_conf.sc_simask = 0;
/* Disable all interrupts */
immr->im_siu_conf.sc_simask = 0;
@@
-74,7
+74,7
@@
int interrupt_init_cpu (ulong *decrementer_count)
*/
void external_interrupt (struct pt_regs *regs)
{
*/
void external_interrupt (struct pt_regs *regs)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
int irq;
ulong simask, newmask;
ulong vec, v_bit;
int irq;
ulong simask, newmask;
ulong vec, v_bit;
@@
-130,7
+130,7
@@
void external_interrupt (struct pt_regs *regs)
void irq_install_handler (int vec, interrupt_handler_t * handler,
void *arg)
{
void irq_install_handler (int vec, interrupt_handler_t * handler,
void *arg)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
/* SIU interrupt */
if (irq_vecs[vec].handler != NULL) {
printf ("SIU interrupt %d 0x%x\n",
/* SIU interrupt */
if (irq_vecs[vec].handler != NULL) {
printf ("SIU interrupt %d 0x%x\n",
@@
-148,7
+148,7
@@
void irq_install_handler (int vec, interrupt_handler_t * handler,
void irq_free_handler (int vec)
{
void irq_free_handler (int vec)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
/* SIU interrupt */
#if 0
printf ("Free CPM interrupt for vector %d\n",
/* SIU interrupt */
#if 0
printf ("Free CPM interrupt for vector %d\n",
@@
-165,7
+165,7
@@
void irq_free_handler (int vec)
*/
void timer_interrupt_cpu (struct pt_regs *regs)
{
*/
void timer_interrupt_cpu (struct pt_regs *regs)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
#if 0
printf ("*** Timer Interrupt *** ");
#if 0
printf ("*** Timer Interrupt *** ");
@@
-178,7
+178,7
@@
void timer_interrupt_cpu (struct pt_regs *regs)
return;
}
return;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_IRQ)
+#if
defined(CONFI
G_CMD_IRQ)
/*******************************************************************************
*
* irqinfo - print information about IRQs
/*******************************************************************************
*
* irqinfo - print information about IRQs
@@
-204,4
+204,4
@@
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
}
-#endif
/* CONFIG_COMMANDS & CFG_CMD_IRQ */
+#endif