# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204204168 0
# Node ID ecf7ded43d5c636c22a575216fbedcb9b527be4f
# Parent 896b543581febb03d8d65eb1275d74d90b9f708c
Rename struct xenkbd_position member abs_z to rel_z. Z-axis motion is
relative, not absolute.
From: Markus Armbruster <armbru@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/ioemu/hw/xenfb.c | 8 +++++---
xen/include/public/io/kbdif.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff -r 896b543581fe -r ecf7ded43d5c tools/ioemu/hw/xenfb.c
--- a/tools/ioemu/hw/xenfb.c Thu Feb 28 10:48:42 2008 +0000
+++ b/tools/ioemu/hw/xenfb.c Thu Feb 28 13:09:28 2008 +0000
@@ -598,7 +598,8 @@ static int xenfb_send_key(struct xenfb *
}
/* Send a relative mouse movement event */
-static int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y, int
rel_z)
+static int xenfb_send_motion(struct xenfb *xenfb,
+ int rel_x, int rel_y, int rel_z)
{
union xenkbd_in_event event;
@@ -612,7 +613,8 @@ static int xenfb_send_motion(struct xenf
}
/* Send an absolute mouse movement event */
-static int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y, int
abs_z)
+static int xenfb_send_position(struct xenfb *xenfb,
+ int abs_x, int abs_y, int rel_z)
{
union xenkbd_in_event event;
@@ -620,7 +622,7 @@ static int xenfb_send_position(struct xe
event.type = XENKBD_TYPE_POS;
event.pos.abs_x = abs_x;
event.pos.abs_y = abs_y;
- event.pos.abs_z = abs_z;
+ event.pos.rel_z = rel_z;
return xenfb_kbd_event(xenfb, &event);
}
diff -r 896b543581fe -r ecf7ded43d5c xen/include/public/io/kbdif.h
--- a/xen/include/public/io/kbdif.h Thu Feb 28 10:48:42 2008 +0000
+++ b/xen/include/public/io/kbdif.h Thu Feb 28 13:09:28 2008 +0000
@@ -65,7 +65,7 @@ struct xenkbd_position
uint8_t type; /* XENKBD_TYPE_POS */
int32_t abs_x; /* absolute X position (in FB pixels) */
int32_t abs_y; /* absolute Y position (in FB pixels) */
- int32_t abs_z; /* absolute Z position (wheel) */
+ int32_t rel_z; /* relative Z motion (wheel) */
};
#define XENKBD_IN_EVENT_SIZE 40
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|