diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2008-12-13 11:10:37 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2008-12-13 11:10:37 -0500 |
| commit | 15157a3c6d5a84088532cf26b631224a18c78cbb (patch) | |
| tree | fd30dad906cd5df96153857210b562d600256cb5 /src/kbd.c | |
| parent | 4e6c9706240a33e13de3da98815d8f4d281a9e9a (diff) | |
| download | qemu-seabios-15157a3c6d5a84088532cf26b631224a18c78cbb.tar.gz | |
Implement GET/SET_GLOBAL(...) instead of using GET/SET_VAR(CS, ...)
Diffstat (limited to 'src/kbd.c')
| -rw-r--r-- | src/kbd.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -580,35 +580,35 @@ process_key(u8 scancode) u8 asciicode; struct scaninfo *info = &scan_to_scanascii[scancode]; if (shift_flags & 0x08) { /* ALT */ - asciicode = GET_VAR(CS, info->alt); - scancode = GET_VAR(CS, info->alt) >> 8; + asciicode = GET_GLOBAL(info->alt); + scancode = GET_GLOBAL(info->alt) >> 8; } else if (shift_flags & 0x04) { /* CONTROL */ - asciicode = GET_VAR(CS, info->control); - scancode = GET_VAR(CS, info->control) >> 8; + asciicode = GET_GLOBAL(info->control); + scancode = GET_GLOBAL(info->control) >> 8; } else if ((mf2_state & 0x02) > 0 && scancode >= 0x47 && scancode <= 0x53) { /* extended keys handling */ asciicode = 0xe0; - scancode = GET_VAR(CS, info->normal) >> 8; + scancode = GET_GLOBAL(info->normal) >> 8; } else if (shift_flags & 0x03) { /* LSHIFT + RSHIFT */ /* check if lock state should be ignored * because a SHIFT key are pressed */ - if (shift_flags & GET_VAR(CS, info->lock_flags)) { - asciicode = GET_VAR(CS, info->normal); - scancode = GET_VAR(CS, info->normal) >> 8; + if (shift_flags & GET_GLOBAL(info->lock_flags)) { + asciicode = GET_GLOBAL(info->normal); + scancode = GET_GLOBAL(info->normal) >> 8; } else { - asciicode = GET_VAR(CS, info->shift); - scancode = GET_VAR(CS, info->shift) >> 8; + asciicode = GET_GLOBAL(info->shift); + scancode = GET_GLOBAL(info->shift) >> 8; } } else { /* check if lock is on */ - if (shift_flags & GET_VAR(CS, info->lock_flags)) { - asciicode = GET_VAR(CS, info->shift); - scancode = GET_VAR(CS, info->shift) >> 8; + if (shift_flags & GET_GLOBAL(info->lock_flags)) { + asciicode = GET_GLOBAL(info->shift); + scancode = GET_GLOBAL(info->shift) >> 8; } else { - asciicode = GET_VAR(CS, info->normal); - scancode = GET_VAR(CS, info->normal) >> 8; + asciicode = GET_GLOBAL(info->normal); + scancode = GET_GLOBAL(info->normal) >> 8; } } if (scancode==0 && asciicode==0) { |