ia64/xen-unstable

changeset 17156:bf63d055d30c

stubdom: Fix compilation after abs_z to rel_z change
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Feb 28 14:09:47 2008 +0000 (2008-02-28)
parents 5f7bfdeb8748
children 91316e501e92
files extras/mini-os/kernel.c tools/ioemu/hw/xenfb.c
line diff
     1.1 --- a/extras/mini-os/kernel.c	Thu Feb 28 13:44:28 2008 +0000
     1.2 +++ b/extras/mini-os/kernel.c	Thu Feb 28 14:09:47 2008 +0000
     1.3 @@ -360,13 +360,13 @@ static void kbdfront_thread(void *p)
     1.4                  refresh_cursor(x, y);
     1.5                  break;
     1.6              case XENKBD_TYPE_POS:
     1.7 -                printk("pos x:%d y:%d z:%d\n",
     1.8 +                printk("pos x:%d y:%d dz:%d\n",
     1.9                          event.pos.abs_x,
    1.10                          event.pos.abs_y,
    1.11 -                        event.pos.abs_z);
    1.12 +                        event.pos.rel_z);
    1.13                  x = event.pos.abs_x;
    1.14                  y = event.pos.abs_y;
    1.15 -                z = event.pos.abs_z;
    1.16 +                z = event.pos.rel_z;
    1.17                  clip_cursor(&x, &y);
    1.18                  refresh_cursor(x, y);
    1.19                  break;
     2.1 --- a/tools/ioemu/hw/xenfb.c	Thu Feb 28 13:44:28 2008 +0000
     2.2 +++ b/tools/ioemu/hw/xenfb.c	Thu Feb 28 14:09:47 2008 +0000
     2.3 @@ -1230,7 +1230,7 @@ static void xenfb_kbd_handler(void *opaq
     2.4      int n, i;
     2.5      DisplayState *s = opaque;
     2.6      static int buttons;
     2.7 -    static int x, y, z;
     2.8 +    static int x, y;
     2.9  
    2.10      n = kbdfront_receive(kbd_dev, buf, KBD_NUM_BATCH);
    2.11      for (i = 0; i < n; i++) {
    2.12 @@ -1244,7 +1244,6 @@ static void xenfb_kbd_handler(void *opaq
    2.13              {
    2.14                  int new_x = buf[i].pos.abs_x;
    2.15                  int new_y = buf[i].pos.abs_y;
    2.16 -                int new_z = buf[i].pos.abs_z;
    2.17                  if (new_x >= s->width)
    2.18                      new_x = s->width - 1;
    2.19                  if (new_y >= s->height)
    2.20 @@ -1253,18 +1252,17 @@ static void xenfb_kbd_handler(void *opaq
    2.21                      kbd_mouse_event(
    2.22                              new_x * 0x7FFF / (s->width - 1),
    2.23                              new_y * 0x7FFF / (s->height - 1),
    2.24 -                            new_z,
    2.25 +                            buf[i].pos.rel_z,
    2.26                              buttons);
    2.27                  } else {
    2.28                      kbd_mouse_event(
    2.29                              new_x - x,
    2.30                              new_y - y,
    2.31 -                            new_z - z,
    2.32 +                            buf[i].pos.rel_z,
    2.33                              buttons);
    2.34                  }
    2.35                  x = new_x;
    2.36                  y = new_y;
    2.37 -                z = new_z;
    2.38                  break;
    2.39              }
    2.40  
    2.41 @@ -1289,7 +1287,7 @@ static void xenfb_kbd_handler(void *opaq
    2.42                          kbd_mouse_event(
    2.43                                  x * 0x7FFF / s->width,
    2.44                                  y * 0x7FFF / s->height,
    2.45 -                                z,
    2.46 +                                0,
    2.47                                  buttons);
    2.48                      else
    2.49                          kbd_mouse_event(0, 0, 0, buttons);