From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mfs5d-0002Zh-7e for qemu-devel@nongnu.org; Tue, 25 Aug 2009 05:13:17 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mfs5Y-0002Yo-8I for qemu-devel@nongnu.org; Tue, 25 Aug 2009 05:13:16 -0400 Received: from [199.232.76.173] (port=35028 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mfs5X-0002Yi-Sq for qemu-devel@nongnu.org; Tue, 25 Aug 2009 05:13:12 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:46438) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mfs5X-0005PL-3j for qemu-devel@nongnu.org; Tue, 25 Aug 2009 05:13:11 -0400 Received: from smtp2-g21.free.fr (localhost [127.0.0.1]) by smtp2-g21.free.fr (Postfix) with ESMTP id 44E914B01C5 for ; Tue, 25 Aug 2009 11:13:06 +0200 (CEST) Received: from laptop (vaf26-2-82-244-111-82.fbx.proxad.net [82.244.111.82]) by smtp2-g21.free.fr (Postfix) with ESMTP id 00CBF4B0198 for ; Tue, 25 Aug 2009 11:13:03 +0200 (CEST) From: "=?utf-8?q?Fran=C3=A7ois?= Revol" Date: Tue, 25 Aug 2009 11:14:10 +0200 CEST Message-Id: <4081524112-BeMail@laptop> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=----------Zoidberg-BeMail-temp-------- Subject: [Qemu-devel] [PATCH] Fixed wacom emulation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multipart message in MIME format. ------------Zoidberg-BeMail-temp-------- Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, it's been several times I've submitted this wacom fix, I've been told it was better to refactor the hid stuff first, but then the hid wacom merge diff was rejected... cf. http://lists.gnu.org/archive/cgi-bin/namazu.cgi=3Fquery=3Dwacom&submit=3DSearch%21&idxname=3Dqemu-devel&max=3D20&result=3Dnormal&sort=3Dscore Note it wasn't change a single line since last year(s=3F). So please consider fixing it first, as I need it, and then merge, split or whatever you want since I really do not have the time to do this a 2nd time. Fran=C3=A7ois. ------------Zoidberg-BeMail-temp-------- Content-Transfer-Encoding: base64 Content-Disposition: BMailAttachment Content-Type: text/x-patch; name=0001-Fixed-wacom-emulation.diff Rml4ZWQgd2Fjb20gZW11bGF0aW9uOgotIGZvciBhYnNvbHV0ZSBtb2RlLCBzY2FsZSBjb29yZGlu YXRlcyB0byB0aGUgcmVhbCBkZXZpY2UgbWF4aW11bSB2YWx1ZXMsCnNpbmNlIHNvbWUgZHJpdmVy cyAob24gSGFpa3UgYW5kIExpbnV4IGF0IGxlYXN0KSBuZWVkIHRoZW0gYXMgc3VjaCwgCmFuZCB0 aGUgSElEIGRlc2NyaXB0b3IgaXMgYm9nZ3VzIG9uIHNvbWUgbW9kZWxzIGFueXdheSwKLSBrZWVw IHRoZSBjb29yZGluYXRlcyBldmVuIHdoZW4gbm8gYnV0dG9uIGlzIHByZXNzZWQsIG9uIHJlYWwg dGFibGV0CnRoZSBwZW4gaXMgc2Vuc2VkIG9uIHRoZSBzdXJmYWNlIGV2ZW4gd2l0aG91dCBkaXJl Y3QgY29udGFjdCwKYW5kIGRyaXZlcnMgZXhwZWN0IHRoaXMsCi0gbWFwIGxlZnQgYnV0dG9uIHRv IHByZXNzdXJlIGFjY29yZGluZyB0byB3aGF0IHRoZSBIYWlrdSBkcml2ZXIgd2FudHMsCi0gbWFw IHRoZSByaWdodCBidXR0b24gdG8gdGhlIHBlbiBidXR0b24sCi0gbWFwIHRoZSBtaWRkbGUgYnV0 dG9uIHRvIHRoZSBlcmFzZXIsCi0gdXNlIGFzeW5jaHJvbm91cyByZXBvcnRpbmcgYXMgdGhlIGhp ZCBjb2RlIGRvZXMsIHN0b3BzIHRoZSBIYWlrdSBkcml2ZXIKKGFuZCBwcm9iYWJseSBvdGhlcnMp IGZyb20gc3BlbmRpbmcgNTAlIGNwdSBwb2xsaW5nIGZvciBjaGFuZ2VzLgoKU2lnbmVkLW9mZi1i eTogRnJhbsOnb2lzIFJldm9sIDxyZXZvbEBmcmVlLmZyPgotLS0KIGh3L3VzYi13YWNvbS5jIHwg ICAzOCArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFu Z2VkLCAyNCBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody91 c2Itd2Fjb20uYyBiL2h3L3VzYi13YWNvbS5jCmluZGV4IGVhZjBkMjkuLjdiZGI3NjUgMTAwNjQ0 Ci0tLSBhL2h3L3VzYi13YWNvbS5jCisrKyBiL2h3L3VzYi13YWNvbS5jCkBAIC01MCw2ICs1MCw4 IEBAIHR5cGVkZWYgc3RydWN0IFVTQldhY29tU3RhdGUgewogICAgICAgICBXQUNPTV9NT0RFX0hJ RCA9IDEsCiAgICAgICAgIFdBQ09NX01PREVfV0FDT00gPSAyLAogICAgIH0gbW9kZTsKKyAgICB1 aW50OF90IGlkbGU7CisgICAgaW50IGNoYW5nZWQ7CiB9IFVTQldhY29tU3RhdGU7CiAKIHN0YXRp YyBjb25zdCB1aW50OF90IHFlbXVfd2Fjb21fZGV2X2Rlc2NyaXB0b3JbXSA9IHsKQEAgLTEyNSw2 ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCB1c2JfbW91c2VfZXZlbnQodm9pZCAqb3BhcXVlLAogICAg IHMtPmR5ICs9IGR5MTsKICAgICBzLT5keiArPSBkejE7CiAgICAgcy0+YnV0dG9uc19zdGF0ZSA9 IGJ1dHRvbnNfc3RhdGU7CisgICAgcy0+Y2hhbmdlZCA9IDE7CiB9CiAKIHN0YXRpYyB2b2lkIHVz Yl93YWNvbV9ldmVudCh2b2lkICpvcGFxdWUsCkBAIC0xMzIsMTAgKzEzNSwxMiBAQCBzdGF0aWMg dm9pZCB1c2Jfd2Fjb21fZXZlbnQodm9pZCAqb3BhcXVlLAogewogICAgIFVTQldhY29tU3RhdGUg KnMgPSBvcGFxdWU7CiAKLSAgICBzLT54ID0geDsKLSAgICBzLT55ID0geTsKKyAgICAvKiBzY2Fs ZSB0byBQZW5wYXJ0bmVyIHJlc29sdXRpb24gKi8KKyAgICBzLT54ID0gKHggKiA1MDQwIC8gMHg3 RkZGKTsKKyAgICBzLT55ID0gKHkgKiAzNzgwIC8gMHg3RkZGKTsKICAgICBzLT5keiArPSBkejsK ICAgICBzLT5idXR0b25zX3N0YXRlID0gYnV0dG9uc19zdGF0ZTsKKyAgICBzLT5jaGFuZ2VkID0g MTsKIH0KIAogc3RhdGljIGlubGluZSBpbnQgaW50X2NsYW1wKGludCB2YWwsIGludCB2bWluLCBp bnQgdm1heCkKQEAgLTE5OSwyNiArMjA0LDIyIEBAIHN0YXRpYyBpbnQgdXNiX3dhY29tX3BvbGwo VVNCV2Fjb21TdGF0ZSAqcywgdWludDhfdCAqYnVmLCBpbnQgbGVuKQogICAgIGlmIChzLT5idXR0 b25zX3N0YXRlICYgTU9VU0VfRVZFTlRfTEJVVFRPTikKICAgICAgICAgYiB8PSAweDAxOwogICAg IGlmIChzLT5idXR0b25zX3N0YXRlICYgTU9VU0VfRVZFTlRfUkJVVFRPTikKLSAgICAgICAgYiB8 PSAweDAyOworICAgICAgICBiIHw9IDB4NDA7CiAgICAgaWYgKHMtPmJ1dHRvbnNfc3RhdGUgJiBN T1VTRV9FVkVOVF9NQlVUVE9OKQotICAgICAgICBiIHw9IDB4MDQ7CisgICAgICAgIGIgfD0gMHgy MDsgLyogZXJhc2VyICovCiAKICAgICBpZiAobGVuIDwgNykKICAgICAgICAgcmV0dXJuIDA7CiAK ICAgICBidWZbMF0gPSBzLT5tb2RlOwotICAgIGJ1Zls1XSA9IDB4MDA7Ci0gICAgaWYgKGIpIHsK LSAgICAgICAgYnVmWzFdID0gcy0+eCAmIDB4ZmY7Ci0gICAgICAgIGJ1ZlsyXSA9IHMtPnggPj4g ODsKLSAgICAgICAgYnVmWzNdID0gcy0+eSAmIDB4ZmY7Ci0gICAgICAgIGJ1Zls0XSA9IHMtPnkg Pj4gODsKKyAgICBidWZbNV0gPSAweDAwIHwgKGIgJiAweGYwKTsKKyAgICBidWZbMV0gPSBzLT54 ICYgMHhmZjsKKyAgICBidWZbMl0gPSBzLT54ID4+IDg7CisgICAgYnVmWzNdID0gcy0+eSAmIDB4 ZmY7CisgICAgYnVmWzRdID0gcy0+eSA+PiA4OworICAgIGlmIChiICYgMHgzZikgewogICAgICAg ICBidWZbNl0gPSAwOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGJ1ZlsxXSA9IDA7Ci0gICAgICAg IGJ1ZlsyXSA9IDA7Ci0gICAgICAgIGJ1ZlszXSA9IDA7Ci0gICAgICAgIGJ1Zls0XSA9IDA7CiAg ICAgICAgIGJ1Zls2XSA9ICh1bnNpZ25lZCBjaGFyKSAtMTI3OwogICAgIH0KIApAQCAtMzUwLDcg KzM1MSwxMiBAQCBzdGF0aWMgaW50IHVzYl93YWNvbV9oYW5kbGVfY29udHJvbChVU0JEZXZpY2Ug KmRldiwgaW50IHJlcXVlc3QsIGludCB2YWx1ZSwKICAgICAgICAgZWxzZSBpZiAocy0+bW9kZSA9 PSBXQUNPTV9NT0RFX1dBQ09NKQogICAgICAgICAgICAgcmV0ID0gdXNiX3dhY29tX3BvbGwocywg ZGF0YSwgbGVuZ3RoKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBISURfR0VUX0lETEU6Cisg ICAgICAgIHJldCA9IDE7CisgICAgICAgIGRhdGFbMF0gPSBzLT5pZGxlOworICAgICAgICBicmVh azsKICAgICBjYXNlIEhJRF9TRVRfSURMRToKKyAgICAgICAgcy0+aWRsZSA9ICh1aW50OF90KSAo dmFsdWUgPj4gOCk7CiAgICAgICAgIHJldCA9IDA7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1 bHQ6CkBAIC0zNjksNiArMzc1LDkgQEAgc3RhdGljIGludCB1c2Jfd2Fjb21faGFuZGxlX2RhdGEo VVNCRGV2aWNlICpkZXYsIFVTQlBhY2tldCAqcCkKICAgICBzd2l0Y2ggKHAtPnBpZCkgewogICAg IGNhc2UgVVNCX1RPS0VOX0lOOgogICAgICAgICBpZiAocC0+ZGV2ZXAgPT0gMSkgeworICAgICAg ICAgICAgaWYgKCEocy0+Y2hhbmdlZCB8fCBzLT5pZGxlKSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gVVNCX1JFVF9OQUs7CisgICAgICAgICAgICBzLT5jaGFuZ2VkID0gMDsKICAgICAgICAgICAg IGlmIChzLT5tb2RlID09IFdBQ09NX01PREVfSElEKQogICAgICAgICAgICAgICAgIHJldCA9IHVz Yl9tb3VzZV9wb2xsKHMsIHAtPmRhdGEsIHAtPmxlbik7CiAgICAgICAgICAgICBlbHNlIGlmIChz LT5tb2RlID09IFdBQ09NX01PREVfV0FDT00pCkBAIC00MDQsNiArNDEzLDcgQEAgVVNCRGV2aWNl ICp1c2Jfd2Fjb21faW5pdCh2b2lkKQogICAgIHMtPmRldi5oYW5kbGVfY29udHJvbCA9IHVzYl93 YWNvbV9oYW5kbGVfY29udHJvbDsKICAgICBzLT5kZXYuaGFuZGxlX2RhdGEgPSB1c2Jfd2Fjb21f aGFuZGxlX2RhdGE7CiAgICAgcy0+ZGV2LmhhbmRsZV9kZXN0cm95ID0gdXNiX3dhY29tX2hhbmRs ZV9kZXN0cm95OworICAgIHMtPmNoYW5nZWQgPSAxOwogCiAgICAgcHN0cmNweShzLT5kZXYuZGV2 bmFtZSwgc2l6ZW9mKHMtPmRldi5kZXZuYW1lKSwKICAgICAgICAgICAgICJRRU1VIFBlblBhcnRu ZXIgVGFibGV0Iik7Ci0tIAoxLjQuNC40Cgo= ------------Zoidberg-BeMail-temp----------