diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2009-09-09 11:34:39 -0400 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2009-09-09 11:34:39 -0400 |
commit | 9f985427ffeb877f6eb6531a61c0d51250bdf7f3 (patch) | |
tree | 6c4ef72950230409e2a3e4f9de2463894c83458b /src/mouse.c | |
parent | 372e071ed4b6a66fb371cf13b6f6d14ddd00837a (diff) | |
download | qemu-seabios-9f985427ffeb877f6eb6531a61c0d51250bdf7f3.tar.gz |
Replace common segment/offset pairs with struct segoff_s.
Introduce 'struct segoff_s' to more places.
Diffstat (limited to 'src/mouse.c')
-rw-r--r-- | src/mouse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mouse.c b/src/mouse.c index e6abbb9..e7ec0c1 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -235,10 +235,10 @@ mouse_15c206(struct bregs *regs) static void mouse_15c207(struct bregs *regs) { - u32 farptr = (regs->es << 16) | regs->bx; + struct segoff_s farptr = SEGOFF(regs->es, regs->bx); u16 ebda_seg = get_ebda_seg(); u8 mouse_flags_2 = GET_EBDA2(ebda_seg, mouse_flag2); - if (! farptr) { + if (! farptr.segoff) { /* remove handler */ if ((mouse_flags_2 & 0x80) != 0) { mouse_flags_2 &= ~0x80; @@ -311,7 +311,7 @@ process_mouse(u8 data) u16 Y = GET_EBDA2(ebda_seg, mouse_data[2]); SET_EBDA2(ebda_seg, mouse_flag1, 0); - u32 func = GET_EBDA2(ebda_seg, far_call_pointer); + struct segoff_s func = GET_EBDA2(ebda_seg, far_call_pointer); asm volatile( "sti\n" @@ -327,7 +327,7 @@ process_mouse(u8 data) "cli\n" "cld\n" : - : "r"(func), "r"(status), "r"(X), "r"(Y) + : "r"(func.segoff), "r"(status), "r"(X), "r"(Y) : "cc" ); } |