[coreboot-gerrit] Patch set updated for coreboot: 5bbd5fc x86: use proper types for interrupt callbacks

Aaron Durbin (adurbin@google.com) gerrit at coreboot.org
Tue Apr 23 19:20:39 CEST 2013


Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3124

-gerrit

commit 5bbd5fc68a3eb85b89fd69d22d3e9fdf211fcdf3
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue Apr 23 10:25:34 2013 -0500

    x86: use proper types for interrupt callbacks
    
    The mainboard_interrupt_handlers() argument for the function
    pointer was using void * as the type. This does not allow the compiler
    to catch type differences for the arguments. Thus, some code has been
    committed which violates the new interrupt callbacks not taking any
    arguments. Make sure the compiler provides a type checking benefit.
    
    Change-Id: I268ec8e16929080955751ef518d65b91895e4308
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/arch/x86/include/arch/interrupt.h | 4 ++--
 src/device/oprom/realmode/x86.c       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/include/arch/interrupt.h b/src/arch/x86/include/arch/interrupt.h
index 8c9b4a9..9753c50 100644
--- a/src/arch/x86/include/arch/interrupt.h
+++ b/src/arch/x86/include/arch/interrupt.h
@@ -23,9 +23,9 @@
 
 /* setup interrupt handlers for mainboard */
 #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
-extern void mainboard_interrupt_handlers(int intXX, void *intXX_func);
+extern void mainboard_interrupt_handlers(int intXX, int (*intXX_func)(void));
 #elif CONFIG_PCI_OPTION_ROM_RUN_YABEL
 #include <device/oprom/yabel/biosemu.h>
 #else
-static inline void mainboard_interrupt_handlers(int intXX, void *intXX_func) { }
+static inline void mainboard_interrupt_handlers(int intXX, int (*intXX_func)(void)) { }
 #endif
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index 94b65e1..69017f4 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -118,7 +118,7 @@ static int intXX_unknown_handler(void)
 }
 
 /* setup interrupt handlers for mainboard */
-void mainboard_interrupt_handlers(int intXX, void *intXX_func)
+void mainboard_interrupt_handlers(int intXX, int (*intXX_func)(void))
 {
 	intXX_handler[intXX] = intXX_func;
 }



More information about the coreboot-gerrit mailing list