projects
/
seabios.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
815e447
)
vgabios: Minor - use segoff_s for static_functionality ptr.
author
Kevin O'Connor
<kevin@koconnor.net>
Sat, 24 Dec 2011 02:18:49 +0000
(21:18 -0500)
committer
Kevin O'Connor
<kevin@koconnor.net>
Wed, 28 Dec 2011 02:39:29 +0000
(21:39 -0500)
vgasrc/vga.c
patch
|
blob
|
history
diff --git
a/vgasrc/vga.c
b/vgasrc/vga.c
index ee107043efe558d7eea9723d38f92b42d67d7521..903c04ca893781925e4a7c466c44f07d283ff56f 100644
(file)
--- a/
vgasrc/vga.c
+++ b/
vgasrc/vga.c
@@
-1092,8
+1092,7
@@
handle_101a(struct bregs *regs)
struct funcInfo {
struct funcInfo {
- u16 static_functionality_off;
- u16 static_functionality_seg;
+ struct segoff_s static_functionality;
u8 bda_0x49[30];
u8 bda_0x84[3];
u8 dcc_index;
u8 bda_0x49[30];
u8 bda_0x84[3];
u8 dcc_index;
@@
-1119,8
+1118,8
@@
handle_101b(struct bregs *regs)
struct funcInfo *info = (void*)(regs->di+0);
memset_far(seg, info, 0, sizeof(*info));
// Address of static functionality table
struct funcInfo *info = (void*)(regs->di+0);
memset_far(seg, info, 0, sizeof(*info));
// Address of static functionality table
- SET_FARVAR(seg, info->static_functionality
_off, (u32)static_functionality);
-
SET_FARVAR(seg, info->static_functionality_seg, get_global_seg(
));
+ SET_FARVAR(seg, info->static_functionality
+
, SEGOFF(get_global_seg(), (u32)static_functionality
));
// Hard coded copy from BIOS area. Should it be cleaner ?
memcpy_far(seg, info->bda_0x49, SEG_BDA, (void*)0x49
// Hard coded copy from BIOS area. Should it be cleaner ?
memcpy_far(seg, info->bda_0x49, SEG_BDA, (void*)0x49