summaryrefslogtreecommitdiffstats
path: root/src/arch/i386/interface/syslinux
diff options
context:
space:
mode:
authorMichael Brown2016-02-16 17:24:30 +0100
committerMichael Brown2016-02-16 20:32:32 +0100
commit15fadab5331f0588eac2d756d680ec65173ca079 (patch)
tree440440723190fc0d49934d285bf04d2257ccb6ca /src/arch/i386/interface/syslinux
parent[libc] Split rmsetjmp() and rmlongjmp() into a separate rmsetjmp.h (diff)
downloadipxe-15fadab5331f0588eac2d756d680ec65173ca079.tar.gz
ipxe-15fadab5331f0588eac2d756d680ec65173ca079.tar.xz
ipxe-15fadab5331f0588eac2d756d680ec65173ca079.zip
[bios] Use intptr_t when casting .text16 function pointers
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/interface/syslinux')
-rw-r--r--src/arch/i386/interface/syslinux/comboot_call.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c
index d70340c65..22848006c 100644
--- a/src/arch/i386/interface/syslinux/comboot_call.c
+++ b/src/arch/i386/interface/syslinux/comboot_call.c
@@ -668,8 +668,7 @@ void hook_comboot_interrupts ( ) {
"iret\n\t" )
: : "i" ( int20 ) );
- hook_bios_interrupt ( 0x20, ( unsigned int ) int20_wrapper,
- &int20_vector );
+ hook_bios_interrupt ( 0x20, ( intptr_t ) int20_wrapper, &int20_vector );
__asm__ __volatile__ (
TEXT16_CODE ( "\nint21_wrapper:\n\t"
@@ -681,8 +680,7 @@ void hook_comboot_interrupts ( ) {
"iret\n\t" )
: : "i" ( int21 ) );
- hook_bios_interrupt ( 0x21, ( unsigned int ) int21_wrapper,
- &int21_vector );
+ hook_bios_interrupt ( 0x21, ( intptr_t ) int21_wrapper, &int21_vector );
__asm__ __volatile__ (
TEXT16_CODE ( "\nint22_wrapper:\n\t"
@@ -694,8 +692,7 @@ void hook_comboot_interrupts ( ) {
"iret\n\t" )
: : "i" ( int22) );
- hook_bios_interrupt ( 0x22, ( unsigned int ) int22_wrapper,
- &int22_vector );
+ hook_bios_interrupt ( 0x22, ( intptr_t ) int22_wrapper, &int22_vector );
}
/**
@@ -703,13 +700,13 @@ void hook_comboot_interrupts ( ) {
*/
void unhook_comboot_interrupts ( ) {
- unhook_bios_interrupt ( 0x20, ( unsigned int ) int20_wrapper,
+ unhook_bios_interrupt ( 0x20, ( intptr_t ) int20_wrapper,
&int20_vector );
- unhook_bios_interrupt ( 0x21, ( unsigned int ) int21_wrapper,
+ unhook_bios_interrupt ( 0x21, ( intptr_t ) int21_wrapper,
&int21_vector );
- unhook_bios_interrupt ( 0x22, ( unsigned int ) int22_wrapper,
+ unhook_bios_interrupt ( 0x22, ( intptr_t ) int22_wrapper,
&int22_vector );
}