* [PULL] qemumips wacom tablet support
@ 2010-11-08 21:01 Bruce Ashfield
2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield
2010-11-10 19:40 ` [PULL] qemumips " Saul Wold
0 siblings, 2 replies; 6+ messages in thread
From: Bruce Ashfield @ 2010-11-08 21:01 UTC (permalink / raw)
To: saul.wold, rpurdie; +Cc: poky
The following changes fix the qemumips target to have wacom USB
tablet support. This fixes bugid #394.
The following changes since commit 724088189e699c67adf949f5baaa8de83483c82c:
Richard Purdie (1):
Poky -> Yocto name change
are available in the git repository at:
ssh://git@git.pokylinux.org/poky-contrib zedd/kernel
Bruce Ashfield (2):
qemumips: re-enable wacom and standard USB UI options
wrs_meta: add USB options for wacom tablet support
J. Aaron Gamble (2):
Added qemumips /etc/pointercal file for touchscreen calibration
tslib: 32bit big endian support
.../conf/distro/include/poky-default-revisions.inc | 2 +-
.../formfactor/files/qemumips/machconfig | 4 +-
.../pointercal/files/qemumips/pointercal | 1 +
.../tslib/tslib/32bitBE-support.patch | 52 ++++++++++++++++++++
meta/recipes-graphics/tslib/tslib_1.0.bb | 4 +-
scripts/poky-qemu-internal | 2 +-
6 files changed, 60 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-bsp/pointercal/files/qemumips/pointercal
create mode 100644 meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration 2010-11-08 21:01 [PULL] qemumips wacom tablet support Bruce Ashfield @ 2010-11-08 21:01 ` Bruce Ashfield 2010-11-08 21:01 ` [PATCH 2/4] tslib: 32bit big endian support Bruce Ashfield ` (2 more replies) 2010-11-10 19:40 ` [PULL] qemumips " Saul Wold 1 sibling, 3 replies; 6+ messages in thread From: Bruce Ashfield @ 2010-11-08 21:01 UTC (permalink / raw) To: saul.wold, rpurdie; +Cc: poky From: J. Aaron Gamble <john.gamble@windriver.com> Fixes [BUGID #394] Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> --- .../pointercal/files/qemumips/pointercal | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-bsp/pointercal/files/qemumips/pointercal diff --git a/meta/recipes-bsp/pointercal/files/qemumips/pointercal b/meta/recipes-bsp/pointercal/files/qemumips/pointercal new file mode 100644 index 0000000..abd84ca --- /dev/null +++ b/meta/recipes-bsp/pointercal/files/qemumips/pointercal @@ -0,0 +1 @@ +8313 4 -8526 7 8334 -82604 65536 -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] tslib: 32bit big endian support 2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield @ 2010-11-08 21:01 ` Bruce Ashfield 2010-11-08 21:01 ` [PATCH 3/4] qemumips: re-enable wacom and standard USB UI options Bruce Ashfield 2010-11-08 21:01 ` [PATCH 4/4] wrs_meta: add USB options for wacom tablet support Bruce Ashfield 2 siblings, 0 replies; 6+ messages in thread From: Bruce Ashfield @ 2010-11-08 21:01 UTC (permalink / raw) To: saul.wold, rpurdie; +Cc: poky From: J. Aaron Gamble <john.gamble@windriver.com> Fixes [BUGID #394] patch added from: https://launchpad.net/ubuntu/+source/tslib/1.0-7 Enables wacom tablet/touchscreen support on qemumips Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- .../formfactor/files/qemumips/machconfig | 4 +- .../tslib/tslib/32bitBE-support.patch | 52 ++++++++++++++++++++ meta/recipes-graphics/tslib/tslib_1.0.bb | 4 +- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/tslib/tslib/32bitBE-support.patch diff --git a/meta/recipes-bsp/formfactor/files/qemumips/machconfig b/meta/recipes-bsp/formfactor/files/qemumips/machconfig index 3f2646b..56777b6 100755 --- a/meta/recipes-bsp/formfactor/files/qemumips/machconfig +++ b/meta/recipes-bsp/formfactor/files/qemumips/machconfig @@ -1,5 +1,5 @@ -HAVE_TOUCHSCREEN=0 -HAVE_KEYBOARD=0 +HAVE_TOUCHSCREEN=1 +HAVE_KEYBOARD=1 DISPLAY_CAN_ROTATE=0 DISPLAY_ORIENTATION=0 diff --git a/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch b/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch new file mode 100644 index 0000000..3262f16 --- /dev/null +++ b/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch @@ -0,0 +1,52 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 030-32bitBE-support.dpatch by Neil Williams <codehelp@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: See bug #496759 - being tested upstream for 32bit BE devices + +@DPATCH@ +diff -urNad tslib-1.0~/plugins/input-raw.c tslib-1.0/plugins/input-raw.c +--- tslib-1.0~/plugins/input-raw.c 2008-12-09 10:56:47.000000000 +0000 ++++ tslib-1.0/plugins/input-raw.c 2008-12-09 11:05:41.000000000 +0000 +@@ -44,25 +44,33 @@ + int using_syn; + }; + ++#define BITS_PER_LONG (sizeof(long) * 8) ++#ifndef EV_CNT ++#define EV_CNT (EV_MAX+1) ++#endif ++#ifndef ABS_CNT ++#define ABS_CNT (ABS_MAX+1) ++#endif ++ + static int check_fd(struct tslib_input *i) + { + struct tsdev *ts = i->module.dev; + int version; +- u_int32_t bit; +- u_int64_t absbit; ++ unsigned long bit[EV_CNT / BITS_PER_LONG + 1]; ++ unsigned long absbit[ABS_MAX / BITS_PER_LONG + 1]; + + if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) && + (version == EV_VERSION) && +- (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) && +- (bit & (1 << EV_ABS)) && +- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) && +- (absbit & (1 << ABS_X)) && +- (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) { ++ (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), bit) >= 0) && ++ (bit[0] & (1 << EV_ABS)) && ++ (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) && ++ (absbit[0] & (1 << ABS_X)) && ++ (absbit[0] & (1 << ABS_Y)) && (absbit[0] & (1 << ABS_PRESSURE)))) { + fprintf(stderr, "selected device is not a touchscreen I understand\n"); + return -1; + } + +- if (bit & (1 << EV_SYN)) ++ if (bit[0] & (1 << EV_SYN)) + i->using_syn = 1; + + return 0; diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb index 12c0ace..8db90d9 100644 --- a/meta/recipes-graphics/tslib/tslib_1.0.bb +++ b/meta/recipes-graphics/tslib/tslib_1.0.bb @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" -PR = "r15" +PR = "r16" SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ file://fix_version.patch;patch=1 \ @@ -16,6 +16,8 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ file://tslib.sh" SRC_URI_append_mnci += " file://devfs.patch;patch=1" SRC_URI_append_mnci += " file://event1.patch;patch=1" +SRC_URI_append_qemumips += " file://32bitBE-support.patch;patch=1" + inherit autotools pkgconfig -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] qemumips: re-enable wacom and standard USB UI options 2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield 2010-11-08 21:01 ` [PATCH 2/4] tslib: 32bit big endian support Bruce Ashfield @ 2010-11-08 21:01 ` Bruce Ashfield 2010-11-08 21:01 ` [PATCH 4/4] wrs_meta: add USB options for wacom tablet support Bruce Ashfield 2 siblings, 0 replies; 6+ messages in thread From: Bruce Ashfield @ 2010-11-08 21:01 UTC (permalink / raw) To: saul.wold, rpurdie; +Cc: poky Fixes [BUGID #394] Now that the qemu/mti mips kernel branches have been fixed for wacom USB interaction, we can re-nable the standard set of qemu UI options for qemumips. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- scripts/poky-qemu-internal | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index cf16407..62c1040 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -338,7 +338,7 @@ fi if [ "$MACHINE" = "qemumips" ]; then QEMU=qemu-system-mips MACHINE_SUBTYPE=malta - QEMU_UI_OPTIONS="-vga cirrus" + QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" if [ "$FSTYPE" = "ext3" ]; then #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] wrs_meta: add USB options for wacom tablet support 2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield 2010-11-08 21:01 ` [PATCH 2/4] tslib: 32bit big endian support Bruce Ashfield 2010-11-08 21:01 ` [PATCH 3/4] qemumips: re-enable wacom and standard USB UI options Bruce Ashfield @ 2010-11-08 21:01 ` Bruce Ashfield 2 siblings, 0 replies; 6+ messages in thread From: Bruce Ashfield @ 2010-11-08 21:01 UTC (permalink / raw) To: saul.wold, rpurdie; +Cc: poky Fixes [BUGID: #394] qemumips: Added wacom tablet support to mti_malta32_be bsp config Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- .../conf/distro/include/poky-default-revisions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 55e14f8..4571995 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -92,7 +92,7 @@ SRCREV_machine_pn-linux-wrs_atom-pc ?= "0431115c9d720fee5bb105f6a7411efb4f851d26 SRCREV_machine_pn-linux-wrs_routerstationpro ?= "2ec2edaf256dd8500ee3d4763fee6ca3ecd6da4b" SRCREV_machine_pn-linux-wrs_mpc8315e-rdb ?= "986e6eb66c26007cee7916d5d12f4756e6b5436f" SRCREV_machine_pn-linux-wrs_beagleboard ?= "0431115c9d720fee5bb105f6a7411efb4f851d26" -SRCREV_meta_pn-linux-wrs ?= "5adcf6fbcd7491d8d3e1805929f575041d439235" +SRCREV_meta_pn-linux-wrs ?= "d1cd5c80ee97e81e130be8c3de3965b770f320d6" SRCREV_pn-linux-libc-headers-wrs ??= "09a39c638dd65dc27c549c119abe1af2631b2ae0" SRCREV_pn-matchbox-config-gtk ??= "2081" SRCREV_pn-matchbox-desktop-sato ??= "76" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PULL] qemumips wacom tablet support 2010-11-08 21:01 [PULL] qemumips wacom tablet support Bruce Ashfield 2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield @ 2010-11-10 19:40 ` Saul Wold 1 sibling, 0 replies; 6+ messages in thread From: Saul Wold @ 2010-11-10 19:40 UTC (permalink / raw) To: Bruce Ashfield; +Cc: poky@yoctoproject.org On 11/08/2010 01:01 PM, Bruce Ashfield wrote: > The following changes fix the qemumips target to have wacom USB > tablet support. This fixes bugid #394. > > The following changes since commit 724088189e699c67adf949f5baaa8de83483c82c: > Richard Purdie (1): > Poky -> Yocto name change > > are available in the git repository at: > > ssh://git@git.pokylinux.org/poky-contrib zedd/kernel > > Bruce Ashfield (2): > qemumips: re-enable wacom and standard USB UI options > wrs_meta: add USB options for wacom tablet support > > J. Aaron Gamble (2): > Added qemumips /etc/pointercal file for touchscreen calibration > tslib: 32bit big endian support > > .../conf/distro/include/poky-default-revisions.inc | 2 +- > .../formfactor/files/qemumips/machconfig | 4 +- > .../pointercal/files/qemumips/pointercal | 1 + > .../tslib/tslib/32bitBE-support.patch | 52 ++++++++++++++++++++ > meta/recipes-graphics/tslib/tslib_1.0.bb | 4 +- > scripts/poky-qemu-internal | 2 +- > 6 files changed, 60 insertions(+), 5 deletions(-) > create mode 100644 meta/recipes-bsp/pointercal/files/qemumips/pointercal > create mode 100644 meta/recipes-graphics/tslib/tslib/32bitBE-support.patch > > > Merged into Master Thanks Sau! ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-11-10 19:40 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-08 21:01 [PULL] qemumips wacom tablet support Bruce Ashfield 2010-11-08 21:01 ` [PATCH 1/4] Added qemumips /etc/pointercal file for touchscreen calibration Bruce Ashfield 2010-11-08 21:01 ` [PATCH 2/4] tslib: 32bit big endian support Bruce Ashfield 2010-11-08 21:01 ` [PATCH 3/4] qemumips: re-enable wacom and standard USB UI options Bruce Ashfield 2010-11-08 21:01 ` [PATCH 4/4] wrs_meta: add USB options for wacom tablet support Bruce Ashfield 2010-11-10 19:40 ` [PULL] qemumips " Saul Wold
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.