# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1204045951 25200
# Node ID 30993af85114af55c8eee19128ace6b5f9bd4692
# Parent 99478ffd81ee8685e6376210a1bd654c3790bf8d
# Parent 1edfea26a2a9d1b482f774fbf4cd113e7651ce3a
merge with linux-2.6.18-xen.hg
---
drivers/xen/fbfront/xenkbd.c | 24 ++++++++++--------------
include/xen/blkif.h | 20 ++++++++++++++++++++
include/xen/interface/io/protocols.h | 22 ++++++++++++++++++++++
include/xen/interface/kexec.h | 18 ++++++++++++++++++
include/xen/interface/libelf.h | 22 ++++++++++++++++++++++
5 files changed, 92 insertions(+), 14 deletions(-)
diff -r 99478ffd81ee -r 30993af85114 drivers/xen/fbfront/xenkbd.c
--- a/drivers/xen/fbfront/xenkbd.c Fri Feb 22 08:36:10 2008 -0700
+++ b/drivers/xen/fbfront/xenkbd.c Tue Feb 26 10:12:31 2008 -0700
@@ -64,13 +64,11 @@ static irqreturn_t input_handler(int rq,
dev = info->ptr;
switch (event->type) {
case XENKBD_TYPE_MOTION:
- if ( event->motion.rel_z == 1 || event->motion.rel_z ==
-1 ) {
- input_report_rel(dev, REL_WHEEL, 0 -
event->motion.rel_z);
- }
- else {
- input_report_rel(dev, REL_X,
event->motion.rel_x);
- input_report_rel(dev, REL_Y,
event->motion.rel_y);
- }
+ if (event->motion.rel_z)
+ input_report_rel(dev, REL_WHEEL,
+ 0 - event->motion.rel_z);
+ input_report_rel(dev, REL_X, event->motion.rel_x);
+ input_report_rel(dev, REL_Y, event->motion.rel_y);
break;
case XENKBD_TYPE_KEY:
dev = NULL;
@@ -86,13 +84,11 @@ static irqreturn_t input_handler(int rq,
event->key.keycode);
break;
case XENKBD_TYPE_POS:
- if ( event->pos.abs_z == 1 || event->pos.abs_z == -1 ) {
- input_report_rel(dev, REL_WHEEL, 0 -
event->pos.abs_z);
- }
- else {
- input_report_abs(dev, ABS_X, event->pos.abs_x);
- input_report_abs(dev, ABS_Y, event->pos.abs_y);
- }
+ if (event->pos.abs_z)
+ input_report_rel(dev, REL_WHEEL,
+ 0 - event->pos.abs_z);
+ input_report_abs(dev, ABS_X, event->pos.abs_x);
+ input_report_abs(dev, ABS_Y, event->pos.abs_y);
break;
}
if (dev)
diff -r 99478ffd81ee -r 30993af85114 include/xen/blkif.h
--- a/include/xen/blkif.h Fri Feb 22 08:36:10 2008 -0700
+++ b/include/xen/blkif.h Tue Feb 26 10:12:31 2008 -0700
@@ -1,3 +1,23 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifndef __XEN_BLKIF_H__
#define __XEN_BLKIF_H__
diff -r 99478ffd81ee -r 30993af85114 include/xen/interface/io/protocols.h
--- a/include/xen/interface/io/protocols.h Fri Feb 22 08:36:10 2008 -0700
+++ b/include/xen/interface/io/protocols.h Tue Feb 26 10:12:31 2008 -0700
@@ -1,3 +1,25 @@
+/******************************************************************************
+ * protocols.h
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifndef __XEN_PROTOCOLS_H__
#define __XEN_PROTOCOLS_H__
diff -r 99478ffd81ee -r 30993af85114 include/xen/interface/kexec.h
--- a/include/xen/interface/kexec.h Fri Feb 22 08:36:10 2008 -0700
+++ b/include/xen/interface/kexec.h Tue Feb 26 10:12:31 2008 -0700
@@ -1,5 +1,23 @@
/******************************************************************************
* kexec.h - Public portion
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*
* Xen port written by:
* - Simon 'Horms' Horman <horms@xxxxxxxxxxxx>
diff -r 99478ffd81ee -r 30993af85114 include/xen/interface/libelf.h
--- a/include/xen/interface/libelf.h Fri Feb 22 08:36:10 2008 -0700
+++ b/include/xen/interface/libelf.h Tue Feb 26 10:12:31 2008 -0700
@@ -1,3 +1,25 @@
+/******************************************************************************
+ * libelf.h
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifndef __XC_LIBELF__
#define __XC_LIBELF__ 1
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home