This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--0-2111587957-1142975042=:14032
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

hello,

On Mon, 20 Mar 2006, Manuel Bouyer wrote:

> Date: Mon, 20 Mar 2006 21:44:47 +0100
> From: Manuel Bouyer <bouyer@antioche.eu.org>
> To: Stephan Thesing <thesing@cs.uni-sb.de>
> Cc: current-users@NetBSD.org
> Subject: Re: Incompatibilities between <=3.0 & current: USB_DEVICEINFO ioctl
> 
> On Sun, Mar 19, 2006 at 09:21:31PM +0100, Stephan Thesing wrote:
>> Hello,
>>
[...]
>> Is this accepted behavior and I should just live with having to compile a
>> libusb under -current (which fixed my problem for digikam) or should a
>> compat ioctl be added to -current in order to mimic the old behavior?
>> (It will be difficult to mimic the right behavior for reads of events...)
>
> Ideally a compat ioctl should be added, especially as there may be
> binary-only statically linked drivers around.

attached is a try for a patch which
  - adds compat ioctls with the right numbers from <=3.0 for
      USB_GET_DEVICEINFO and USB_DEVICEINFO named
       USB_GET_DEVICEINFO_OLD and USB_DEVICEINFO_OLD
  - adds structs usb_device_info_old and usb_event_old, which are
      compatible with the usb_device_info and usb_event structs form <=3.0
  - adds code to restore the old string handling for the compat ioctls (which is
      quite ugly)
  - adds compat code in `usbread' that transforms results into the usb_event_old
     struct if the read size was for that struct (to handle event reads from
     /dev/usb)

This seems to work (digikam now works both with a -current compile libusb and a
  3.0 one, reads from /dev/usb seem to work as well).

As this patch is the result of hacking after a long day of work, it's probably 
not as nice at it could be.  One thing that should probably be changed is 
making the compat code dependend on COMPAT_{16,20,30} being defined...

Best regards....
 	Stephan

-- 
=  Tel.: +49-681-302-5571      = Universitaet des Saarlandes =
=  Fax.: +49-681-302-3065      = Postfach 15 11 50           =
=  Compiler Research Group     = 66041 Saarbruecken          =
=  FR 6.2 - Informatik         = GERMANY                     =

--0-2111587957-1142975042=:14032
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=usbdiff
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.NEB.4.64.0603212204020.14032@gargoyle.cs.uni-sb.de>
Content-Description: USB compat diff
Content-Disposition: attachment; filename=usbdiff

SW5kZXg6IHN5cy9kZXYvdXNiL3VnZW4uYw0KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L3NyYy9zeXMvZGV2L3VzYi91Z2Vu
LmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjc5DQpkaWZmIC11IC1yMS43
OSB1Z2VuLmMNCi0tLSBzeXMvZGV2L3VzYi91Z2VuLmMJMSBNYXIgMjAwNiAx
MjozODoxMyAtMDAwMAkxLjc5DQorKysgc3lzL2Rldi91c2IvdWdlbi5jCTIx
IE1hciAyMDA2IDIwOjQ5OjM3IC0wMDAwDQpAQCAtMTMwMCwxMCArMTMwMCwx
NiBAQA0KIAkJCWZyZWUocHRyLCBNX1RFTVApOw0KIAkJcmV0dXJuIChlcnJv
cik7DQogCX0NCisNCiAJY2FzZSBVU0JfR0VUX0RFVklDRUlORk86DQogCQl1
c2JkX2ZpbGxfZGV2aWNlaW5mbyhzYy0+c2NfdWRldiwNCiAJCQkJICAgICAo
c3RydWN0IHVzYl9kZXZpY2VfaW5mbyAqKWFkZHIsIDEpOw0KIAkJYnJlYWs7
DQorCWNhc2UgVVNCX0dFVF9ERVZJQ0VJTkZPX09MRDoNCisJCXVzYmRfZmls
bF9kZXZpY2VpbmZvX29sZChzYy0+c2NfdWRldiwNCisJCQkJCSAoc3RydWN0
IHVzYl9kZXZpY2VfaW5mb19vbGQgKilhZGRyLCAxKTsNCisNCisJCWJyZWFr
Ow0KIAlkZWZhdWx0Og0KIAkJcmV0dXJuIChFSU5WQUwpOw0KIAl9DQpJbmRl
eDogc3lzL2Rldi91c2IvdWhpZC5jDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
DQpSQ1MgZmlsZTogL2N2c3Jvb3Qvc3JjL3N5cy9kZXYvdXNiL3VoaWQuYyx2
DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjgNCmRpZmYgLXUgLXIxLjY4IHVo
aWQuYw0KLS0tIHN5cy9kZXYvdXNiL3VoaWQuYwkxMSBEZWMgMjAwNSAxMjoy
NDowMSAtMDAwMAkxLjY4DQorKysgc3lzL2Rldi91c2IvdWhpZC5jCTIxIE1h
ciAyMDA2IDIwOjQ5OjIzIC0wMDAwDQpAQCAtNTMyLDcgKzUzMiwxMyBAQA0K
IA0KIAljYXNlIFVTQl9HRVRfREVWSUNFSU5GTzoNCiAJCXVzYmRfZmlsbF9k
ZXZpY2VpbmZvKHNjLT5zY19oZGV2LnNjX3BhcmVudC0+c2NfdWRldiwNCi0J
CQkJICAgICAoc3RydWN0IHVzYl9kZXZpY2VfaW5mbyAqKWFkZHIsIDEpOw0K
KwkJCSAgICAgICAgICAgICAoc3RydWN0IHVzYl9kZXZpY2VfaW5mbyAqKWFk
ZHIsIDEpOw0KKwkJYnJlYWs7DQorDQorCWNhc2UgVVNCX0dFVF9ERVZJQ0VJ
TkZPX09MRDoNCisJCXVzYmRfZmlsbF9kZXZpY2VpbmZvX29sZChzYy0+c2Nf
aGRldi5zY19wYXJlbnQtPnNjX3VkZXYsDQorCQkJCQkgKHN0cnVjdCB1c2Jf
ZGV2aWNlX2luZm9fb2xkICopYWRkciwgMSk7DQorDQogCQlicmVhazsNCiAN
CiAgICAgICAgIGNhc2UgVVNCX0dFVF9TVFJJTkdfREVTQzoNCkluZGV4OiBz
eXMvZGV2L3VzYi91c2IuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT
IGZpbGU6IC9jdnNyb290L3NyYy9zeXMvZGV2L3VzYi91c2IuYyx2DQpyZXRy
aWV2aW5nIHJldmlzaW9uIDEuODUNCmRpZmYgLXUgLXIxLjg1IHVzYi5jDQot
LS0gc3lzL2Rldi91c2IvdXNiLmMJMSBNYXIgMjAwNiAxMjozODoxMyAtMDAw
MAkxLjg1DQorKysgc3lzL2Rldi91c2IvdXNiLmMJMjEgTWFyIDIwMDYgMjA6
MzA6MzAgLTAwMDANCkBAIC0xNDAsNiArMTQwLDggQEANCiANCiBTdGF0aWMg
aW50IHVzYl9nZXRfbmV4dF9ldmVudChzdHJ1Y3QgdXNiX2V2ZW50ICopOw0K
IA0KK1N0YXRpYyB2b2lkIHVzYl9jb3B5X29sZF9kZXZpbmZvKHN0cnVjdCB1
c2JfZGV2aWNlX2luZm9fb2xkICosIHN0cnVjdCB1c2JfZGV2aWNlX2luZm8g
Kik7DQorDQogU3RhdGljIGNvbnN0IGNoYXIgKnVzYnJldl9zdHJbXSA9IFVT
QlJFVl9TVFI7DQogDQogVVNCX0RFQ0xBUkVfRFJJVkVSKHVzYik7DQpAQCAt
NDA2LDE0ICs0MDgsMTcgQEANCiB1c2JyZWFkKGRldl90IGRldiwgc3RydWN0
IHVpbyAqdWlvLCBpbnQgZmxhZykNCiB7DQogCXN0cnVjdCB1c2JfZXZlbnQg
dWU7DQotCWludCBzLCBlcnJvciwgbjsNCisJc3RydWN0IHVzYl9ldmVudF9v
bGQgdWVvOw0KKwlpbnQgcywgZXJyb3IsIG4sIHVzZW9sZDsNCiANCiAJaWYg
KG1pbm9yKGRldikgIT0gVVNCX0RFVl9NSU5PUikNCiAJCXJldHVybiAoRU5Y
SU8pOw0KIA0KLQlpZiAodWlvLT51aW9fcmVzaWQgIT0gc2l6ZW9mKHN0cnVj
dCB1c2JfZXZlbnQpKQ0KKwlpZiAodWlvLT51aW9fcmVzaWQgIT0gc2l6ZW9m
KHN0cnVjdCB1c2JfZXZlbnQpICYmDQorCSAgICB1aW8tPnVpb19yZXNpZCAh
PSBzaXplb2Yoc3RydWN0IHVzYl9ldmVudF9vbGQpKQ0KIAkJcmV0dXJuIChF
SU5WQUwpOw0KIA0KKwl1c2VvbGQ9KHVpby0+dWlvX3Jlc2lkPT1zaXplb2Yo
c3RydWN0IHVzYl9ldmVudF9vbGQpKTsNCiAJZXJyb3IgPSAwOw0KIAlzID0g
c3BsdXNiKCk7DQogCWZvciAoOzspIHsNCkBAIC00MjksOCArNDM0LDM1IEBA
DQogCQkJYnJlYWs7DQogCX0NCiAJc3BseChzKTsNCi0JaWYgKCFlcnJvcikN
Ci0JCWVycm9yID0gdWlvbW92ZSgodm9pZCAqKSZ1ZSwgdWlvLT51aW9fcmVz
aWQsIHVpbyk7DQorCWlmICghZXJyb3IpIHsNCisJCWlmICh1c2VvbGQpIHsg
LyogY29weSBmaWVsZHMgdG8gb2xkIHN0cnVjdCAqLw0KKwkJCXVlby51ZV90
eXBlID0gdWUudWVfdHlwZTsNCisJCQliY29weSgmdWUudWVfdGltZSwgJnVl
by51ZV90aW1lLCBzaXplb2Yoc3RydWN0IHRpbWVzcGVjKSk7DQorCQkJc3dp
dGNoICh1ZS51ZV90eXBlKSB7DQorCQkJCWNhc2UgVVNCX0VWRU5UX0RFVklD
RV9BVFRBQ0g6DQorCQkJCWNhc2UgVVNCX0VWRU5UX0RFVklDRV9ERVRBQ0g6
DQorCQkJCQl1c2JfY29weV9vbGRfZGV2aW5mbygmdWVvLnUudWVfZGV2aWNl
LCAmdWUudS51ZV9kZXZpY2UpOw0KKwkJCQkJYnJlYWs7DQorDQorCQkJCWNh
c2UgVVNCX0VWRU5UX0NUUkxSX0FUVEFDSDoNCisJCQkJY2FzZSBVU0JfRVZF
TlRfQ1RSTFJfREVUQUNIOg0KKwkJCQkJdWVvLnUudWVfY3RybHIudWVfYnVz
PXVlLnUudWVfY3RybHIudWVfYnVzOw0KKwkJCQkJYnJlYWs7DQorDQorCQkJ
CWNhc2UgVVNCX0VWRU5UX0RSSVZFUl9BVFRBQ0g6DQorCQkJCWNhc2UgVVNC
X0VWRU5UX0RSSVZFUl9ERVRBQ0g6DQorCQkJCQl1ZW8udS51ZV9kcml2ZXIu
dWVfY29va2llPXVlLnUudWVfZHJpdmVyLnVlX2Nvb2tpZTsNCisJCQkJCWJj
b3B5KHVlLnUudWVfZHJpdmVyLnVlX2Rldm5hbWUsIHVlby51LnVlX2RyaXZl
ci51ZV9kZXZuYW1lLCAgIA0KKwkJCQkJCXNpemVvZih1ZS51LnVlX2RyaXZl
ci51ZV9kZXZuYW1lKSk7DQorCQkJCQlicmVhazsNCisJCQkJZGVmYXVsdDoN
CisJCQkJCTsNCisJCQl9DQorDQorCQkJZXJyb3IgPSB1aW9tb3ZlKCh2b2lk
ICopJnVlbywgdWlvLT51aW9fcmVzaWQsIHVpbyk7DQorCQl9IGVsc2UNCisJ
CQllcnJvciA9IHVpb21vdmUoKHZvaWQgKikmdWUsIHVpby0+dWlvX3Jlc2lk
LCB1aW8pOw0KKwl9DQogDQogCXJldHVybiAoZXJyb3IpOw0KIH0NCkBAIC01
NTAsMTcgKzU4MiwyNiBAQA0KIAl9DQogDQogCWNhc2UgVVNCX0RFVklDRUlO
Rk86DQorCWNhc2UgVVNCX0RFVklDRUlORk9fT0xEOg0KIAl7DQogCQlzdHJ1
Y3QgdXNiX2RldmljZV9pbmZvICpkaSA9ICh2b2lkICopZGF0YTsNCi0JCWlu
dCBhZGRyID0gZGktPnVkaV9hZGRyOw0KKwkJc3RydWN0IHVzYl9kZXZpY2Vf
aW5mb19vbGQgKmRpbz0odm9pZCAqKWRhdGE7DQorCQlpbnQgYWRkcjsNCiAJ
CXVzYmRfZGV2aWNlX2hhbmRsZSBkZXY7DQogDQorCQlpZiAoVVNCX0RFVklD
RUlORk89PWNtZCkNCisJCQlhZGRyPWRpLT51ZGlfYWRkcjsNCisJCWVsc2UN
CisJCQlhZGRyPWRpby0+dWRpX2FkZHI7DQogCQlpZiAoYWRkciA8IDEgfHwg
YWRkciA+PSBVU0JfTUFYX0RFVklDRVMpDQogCQkJcmV0dXJuIChFSU5WQUwp
Ow0KIAkJZGV2ID0gc2MtPnNjX2J1cy0+ZGV2aWNlc1thZGRyXTsNCiAJCWlm
IChkZXYgPT0gTlVMTCkNCiAJCQlyZXR1cm4gKEVOWElPKTsNCi0JCXVzYmRf
ZmlsbF9kZXZpY2VpbmZvKGRldiwgZGksIDEpOw0KKwkJaWYgKFVTQl9ERVZJ
Q0VJTkZPPT1jbWQpDQorCQkJdXNiZF9maWxsX2RldmljZWluZm8oZGV2LCBk
aSwgMSk7DQorCQllbHNlDQorCQkJdXNiZF9maWxsX2RldmljZWluZm9fb2xk
KGRldiwgZGlvLCAxKTsNCiAJCWJyZWFrOw0KIAl9DQogDQpAQCAtODQyLDMg
Kzg4Myw1NiBAQA0KIA0KIAlyZXR1cm4gKDApOw0KIH0NCisNCitTdGF0aWMg
dm9pZA0KK3VzYl9jb3B5X29sZF9kZXZpbmZvKHN0cnVjdCB1c2JfZGV2aWNl
X2luZm9fb2xkICp1bywgc3RydWN0IHVzYl9kZXZpY2VfaW5mbyAqdWUpDQor
ew0KKwl1bnNpZ25lZCBjaGFyICpwLCAqcTsNCisJaW50IG47DQorDQorCXVv
LT51ZGlfYnVzID0gdWUtPnVkaV9idXM7DQorCXVvLT51ZGlfYWRkciA9IHVl
LT51ZGlfYWRkcjsgICAgICAgDQorCXVvLT51ZGlfY29va2llID0gdWUtPnVk
aV9jb29raWU7DQorCWZvciAocD0odW5zaWduZWQgY2hhciAqKXVlLT51ZGlf
cHJvZHVjdCwNCisJICAgICBxPSh1bnNpZ25lZCBjaGFyICopdW8tPnVkaV9w
cm9kdWN0OyAqcDsgcCsrKSB7DQorCQlpZiAoKGludCkqcDwweDgwKQ0KKwkJ
CSpxKys9KnA7DQorCQllbHNlIHsNCisJCQkqcSsrPSc/JzsNCisJCQlpZiAo
KCgoaW50KSpwKSYweGUwKT09MHhlMCkNCisJCQkJcCsrOw0KKwkJCXArKzsN
CisJCX0NCisJfQ0KKw0KKwlmb3IgKHA9dWUtPnVkaV92ZW5kb3IsDQorCSAg
ICAgcT11by0+dWRpX3ZlbmRvcjsgKnA7IHArKykgew0KKwkJaWYgKCpwPDB4
ODApDQorCQkJKnErKz0qcDsNCisJCWVsc2Ugew0KKwkJCSpxKys9Jz8nOw0K
KwkJCXArKzsNCisJCQlpZiAoKCpwJjB4ZTApPT0weGUwKQ0KKwkJCQlwKys7
DQorCQl9DQorCX0NCisNCisJYmNvcHkodWUtPnVkaV9yZWxlYXNlLA0KKwkg
ICAgICB1by0+dWRpX3JlbGVhc2UsIHNpemVvZih1by0+dWRpX3JlbGVhc2Up
KTsNCisNCisJdW8tPnVkaV9wcm9kdWN0Tm8gPSB1ZS0+dWRpX3Byb2R1Y3RO
bzsNCisJdW8tPnVkaV92ZW5kb3JObyA9IHVlLT51ZGlfdmVuZG9yTm87DQor
CXVvLT51ZGlfcmVsZWFzZU5vID0gdWUtPnVkaV9yZWxlYXNlTm87DQorCXVv
LT51ZGlfY2xhc3MgPSB1ZS0+dWRpX2NsYXNzOw0KKwl1by0+dWRpX3N1YmNs
YXNzID0gdWUtPnVkaV9zdWJjbGFzczsNCisJdW8tPnVkaV9wcm90b2NvbCA9
IHVlLT51ZGlfcHJvdG9jb2w7DQorCXVvLT51ZGlfY29uZmlnID0gdWUtPnVk
aV9jb25maWc7DQorCXVvLT51ZGlfc3BlZWQgPSB1ZS0+dWRpX3NwZWVkOw0K
Kwl1by0+dWRpX3Bvd2VyID0gdWUtPnVkaV9wb3dlcjsgICAgDQorCXVvLT51
ZGlfbnBvcnRzID0gdWUtPnVkaV9ucG9ydHM7DQorDQorCWZvciAobj0wOyBu
PFVTQl9NQVhfREVWTkFNRVM7IG4rKykNCisJCWJjb3B5KHVvLT51ZGlfZGV2
bmFtZXNbbl0sDQorCQkgICAgICB1ZS0+dWRpX2Rldm5hbWVzW25dLCBVU0Jf
TUFYX0RFVk5BTUVMRU4pOw0KKwliY29weSh1by0+dWRpX3BvcnRzLCB1ZS0+
dWRpX3BvcnRzLCBzaXplb2YodW8tPnVkaV9wb3J0cykpOw0KK30NCkluZGV4
OiBzeXMvZGV2L3VzYi91c2IuaA0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K
UkNTIGZpbGU6IC9jdnNyb290L3NyYy9zeXMvZGV2L3VzYi91c2IuaCx2DQpy
ZXRyaWV2aW5nIHJldmlzaW9uIDEuNzMNCmRpZmYgLXUgLXIxLjczIHVzYi5o
DQotLS0gc3lzL2Rldi91c2IvdXNiLmgJMTEgRGVjIDIwMDUgMTI6MjQ6MDEg
LTAwMDAJMS43Mw0KKysrIHN5cy9kZXYvdXNiL3VzYi5oCTIxIE1hciAyMDA2
IDIwOjAxOjUwIC0wMDAwDQpAQCAtNjIxLDYgKzYyMSwyOCBAQA0KICNkZWZp
bmUgVVNCX1BPUlRfRElTQUJMRUQgMHhmYw0KIH07DQogDQorLyogPD0zLjAg
aGFkIHRoaXMgbGF5b3V0IG9mIHRoZSBzdHJ1Y3R1cmUgKi8NCitzdHJ1Y3Qg
dXNiX2RldmljZV9pbmZvX29sZCB7DQorICAgICAgICB1X2ludDhfdCAgICAg
ICAgdWRpX2J1czsNCisgICAgICAgIHVfaW50OF90ICAgICAgICB1ZGlfYWRk
cjsgICAgICAgLyogZGV2aWNlIGFkZHJlc3MgKi8NCisgICAgICAgIHVzYl9l
dmVudF9jb29raWVfdCB1ZGlfY29va2llOw0KKyAgICAgICAgY2hhciAgICAg
ICAgICAgIHVkaV9wcm9kdWN0W1VTQl9NQVhfU1RSSU5HX0xFTl07DQorICAg
ICAgICBjaGFyICAgICAgICAgICAgdWRpX3ZlbmRvcltVU0JfTUFYX1NUUklO
R19MRU5dOw0KKyAgICAgICAgY2hhciAgICAgICAgICAgIHVkaV9yZWxlYXNl
WzhdOw0KKyAgICAgICAgdV9pbnQxNl90ICAgICAgIHVkaV9wcm9kdWN0Tm87
DQorICAgICAgICB1X2ludDE2X3QgICAgICAgdWRpX3ZlbmRvck5vOw0KKyAg
ICAgICAgdV9pbnQxNl90ICAgICAgIHVkaV9yZWxlYXNlTm87DQorICAgICAg
ICB1X2ludDhfdCAgICAgICAgdWRpX2NsYXNzOw0KKyAgICAgICAgdV9pbnQ4
X3QgICAgICAgIHVkaV9zdWJjbGFzczsNCisgICAgICAgIHVfaW50OF90ICAg
ICAgICB1ZGlfcHJvdG9jb2w7DQorICAgICAgICB1X2ludDhfdCAgICAgICAg
dWRpX2NvbmZpZzsNCisgICAgICAgIHVfaW50OF90ICAgICAgICB1ZGlfc3Bl
ZWQ7DQorICAgICAgICBpbnQgICAgICAgICAgICAgdWRpX3Bvd2VyOyAgICAg
IC8qIHBvd2VyIGNvbnN1bXB0aW9uIGluIG1BLCAwIGlmIHNlbGZwb3dlcmVk
ICovDQorICAgICAgICBpbnQgICAgICAgICAgICAgdWRpX25wb3J0czsNCisg
ICAgICAgIGNoYXIgICAgICAgICAgICB1ZGlfZGV2bmFtZXNbVVNCX01BWF9E
RVZOQU1FU11bVVNCX01BWF9ERVZOQU1FTEVOXTsNCisgICAgICAgIHVfaW50
OF90ICAgICAgICB1ZGlfcG9ydHNbMTZdOy8qIGh1YiBvbmx5OiBhZGRyZXNz
ZXMgb2YgZGV2aWNlcyBvbiBwb3J0cyAqLw0KK307DQorDQogc3RydWN0IHVz
Yl9jdGxfcmVwb3J0IHsNCiAJaW50CXVjcl9yZXBvcnQ7DQogCXVfY2hhcgl1
Y3JfZGF0YVsxMDI0XTsJLyogZmlsbGVkIGRhdGEgc2l6ZSB3aWxsIHZhcnkg
Ki8NCkBAIC02NTQsMTEgKzY3NiwyOSBAQA0KIAl9IHU7DQogfTsNCiANCisv
KiBvbGQgPD0zLjAgY29tcGF0IGV2ZW50ICovDQorc3RydWN0IHVzYl9ldmVu
dF9vbGQgew0KKwlpbnQgICAgICAgICAgICAgICAgICAgICB1ZV90eXBlOw0K
KwlzdHJ1Y3QgdGltZXNwZWMgICAgICAgICB1ZV90aW1lOw0KKwl1bmlvbiB7
DQorCQlzdHJ1Y3Qgew0KKwkJCWludCAgICAgICAgICAgICAgICAgICAgIHVl
X2J1czsNCisJCX0gdWVfY3RybHI7DQorCQlzdHJ1Y3QgdXNiX2RldmljZV9p
bmZvX29sZCAgICAgICAgICB1ZV9kZXZpY2U7DQorCQlzdHJ1Y3Qgew0KKwkJ
CXVzYl9ldmVudF9jb29raWVfdCAgICAgIHVlX2Nvb2tpZTsNCisJCQljaGFy
ICAgICAgICAgICAgICAgICAgICB1ZV9kZXZuYW1lWzE2XTsNCisJCX0gdWVf
ZHJpdmVyOw0KKwl9IHU7DQorfTsNCisNCisNCiAvKiBVU0IgY29udHJvbGxl
ciAqLw0KICNkZWZpbmUgVVNCX1JFUVVFU1QJCV9JT1dSKCdVJywgMSwgc3Ry
dWN0IHVzYl9jdGxfcmVxdWVzdCkNCiAjZGVmaW5lIFVTQl9TRVRERUJVRwkJ
X0lPVyAoJ1UnLCAyLCBpbnQpDQogI2RlZmluZSBVU0JfRElTQ09WRVIJCV9J
TyAgKCdVJywgMykNCiAjZGVmaW5lIFVTQl9ERVZJQ0VJTkZPCQlfSU9XUign
VScsIDQsIHN0cnVjdCB1c2JfZGV2aWNlX2luZm8pDQorI2RlZmluZSBVU0Jf
REVWSUNFSU5GT19PTEQJX0lPV1IoJ1UnLCA0LCBzdHJ1Y3QgdXNiX2Rldmlj
ZV9pbmZvX29sZCkNCiAjZGVmaW5lIFVTQl9ERVZJQ0VTVEFUUwkJX0lPUiAo
J1UnLCA1LCBzdHJ1Y3QgdXNiX2RldmljZV9zdGF0cykNCiANCiAvKiBHZW5l
cmljIEhJRCBkZXZpY2UgKi8NCkBAIC02ODIsNiArNzIyLDcgQEANCiAjZGVm
aW5lIFVTQl9HRVRfU1RSSU5HX0RFU0MJX0lPV1IoJ1UnLCAxMTAsIHN0cnVj
dCB1c2Jfc3RyaW5nX2Rlc2MpDQogI2RlZmluZSBVU0JfRE9fUkVRVUVTVAkJ
X0lPV1IoJ1UnLCAxMTEsIHN0cnVjdCB1c2JfY3RsX3JlcXVlc3QpDQogI2Rl
ZmluZSBVU0JfR0VUX0RFVklDRUlORk8JX0lPUiAoJ1UnLCAxMTIsIHN0cnVj
dCB1c2JfZGV2aWNlX2luZm8pDQorI2RlZmluZSBVU0JfR0VUX0RFVklDRUlO
Rk9fT0xECV9JT1IgKCdVJywgMTEyLCBzdHJ1Y3QgdXNiX2RldmljZV9pbmZv
X29sZCkNCiAjZGVmaW5lIFVTQl9TRVRfU0hPUlRfWEZFUglfSU9XICgnVScs
IDExMywgaW50KQ0KICNkZWZpbmUgVVNCX1NFVF9USU1FT1VUCQlfSU9XICgn
VScsIDExNCwgaW50KQ0KIA0KSW5kZXg6IHN5cy9kZXYvdXNiL3VzYl9zdWJy
LmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9zcmMvc3lzL2Rldi91c2IvdXNiX3N1YnIuYyx2DQpyZXRyaWV2aW5nIHJl
dmlzaW9uIDEuMTMxDQpkaWZmIC11IC1yMS4xMzEgdXNiX3N1YnIuYw0KLS0t
IHN5cy9kZXYvdXNiL3VzYl9zdWJyLmMJMjMgTm92IDIwMDUgMDg6NTQ6NDgg
LTAwMDAJMS4xMzENCisrKyBzeXMvZGV2L3VzYi91c2Jfc3Vici5jCTIxIE1h
ciAyMDA2IDE5OjM5OjQ1IC0wMDAwDQpAQCAtODMsOCArODMsOSBAQA0KIFN0
YXRpYyB1c2JkX3N0YXR1cyB1c2JkX3NldF9jb25maWcodXNiZF9kZXZpY2Vf
aGFuZGxlLCBpbnQpOw0KIFN0YXRpYyB2b2lkIHVzYmRfZGV2aW5mbyh1c2Jk
X2RldmljZV9oYW5kbGUsIGludCwgY2hhciAqLCBzaXplX3QpOw0KIFN0YXRp
YyB2b2lkIHVzYmRfZGV2aW5mb192cCh1c2JkX2RldmljZV9oYW5kbGUgZGV2
LA0KLQkJCSAgICBjaGFyIHZbVVNCX01BWF9FTkNPREVEX1NUUklOR19MRU5d
LA0KLQkJCSAgICBjaGFyIHBbVVNCX01BWF9FTkNPREVEX1NUUklOR19MRU5d
LCBpbnQgdXNlZGV2KTsNCisJCQkgICAgY2hhciAqdiwNCisJCQkgICAgY2hh
ciAqcCwgaW50IHVzZWRldiwNCisJCQkgICAgaW50IHVzZWVuY29kZWQgKTsN
CiBTdGF0aWMgaW50IHVzYmRfZ2V0bmV3YWRkcih1c2JkX2J1c19oYW5kbGUg
YnVzKTsNCiAjaWYgZGVmaW5lZChfX05ldEJTRF9fKQ0KIFN0YXRpYyBpbnQg
dXNiZF9wcmludCh2b2lkICosIGNvbnN0IGNoYXIgKik7DQpAQCAtMjA4LDgg
KzIwOSw4IEBADQogfQ0KIA0KIFN0YXRpYyB2b2lkDQotdXNiZF9kZXZpbmZv
X3ZwKHVzYmRfZGV2aWNlX2hhbmRsZSBkZXYsIGNoYXIgdltVU0JfTUFYX0VO
Q09ERURfU1RSSU5HX0xFTl0sDQotCQljaGFyIHBbVVNCX01BWF9FTkNPREVE
X1NUUklOR19MRU5dLCBpbnQgdXNlZGV2KQ0KK3VzYmRfZGV2aW5mb192cCh1
c2JkX2RldmljZV9oYW5kbGUgZGV2LCBjaGFyICp2LA0KKwkJY2hhciAqcCwg
aW50IHVzZWRldiwgaW50IHVzZWVuY29kZWQpDQogew0KIAl1c2JfZGV2aWNl
X2Rlc2NyaXB0b3JfdCAqdWRkID0gJmRldi0+ZGRlc2M7DQogI2lmZGVmIFVT
QlZFUkJPU0UNCkBAIC0yMjEsMTAgKzIyMiwxMCBAQA0KIAkJcmV0dXJuOw0K
IA0KIAlpZiAodXNlZGV2KSB7DQotCQlpZiAodXNiZF9nZXRfc3RyaW5nKGRl
diwgdWRkLT5pTWFudWZhY3R1cmVyLCB2KSA9PQ0KKwkJaWYgKHVzYmRfZ2V0
X3N0cmluZyhkZXYsIHVkZC0+aU1hbnVmYWN0dXJlciwgdiwgdXNlZW5jb2Rl
ZCkgPT0NCiAJCSAgICBVU0JEX05PUk1BTF9DT01QTEVUSU9OKQ0KIAkJCXVz
YmRfdHJpbV9zcGFjZXModik7DQotCQlpZiAodXNiZF9nZXRfc3RyaW5nKGRl
diwgdWRkLT5pUHJvZHVjdCwgcCkgPT0NCisJCWlmICh1c2JkX2dldF9zdHJp
bmcoZGV2LCB1ZGQtPmlQcm9kdWN0LCBwLCB1c2VlbmNvZGVkKSA9PQ0KIAkJ
ICAgIFVTQkRfTk9STUFMX0NPTVBMRVRJT04pDQogCQkJdXNiZF90cmltX3Nw
YWNlcyhwKTsNCiAJfQ0KQEAgLTI2Nyw3ICsyNjgsNyBAQA0KIA0KIAllcCA9
IGNwICsgbDsNCiANCi0JdXNiZF9kZXZpbmZvX3ZwKGRldiwgdmVuZG9yLCBw
cm9kdWN0LCAxKTsNCisJdXNiZF9kZXZpbmZvX3ZwKGRldiwgdmVuZG9yLCBw
cm9kdWN0LCAxLCAxKTsNCiAJY3AgKz0gc25wcmludGYoY3AsIGVwIC0gY3As
ICIlcyAlcyIsIHZlbmRvciwgcHJvZHVjdCk7DQogCWlmIChzaG93Y2xhc3Mp
DQogCQljcCArPSBzbnByaW50ZihjcCwgZXAgLSBjcCwgIiwgY2xhc3MgJWQv
JWQiLA0KQEAgLTEyMzYsMTMgKzEyMzcsMTMgQEANCiAJZGktPnVkaV9idXMg
PSBVU0JERVZVTklUKGRldi0+YnVzLT5iZGV2KTsNCiAJZGktPnVkaV9hZGRy
ID0gZGV2LT5hZGRyZXNzOw0KIAlkaS0+dWRpX2Nvb2tpZSA9IGRldi0+Y29v
a2llOw0KLQl1c2JkX2RldmluZm9fdnAoZGV2LCBkaS0+dWRpX3ZlbmRvciwg
ZGktPnVkaV9wcm9kdWN0LCB1c2VkZXYpOw0KKwl1c2JkX2RldmluZm9fdnAo
ZGV2LCBkaS0+dWRpX3ZlbmRvciwgZGktPnVkaV9wcm9kdWN0LCB1c2VkZXYs
IDEpOw0KIAl1c2JkX3ByaW50QkNEKGRpLT51ZGlfcmVsZWFzZSwgc2l6ZW9m
KGRpLT51ZGlfcmVsZWFzZSksDQogCSAgICBVR0VUVyhkZXYtPmRkZXNjLmJj
ZERldmljZSkpOw0KIAlkaS0+dWRpX3NlcmlhbFswXSA9IDA7DQogCWlmICh1
c2VkZXYpDQogCQkodm9pZCl1c2JkX2dldF9zdHJpbmcoZGV2LCBkZXYtPmRk
ZXNjLmlTZXJpYWxOdW1iZXIsDQotCQkJCSAgICAgIGRpLT51ZGlfc2VyaWFs
KTsNCisJCQkJICAgICAgZGktPnVkaV9zZXJpYWwsIDEpOw0KIAlkaS0+dWRp
X3ZlbmRvck5vID0gVUdFVFcoZGV2LT5kZGVzYy5pZFZlbmRvcik7DQogCWRp
LT51ZGlfcHJvZHVjdE5vID0gVUdFVFcoZGV2LT5kZGVzYy5pZFByb2R1Y3Qp
Ow0KIAlkaS0+dWRpX3JlbGVhc2VObyA9IFVHRVRXKGRldi0+ZGRlc2MuYmNk
RGV2aWNlKTsNCkBAIC0xMjkzLDYgKzEyOTQsNzAgQEANCiB9DQogDQogdm9p
ZA0KK3VzYmRfZmlsbF9kZXZpY2VpbmZvX29sZCh1c2JkX2RldmljZV9oYW5k
bGUgZGV2LCBzdHJ1Y3QgdXNiX2RldmljZV9pbmZvX29sZCAqZGksDQorICAg
ICAgICAgICAgICAgICAgICAgICAgIGludCB1c2VkZXYpDQorew0KKwlzdHJ1
Y3QgdXNiZF9wb3J0ICpwOw0KKwlpbnQgaSwgZXJyLCBzOw0KKw0KKwlkaS0+
dWRpX2J1cyA9IFVTQkRFVlVOSVQoZGV2LT5idXMtPmJkZXYpOw0KKwlkaS0+
dWRpX2FkZHIgPSBkZXYtPmFkZHJlc3M7DQorCWRpLT51ZGlfY29va2llID0g
ZGV2LT5jb29raWU7DQorCXVzYmRfZGV2aW5mb192cChkZXYsIGRpLT51ZGlf
dmVuZG9yLCBkaS0+dWRpX3Byb2R1Y3QsIHVzZWRldiwgMCk7DQorCXVzYmRf
cHJpbnRCQ0QoZGktPnVkaV9yZWxlYXNlLCBzaXplb2YoZGktPnVkaV9yZWxl
YXNlKSwNCisJICAgIFVHRVRXKGRldi0+ZGRlc2MuYmNkRGV2aWNlKSk7DQor
CWRpLT51ZGlfdmVuZG9yTm8gPSBVR0VUVyhkZXYtPmRkZXNjLmlkVmVuZG9y
KTsNCisJZGktPnVkaV9wcm9kdWN0Tm8gPSBVR0VUVyhkZXYtPmRkZXNjLmlk
UHJvZHVjdCk7DQorCWRpLT51ZGlfcmVsZWFzZU5vID0gVUdFVFcoZGV2LT5k
ZGVzYy5iY2REZXZpY2UpOw0KKwlkaS0+dWRpX2NsYXNzID0gZGV2LT5kZGVz
Yy5iRGV2aWNlQ2xhc3M7DQorCWRpLT51ZGlfc3ViY2xhc3MgPSBkZXYtPmRk
ZXNjLmJEZXZpY2VTdWJDbGFzczsNCisJZGktPnVkaV9wcm90b2NvbCA9IGRl
di0+ZGRlc2MuYkRldmljZVByb3RvY29sOw0KKwlkaS0+dWRpX2NvbmZpZyA9
IGRldi0+Y29uZmlnOw0KKwlkaS0+dWRpX3Bvd2VyID0gZGV2LT5zZWxmX3Bv
d2VyZWQgPyAwIDogZGV2LT5wb3dlcjsNCisJZGktPnVkaV9zcGVlZCA9IGRl
di0+c3BlZWQ7DQorDQorCWlmIChkZXYtPnN1YmRldnMgIT0gTlVMTCkgew0K
KwkJZm9yIChpID0gMDsgZGV2LT5zdWJkZXZzW2ldICYmDQorCQkJICAgICBp
IDwgVVNCX01BWF9ERVZOQU1FUzsgaSsrKSB7DQorCQkJc3RybmNweShkaS0+
dWRpX2Rldm5hbWVzW2ldLCBVU0JERVZQVFJOQU1FKGRldi0+c3ViZGV2c1tp
XSksDQorCQkJCVVTQl9NQVhfREVWTkFNRUxFTik7DQorCQkJZGktPnVkaV9k
ZXZuYW1lc1tpXVtVU0JfTUFYX0RFVk5BTUVMRU4tMV0gPSAnXDAnOw0KKwkJ
fQ0KKwl9IGVsc2Ugew0KKwkJaSA9IDA7DQorCX0NCisJZm9yICgvKmkgaXMg
c2V0ICovOyBpIDwgVVNCX01BWF9ERVZOQU1FUzsgaSsrKQ0KKwkJZGktPnVk
aV9kZXZuYW1lc1tpXVswXSA9IDA7CQkgLyogZW1wdHkgKi8NCisNCisJaWYg
KGRldi0+aHViKSB7DQorCQlmb3IgKGkgPSAwOw0KKwkJICAgICBpIDwgc2l6
ZW9mKGRpLT51ZGlfcG9ydHMpIC8gc2l6ZW9mKGRpLT51ZGlfcG9ydHNbMF0p
ICYmDQorCQkJICAgICBpIDwgZGV2LT5odWItPmh1YmRlc2MuYk5iclBvcnRz
Ow0KKwkJICAgICBpKyspIHsNCisJCQlwID0gJmRldi0+aHViLT5wb3J0c1tp
XTsNCisJCQlpZiAocC0+ZGV2aWNlKQ0KKwkJCQllcnIgPSBwLT5kZXZpY2Ut
PmFkZHJlc3M7DQorCQkJZWxzZSB7DQorCQkJCXMgPSBVR0VUVyhwLT5zdGF0
dXMud1BvcnRTdGF0dXMpOw0KKwkJCQlpZiAocyAmIFVQU19QT1JUX0VOQUJM
RUQpDQorCQkJCQllcnIgPSBVU0JfUE9SVF9FTkFCTEVEOw0KKwkJCQllbHNl
IGlmIChzICYgVVBTX1NVU1BFTkQpDQorCQkJCQllcnIgPSBVU0JfUE9SVF9T
VVNQRU5ERUQ7DQorCQkJCWVsc2UgaWYgKHMgJiBVUFNfUE9SVF9QT1dFUikN
CisJCQkJCWVyciA9IFVTQl9QT1JUX1BPV0VSRUQ7DQorCQkJCWVsc2UNCisJ
CQkJCWVyciA9IFVTQl9QT1JUX0RJU0FCTEVEOw0KKwkJCX0NCisJCQlkaS0+
dWRpX3BvcnRzW2ldID0gZXJyOw0KKwkJfQ0KKwkJZGktPnVkaV9ucG9ydHMg
PSBkZXYtPmh1Yi0+aHViZGVzYy5iTmJyUG9ydHM7DQorCX0gZWxzZQ0KKwkJ
ZGktPnVkaV9ucG9ydHMgPSAwOw0KK30NCisNCisNCisNCit2b2lkDQogdXNi
X2ZyZWVfZGV2aWNlKHVzYmRfZGV2aWNlX2hhbmRsZSBkZXYpDQogew0KIAlp
bnQgaWZjaWR4LCBuaWZjOw0KSW5kZXg6IHN5cy9kZXYvdXNiL3VzYmRpLmMN
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9z
cmMvc3lzL2Rldi91c2IvdXNiZGkuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9u
IDEuMTEwDQpkaWZmIC11IC1yMS4xMTAgdXNiZGkuYw0KLS0tIHN5cy9kZXYv
dXNiL3VzYmRpLmMJMjQgRGVjIDIwMDUgMjA6Mjc6NTIgLTAwMDAJMS4xMTAN
CisrKyBzeXMvZGV2L3VzYi91c2JkaS5jCTIxIE1hciAyMDA2IDE5OjM3OjA1
IC0wMDAwDQpAQCAtMTE3Niw3ICsxMTc2LDcgQEANCiB9DQogDQogdXNiZF9z
dGF0dXMNCi11c2JkX2dldF9zdHJpbmcodXNiZF9kZXZpY2VfaGFuZGxlIGRl
diwgaW50IHNpLCBjaGFyICpidWYpDQordXNiZF9nZXRfc3RyaW5nKHVzYmRf
ZGV2aWNlX2hhbmRsZSBkZXYsIGludCBzaSwgY2hhciAqYnVmLCBpbnQgdW5p
Y29kZSkNCiB7DQogCWludCBzd2FwID0gZGV2LT5xdWlya3MtPnVxX2ZsYWdz
ICYgVVFfU1dBUF9VTklDT0RFOw0KIAl1c2Jfc3RyaW5nX2Rlc2NyaXB0b3Jf
dCB1czsNCkBAIC0xMjEzLDcgKzEyMTMsOSBAQA0KIAkJaWYgKHN3YXApDQog
CQkJYyA9IChjID4+IDgpIHwgKGMgPDwgOCk7DQogCQkvKiBFbmNvZGUgKDE2
LWJpdCkgVW5pY29kZSBhcyBVVEY4LiAqLw0KLQkJaWYgKGMgPCAweDAwODAp
IHsNCisJCWlmICghdW5pY29kZSkNCisJCQkqcysrPShjPDB4ODApP2M6Jz8n
Ow0KKwkJZWxzZSBpZiAoYyA8IDB4MDA4MCkgew0KIAkJCSpzKysgPSBjOw0K
IAkJfSBlbHNlIGlmIChjIDwgMHgwODAwKSB7DQogCQkJKnMrKyA9IDB4YzAg
fCAoYyA+PiA2KTsNCkluZGV4OiBzeXMvZGV2L3VzYi91c2JkaS5oDQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3Qvc3JjL3N5
cy9kZXYvdXNiL3VzYmRpLmgsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjY5
DQpkaWZmIC11IC1yMS42OSB1c2JkaS5oDQotLS0gc3lzL2Rldi91c2IvdXNi
ZGkuaAkyOCBOb3YgMjAwNSAxMzoxNDo0OCAtMDAwMAkxLjY5DQorKysgc3lz
L2Rldi91c2IvdXNiZGkuaAkyMSBNYXIgMjAwNiAxOTozNToxNCAtMDAwMA0K
QEAgLTE1MCw2ICsxNTAsNyBAQA0KIGludCB1c2JkX2dldF9ub19hbHRzKHVz
Yl9jb25maWdfZGVzY3JpcHRvcl90ICosIGludCk7DQogdXNiZF9zdGF0dXMg
IHVzYmRfZ2V0X2ludGVyZmFjZSh1c2JkX2ludGVyZmFjZV9oYW5kbGUsIHVf
aW50OF90ICopOw0KIHZvaWQgdXNiZF9maWxsX2RldmljZWluZm8odXNiZF9k
ZXZpY2VfaGFuZGxlLCBzdHJ1Y3QgdXNiX2RldmljZV9pbmZvICosIGludCk7
DQordm9pZCB1c2JkX2ZpbGxfZGV2aWNlaW5mb19vbGQodXNiZF9kZXZpY2Vf
aGFuZGxlLCBzdHJ1Y3QgdXNiX2RldmljZV9pbmZvX29sZCAqLCBpbnQpOw0K
IGludCB1c2JkX2dldF9pbnRlcmZhY2VfYWx0aW5kZXgodXNiZF9pbnRlcmZh
Y2VfaGFuZGxlKTsNCiANCiB1c2JfaW50ZXJmYWNlX2Rlc2NyaXB0b3JfdCAq
dXNiZF9maW5kX2lkZXNjKHVzYl9jb25maWdfZGVzY3JpcHRvcl90ICosDQpA
QCAtMTc2LDcgKzE3Nyw3IEBADQogDQogaW50IHVzYmRfcmF0ZWNoZWNrKHN0
cnVjdCB0aW1ldmFsICopOw0KIA0KLXVzYmRfc3RhdHVzIHVzYmRfZ2V0X3N0
cmluZyh1c2JkX2RldmljZV9oYW5kbGUsIGludCwgY2hhciAqKTsNCit1c2Jk
X3N0YXR1cyB1c2JkX2dldF9zdHJpbmcodXNiZF9kZXZpY2VfaGFuZGxlLCBp
bnQsIGNoYXIgKiwgaW50KTsNCiANCiAvKiBBbiBpdGVyYXRvciBmb3IgZGVz
Y3JpcHRvcnMuICovDQogdHlwZWRlZiBzdHJ1Y3Qgew0K

--0-2111587957-1142975042=:14032--