Use mainboard_interrupt_handlers everywhere
The previous commit provides a mainboard_interrupt_handlers implementation YABEL with identical semantics to the x86emu one, so let's use it in both cases. This eliminates the need for the int15_install() indirection, so let's drop that, too. Generated using the following coccinelle patch and manual cleanups (empty #if/#endif): @@ type T; identifier FUNCARR; expression INT, HANDLER; @@ -typedef T yabel_handleIntFunc; -extern yabel_handleIntFunc FUNCARR[256]; -FUNCARR[INT] = HANDLER; +mainboard_interrupt_handlers(INT, &HANDLER); @@ @@ -void int15_install(void) -{ -mainboard_interrupt_handlers(0x15, &int15_handler); -} @@ @@ -void int15_install(void) -{ -mainboard_interrupt_handlers(0x15, &int15_handler); ... mainboard_interrupt_handlers(0x15, &int15_handler); -} @@ @@ -int15_install(); +mainboard_interrupt_handlers(0x15, &int15_handler); Change-Id: I70fd780d7ebf1564a2ff7d7148411673f6de113c Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/1559 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
committed by
Stefan Reinauer
parent
f3a163a127
commit
89bbcf4c9b
@@ -61,13 +61,6 @@ static int int15_handler(void)
|
||||
/* Interrupt handled */
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void int15_install(void)
|
||||
{
|
||||
typedef int (* yabel_handleIntFunc)(void);
|
||||
extern yabel_handleIntFunc yabel_intFuncArray[256];
|
||||
yabel_intFuncArray[0x15] = int15_handler;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) && CONFIG_PCI_OPTION_ROM_RUN_REALMODE
|
||||
@@ -109,11 +102,6 @@ static int int15_handler(struct eregs *regs)
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static void int15_install(void)
|
||||
{
|
||||
mainboard_interrupt_handlers(0x15, &int15_handler);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -270,7 +258,7 @@ static void mainboard_enable(device_t dev)
|
||||
{
|
||||
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
|
||||
/* Install custom int15 handler for VGA OPROM */
|
||||
int15_install();
|
||||
mainboard_interrupt_handlers(0x15, &int15_handler);
|
||||
#endif
|
||||
verb_setup();
|
||||
hwm_setup();
|
||||
|
Reference in New Issue
Block a user