projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: acpi: Use an API to get the ACPI RSDP table address
[oweals/u-boot.git]
/
arch
/
x86
/
lib
/
interrupts.c
diff --git
a/arch/x86/lib/interrupts.c
b/arch/x86/lib/interrupts.c
index 146ad11fb5373f3223d4ece682af0cf4ce4f8f83..d3ae6d9694aaf0d0e074a1fef74568f6a78a507b 100644
(file)
--- a/
arch/x86/lib/interrupts.c
+++ b/
arch/x86/lib/interrupts.c
@@
-33,13
+33,15
@@
#include <common.h>
#include <asm/interrupt.h>
#include <common.h>
#include <asm/interrupt.h>
+#if !CONFIG_IS_ENABLED(X86_64)
+
struct irq_action {
interrupt_handler_t *handler;
void *arg;
unsigned int count;
};
struct irq_action {
interrupt_handler_t *handler;
void *arg;
unsigned int count;
};
-static struct irq_action irq_handlers[
CONFIG_
SYS_NUM_IRQS] = { {0} };
+static struct irq_action irq_handlers[SYS_NUM_IRQS] = { {0} };
static int spurious_irq_cnt;
static int spurious_irq;
static int spurious_irq_cnt;
static int spurious_irq;
@@
-47,7
+49,7
@@
void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
{
int status;
{
int status;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("irq_install_handler: bad irq number %d\n", irq);
return;
}
printf("irq_install_handler: bad irq number %d\n", irq);
return;
}
@@
-75,7
+77,7
@@
void irq_free_handler(int irq)
{
int status;
{
int status;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("irq_free_handler: bad irq number %d\n", irq);
return;
}
printf("irq_free_handler: bad irq number %d\n", irq);
return;
}
@@
-97,7
+99,7
@@
void do_irq(int hw_irq)
{
int irq = hw_irq - 0x20;
{
int irq = hw_irq - 0x20;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("do_irq: bad irq number %d\n", irq);
return;
}
printf("do_irq: bad irq number %d\n", irq);
return;
}
@@
-118,10
+120,12
@@
void do_irq(int hw_irq)
}
}
}
}
}
}
+#endif
#if defined(CONFIG_CMD_IRQ)
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
#if defined(CONFIG_CMD_IRQ)
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
+#if !CONFIG_IS_ENABLED(X86_64)
int irq;
printf("Spurious IRQ: %u, last unknown IRQ: %d\n",
int irq;
printf("Spurious IRQ: %u, last unknown IRQ: %d\n",
@@
-130,7
+134,7
@@
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf("Interrupt-Information:\n");
printf("Nr Routine Arg Count\n");
printf("Interrupt-Information:\n");
printf("Nr Routine Arg Count\n");
- for (irq = 0; irq <
CONFIG_
SYS_NUM_IRQS; irq++) {
+ for (irq = 0; irq < SYS_NUM_IRQS; irq++) {
if (irq_handlers[irq].handler != NULL) {
printf("%02d %08lx %08lx %d\n",
irq,
if (irq_handlers[irq].handler != NULL) {
printf("%02d %08lx %08lx %d\n",
irq,
@@
-139,6
+143,7
@@
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
irq_handlers[irq].count);
}
}
irq_handlers[irq].count);
}
}
+#endif
return 0;
}
return 0;
}