mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
Change MMIO callbacks to use offsets, not absolute addresses.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5849 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
6ad1d22b15
commit
8da3ff1809
82 changed files with 453 additions and 869 deletions
|
@ -125,7 +125,6 @@ typedef struct KBDState {
|
|||
|
||||
qemu_irq irq_kbd;
|
||||
qemu_irq irq_mouse;
|
||||
target_phys_addr_t base;
|
||||
int it_shift;
|
||||
} KBDState;
|
||||
|
||||
|
@ -392,7 +391,7 @@ static uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr)
|
|||
{
|
||||
KBDState *s = opaque;
|
||||
|
||||
switch ((addr - s->base) >> s->it_shift) {
|
||||
switch (addr >> s->it_shift) {
|
||||
case 0:
|
||||
return kbd_read_data(s, 0) & 0xff;
|
||||
case 1:
|
||||
|
@ -406,7 +405,7 @@ static void kbd_mm_writeb (void *opaque, target_phys_addr_t addr, uint32_t value
|
|||
{
|
||||
KBDState *s = opaque;
|
||||
|
||||
switch ((addr - s->base) >> s->it_shift) {
|
||||
switch (addr >> s->it_shift) {
|
||||
case 0:
|
||||
kbd_write_data(s, 0, value & 0xff);
|
||||
break;
|
||||
|
@ -436,7 +435,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
|
|||
|
||||
s->irq_kbd = kbd_irq;
|
||||
s->irq_mouse = mouse_irq;
|
||||
s->base = base;
|
||||
s->it_shift = it_shift;
|
||||
|
||||
kbd_reset(s);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue