Return-Path: Message-ID: <2d5a2c100710231034y1af05a5eib130b3808db0f508@mail.gmail.com> Date: Tue, 23 Oct 2007 14:34:51 -0300 From: "Luiz Augusto von Dentz" To: "BlueZ development" In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2035_20602022.1193160891611" References: Subject: Re: [Bluez-devel] [PATCH] Removing unused variables from gsta2dpsink Reply-To: BlueZ development List-Id: BlueZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: bluez-devel-bounces@lists.sourceforge.net Errors-To: bluez-devel-bounces@lists.sourceforge.net ------=_Part_2035_20602022.1193160891611 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi thiago, I updated your patch with some fixes, you probably need to rework server_callback you can't evaluate cond with switch, many flags can be set at once. On 10/23/07, thiagoss wrote: > I've worked further and solved more problems on gsta2dpsink, I have a new > patch that includes the modifications on the previous one. > > This one also: > - fixes a possible access to unitialized data > - removes the watch from the server g_io_channel when closing it > > []s > > Thiago Sousa Santos > > > On 10/22/07, thiagoss wrote: > > Patch removing unused variables from gsta2dpsink. Those were needed on > alsa plugin for sbc encoding, but they aren't in gsta2dpsink, because it = is > not responsible for the encoding. > > > > []s > > > > Thiago Sousa Santos > > > > > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Bluez-devel mailing list > Bluez-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/bluez-devel > > > --=20 Luiz Augusto von Dentz Engenheiro de Computa=E7=E3o ------=_Part_2035_20602022.1193160891611 Content-Type: text/x-patch; name=audio.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_f84p5nn9 Content-Disposition: attachment; filename=audio.patch SW5kZXg6IGdzdGEyZHBzaW5rLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvYmx1ZXov dXRpbHMvYXVkaW8vZ3N0YTJkcHNpbmsuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS42CmRpZmYg LXUgLTMgLXAgLXUgLXIxLjYgZ3N0YTJkcHNpbmsuYwotLS0gZ3N0YTJkcHNpbmsuYwkxOCBPY3Qg MjAwNyAyMzowMjoyNCAtMDAwMAkxLjYKKysrIGdzdGEyZHBzaW5rLmMJMjMgT2N0IDIwMDcgMTc6 MjQ6MzcgLTAwMDAKQEAgLTcwLDIzICs3MCwxOCBAQCBHU1RfREVCVUdfQ0FURUdPUllfU1RBVElD KGEyZHBfc2lua19kZWJ1CiAJCWdfY29uZF9zaWduYWwgKHMtPmNvbl9jb25mX2VuZCk7CQkJXAog CX0gR19TVE1UX0VORAogCi1zdHJ1Y3QgYmx1ZXRvb3RoX2EyZHAgeworc3RydWN0IGJsdWV0b290 aF9kYXRhIHsKKwlzdHJ1Y3QgaXBjX2RhdGFfY2ZnIGNmZzsJLyogQmx1ZXRvb3RoIGRldmljZSBj b25maWcgKi8KIAlzYmNfdCBzYmM7CQkJLyogQ29kZWMgZGF0YSAqLwogCWludCBjb2Rlc2l6ZTsJ CQkvKiBTQkMgY29kZXNpemUgKi8KIAlpbnQgc2FtcGxlczsJCQkvKiBOdW1iZXIgb2YgZW5jb2Rl ZCBzYW1wbGVzICovCi0JdWludDhfdCBidWZmZXJbQlVGRkVSX1NJWkVdOwkvKiBDb2RlYyB0cmFu c2ZlciBidWZmZXIgKi8KKwlnY2hhciBidWZmZXJbQlVGRkVSX1NJWkVdOwkvKiBDb2RlYyB0cmFu c2ZlciBidWZmZXIgKi8KIAlpbnQgY291bnQ7CQkJLyogQ29kZWMgdHJhbnNmZXIgYnVmZmVyIGNv dW50ZXIgKi8KIAogCWludCBuc2FtcGxlczsJCQkvKiBDdW11bGF0aXZlIG51bWJlciBvZiBjb2Rl YyBzYW1wbGVzICovCiAJdWludDE2X3Qgc2VxX251bTsJCS8qIEN1bXVsYXRpdmUgcGFja2V0IHNl cXVlbmNlICovCiAJaW50IGZyYW1lX2NvdW50OwkJLyogQ3VycmVudCBmcmFtZXMgaW4gYnVmZmVy Ki8KIH07Ci1zdHJ1Y3QgYmx1ZXRvb3RoX2RhdGEgewotCXN0cnVjdCBpcGNfZGF0YV9jZmcgY2Zn OwkvKiBCbHVldG9vdGggZGV2aWNlIGNvbmZpZyAqLwotCXVpbnQ4X3QgYnVmZmVyW0JVRkZFUl9T SVpFXTsJLyogRW5jb2RlZCB0cmFuc2ZlciBidWZmZXIgKi8KLQlpbnQgY291bnQ7CQkJLyogVHJh bnNmZXIgYnVmZmVyIGNvdW50ZXIgKi8KLQlzdHJ1Y3QgYmx1ZXRvb3RoX2EyZHAgYTJkcDsJLyog QTJEUCBkYXRhICovCi19OwogCiAjZGVmaW5lIElTX1NCQyhuKSAoc3RyY21wKChuKSwgImF1ZGlv L3gtc2JjIikgPT0gMCkKICNkZWZpbmUgSVNfTVBFRyhuKSAoc3RyY21wKChuKSwgImF1ZGlvL21w ZWciKSA9PSAwKQpAQCAtMTMyLDE1ICsxMjcsMTMgQEAgc3RhdGljIHZvaWQgZ3N0X2EyZHBfc2lu a19iYXNlX2luaXQoZ3BvaQogc3RhdGljIGdib29sZWFuIGdzdF9hMmRwX3Npbmtfc3RvcChHc3RC YXNlU2luayAqYmFzZXNpbmspCiB7CiAJR3N0QTJkcFNpbmsgKnNlbGYgPSBHU1RfQTJEUF9TSU5L KGJhc2VzaW5rKTsKLQlzdHJ1Y3QgYmx1ZXRvb3RoX2EyZHAgKmEyZHAgPSAmc2VsZi0+ZGF0YS0+ YTJkcDsKIAogCXNlbGYtPmNvbl9zdGF0ZSA9IE5PVF9DT05GSUdVUkVEOwogCXNlbGYtPnRvdGFs ID0gMDsKIAotCWlmIChzZWxmLT5zdHJlYW0pIHsKLQkJZ19pb19jaGFubmVsX2Nsb3NlKHNlbGYt PnN0cmVhbSk7Ci0JCWdfaW9fY2hhbm5lbF91bnJlZihzZWxmLT5zdHJlYW0pOwotCQlzZWxmLT5z dHJlYW0gPSBOVUxMOworCWlmIChzZWxmLT53YXRjaF9pZCAhPSAtMSkgeworCQlnX3NvdXJjZV9y ZW1vdmUoc2VsZi0+d2F0Y2hfaWQpOworCQlzZWxmLT53YXRjaF9pZCA9IC0xOwogCX0KIAogCWlm IChzZWxmLT5zZXJ2ZXIpIHsKQEAgLTE0OSwxMCArMTQyLDkgQEAgc3RhdGljIGdib29sZWFuIGdz dF9hMmRwX3Npbmtfc3RvcChHc3RCYQogCQlzZWxmLT5zdHJlYW0gPSBOVUxMOwogCX0KIAotCWlm IChzZWxmLT5kYXRhLT5jZmcuY29kZWMgPT0gQ0ZHX0NPREVDX1NCQykKLQkJc2JjX2ZpbmlzaCgm YTJkcC0+c2JjKTsKLQogCWlmIChzZWxmLT5kYXRhKSB7CisJCWlmIChzZWxmLT5kYXRhLT5jZmcu Y29kZWMgPT0gQ0ZHX0NPREVDX1NCQykKKwkJCXNiY19maW5pc2goJnNlbGYtPmRhdGEtPnNiYyk7 CiAJCWdfZnJlZShzZWxmLT5kYXRhKTsKIAkJc2VsZi0+ZGF0YSA9IE5VTEw7CiAJfQpAQCAtMjUy LDE0ICsyNDQsMTQgQEAgc3RhdGljIGdpbnQgZ3N0X2EyZHBfc2lua19ibHVldG9vdGhfcmVjdgog CXJldHVybiAtRUlOVkFMOwogfQogCi1zdGF0aWMgaW50IGdzdF9hMmRwX3NpbmtfYmx1ZXRvb3Ro X2EyZHBfaW5pdChHc3RBMmRwU2luayAqc2luaywKK3N0YXRpYyBpbnQgZ3N0X2EyZHBfc2lua19i bHVldG9vdGhfYTJkcF9pbml0KEdzdEEyZHBTaW5rICpzZWxmLAogCQkJc3RydWN0IGlwY19jb2Rl Y19zYmMgKnNiYykKIHsKLQlzdHJ1Y3QgYmx1ZXRvb3RoX2EyZHAgKmEyZHAgPSAmc2luay0+ZGF0 YS0+YTJkcDsKLQlzdHJ1Y3QgaXBjX2RhdGFfY2ZnICpjZmcgPSAmc2luay0+ZGF0YS0+Y2ZnOwor CXN0cnVjdCBibHVldG9vdGhfZGF0YSAqZGF0YSA9IHNlbGYtPmRhdGE7CisJc3RydWN0IGlwY19k YXRhX2NmZyAqY2ZnID0gJmRhdGEtPmNmZzsKIAogCWlmIChjZmcgPT0gTlVMTCkgewotCQlHU1Rf RVJST1JfT0JKRUNUKHNpbmssICJFcnJvciBnZXR0aW5nIGNvZGVjIHBhcmFtZXRlcnMiKTsKKwkJ R1NUX0VSUk9SX09CSkVDVChzZWxmLCAiRXJyb3IgZ2V0dGluZyBjb2RlYyBwYXJhbWV0ZXJzIik7 CiAJCXJldHVybiAtMTsKIAl9CiAKQEAgLTI2NywyNCArMjU5LDI0IEBAIHN0YXRpYyBpbnQgZ3N0 X2EyZHBfc2lua19ibHVldG9vdGhfYTJkcF8KIAkJcmV0dXJuIC0xOwogCiAJLyogRklYTUU6IGlu aXQgdXNpbmcgZmxhZ3M/ICovCi0Jc2JjX2luaXQoJmEyZHAtPnNiYywgMCk7Ci0JYTJkcC0+c2Jj LnJhdGUgPSBjZmctPnJhdGU7Ci0JYTJkcC0+c2JjLmNoYW5uZWxzID0gY2ZnLT5tb2RlID09IENG R19NT0RFX01PTk8gPyAxIDogMjsKKwlzYmNfaW5pdCgmZGF0YS0+c2JjLCAwKTsKKwlkYXRhLT5z YmMucmF0ZSA9IGNmZy0+cmF0ZTsKKwlkYXRhLT5zYmMuY2hhbm5lbHMgPSBjZmctPm1vZGUgPT0g Q0ZHX01PREVfTU9OTyA/IDEgOiAyOwogCWlmIChjZmctPm1vZGUgPT0gQ0ZHX01PREVfTU9OTyB8 fCBjZmctPm1vZGUgPT0gQ0ZHX01PREVfSk9JTlRfU1RFUkVPKQotCQlhMmRwLT5zYmMuam9pbnQg PSAxOwotCWEyZHAtPnNiYy5hbGxvY2F0aW9uID0gc2JjLT5hbGxvY2F0aW9uOwotCWEyZHAtPnNi Yy5zdWJiYW5kcyA9IHNiYy0+c3ViYmFuZHM7Ci0JYTJkcC0+c2JjLmJsb2NrcyA9IHNiYy0+Ymxv Y2tzOwotCWEyZHAtPnNiYy5iaXRwb29sID0gc2JjLT5iaXRwb29sOwotCWEyZHAtPmNvZGVzaXpl ID0gYTJkcC0+c2JjLnN1YmJhbmRzICogYTJkcC0+c2JjLmJsb2NrcyAqCi0JCQkJCQlhMmRwLT5z YmMuY2hhbm5lbHMgKiAyOwotCWEyZHAtPmNvdW50ID0gc2l6ZW9mKHN0cnVjdCBydHBfaGVhZGVy KSArIHNpemVvZihzdHJ1Y3QgcnRwX3BheWxvYWQpOworCQlkYXRhLT5zYmMuam9pbnQgPSAxOwor CWRhdGEtPnNiYy5hbGxvY2F0aW9uID0gc2JjLT5hbGxvY2F0aW9uOworCWRhdGEtPnNiYy5zdWJi YW5kcyA9IHNiYy0+c3ViYmFuZHM7CisJZGF0YS0+c2JjLmJsb2NrcyA9IHNiYy0+YmxvY2tzOwor CWRhdGEtPnNiYy5iaXRwb29sID0gc2JjLT5iaXRwb29sOworCWRhdGEtPmNvZGVzaXplID0gZGF0 YS0+c2JjLnN1YmJhbmRzICogZGF0YS0+c2JjLmJsb2NrcyAqCisJCQkJCQlkYXRhLT5zYmMuY2hh bm5lbHMgKiAyOworCWRhdGEtPmNvdW50ID0gc2l6ZW9mKHN0cnVjdCBydHBfaGVhZGVyKSArIHNp emVvZihzdHJ1Y3QgcnRwX3BheWxvYWQpOwogCi0JR1NUX0RFQlVHX09CSkVDVChzaW5rLCAiQ29k ZWMgcGFyYW1ldGVyczogXAorCUdTVF9ERUJVR19PQkpFQ1Qoc2VsZiwgIkNvZGVjIHBhcmFtZXRl cnM6IFwKIAkJCQlcdGFsbG9jYXRpb249JXVcblx0c3ViYmFuZHM9JXVcbiBcCiAJCQkJXHRibG9j a3M9JXVcblx0Yml0cG9vbD0ldVxuIiwKLQkJCQlhMmRwLT5zYmMuYWxsb2NhdGlvbiwgYTJkcC0+ c2JjLnN1YmJhbmRzLAotCQkJCWEyZHAtPnNiYy5ibG9ja3MsIGEyZHAtPnNiYy5iaXRwb29sKTsK KwkJCQlkYXRhLT5zYmMuYWxsb2NhdGlvbiwgZGF0YS0+c2JjLnN1YmJhbmRzLAorCQkJCWRhdGEt PnNiYy5ibG9ja3MsIGRhdGEtPnNiYy5iaXRwb29sKTsKIAogCXJldHVybiAwOwogfQpAQCAtNDQ1 LDE4ICs0MzcsMTkgQEAgc3RhdGljIGdib29sZWFuIGdzdF9hMmRwX3NpbmtfY29uZl9yZWN2Xwog CXJldHVybiBUUlVFOwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gZ3N0X2EyZHBfc2lua19jb25mX3Jl Y3Zfc3RyZWFtX2ZkKEdzdEEyZHBTaW5rICpzaW5rKQorc3RhdGljIGdib29sZWFuIGdzdF9hMmRw X3NpbmtfY29uZl9yZWN2X3N0cmVhbV9mZChHc3RBMmRwU2luayAqc2VsZikKIHsKKwlzdHJ1Y3Qg Ymx1ZXRvb3RoX2RhdGEgKmRhdGEgPSBzZWxmLT5kYXRhOwogCWdpbnQgcmV0OwogCUdJT0Vycm9y IGVycjsKLQlnc2l6ZSByZWFkOworCWdzaXplIHJlYWQ9MDsKIAotCXJldCA9IGdzdF9hMmRwX3Np bmtfYmx1ZXRvb3RoX3JlY3Ztc2dfZmQoc2luayk7CisJcmV0ID0gZ3N0X2EyZHBfc2lua19ibHVl dG9vdGhfcmVjdm1zZ19mZChzZWxmKTsKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuIEZBTFNFOwog Ci0JaWYgKCFzaW5rLT5zdHJlYW0pIHsKLQkJR1NUX0VSUk9SX09CSkVDVChzaW5rLCAiRXJyb3Ig d2hpbGUgY29uZmlndXJpbmcgZGV2aWNlOiAiCisJaWYgKCFzZWxmLT5zdHJlYW0pIHsKKwkJR1NU X0VSUk9SX09CSkVDVChzZWxmLCAiRXJyb3Igd2hpbGUgY29uZmlndXJpbmcgZGV2aWNlOiAiCiAJ CQkJImNvdWxkIG5vdCBhY3F1aXJlIGF1ZGlvIHNvY2tldCIpOwogCQlyZXR1cm4gRkFMU0U7CiAJ fQpAQCAtNDY0LDE1ICs0NTcsMTQgQEAgc3RhdGljIGdib29sZWFuIGdzdF9hMmRwX3NpbmtfY29u Zl9yZWN2XwogCS8qIEl0IGlzIHBvc3NpYmxlIHRoZXJlIGlzIHNvbWUgb3V0c3RhbmRpbmcKIAlk YXRhIGluIHRoZSBwaXBlIC0gd2UgaGF2ZSB0byBlbXB0eSBpdCAqLwogCXdoaWxlICgxKSB7Ci0J CWVyciA9IGdfaW9fY2hhbm5lbF9yZWFkKHNpbmstPnN0cmVhbSwKLQkJCQkJKGdjaGFyICopIHNp bmstPmRhdGEtPmJ1ZmZlciwKLQkJCQkJKGdzaXplKSBzaW5rLT5kYXRhLT5jZmcucGt0X2xlbiwK KwkJZXJyID0gZ19pb19jaGFubmVsX3JlYWQoc2VsZi0+c3RyZWFtLCBkYXRhLT5idWZmZXIsCisJ CQkJCShnc2l6ZSkgZGF0YS0+Y2ZnLnBrdF9sZW4sCiAJCQkJCSZyZWFkKTsKIAkJaWYgKGVyciAh PSBHX0lPX0VSUk9SX05PTkUgfHwgcmVhZCA8PSAwKQogCQkJYnJlYWs7CiAJfQogCi0JbWVtc2V0 KHNpbmstPmRhdGEtPmJ1ZmZlciwgMCwgc2l6ZW9mKHNpbmstPmRhdGEtPmJ1ZmZlcikpOworCW1l bXNldChkYXRhLT5idWZmZXIsIDAsIHNpemVvZihkYXRhLT5idWZmZXIpKTsKIAogCXJldHVybiBU UlVFOwogfQpAQCAtNTEyLDEwICs1MDQsMTEgQEAgc3RhdGljIHZvaWQgZ3N0X2EyZHBfc2lua19j b25mX3JlY3ZfZGF0YQogc3RhdGljIGdib29sZWFuIHNlcnZlcl9jYWxsYmFjayhHSU9DaGFubmVs ICpjaGFuLAogCQkJCQlHSU9Db25kaXRpb24gY29uZCwgZ3BvaW50ZXIgZGF0YSkKIHsKLQlHc3RB MmRwU2luayAqc2luayA9IEdTVF9BMkRQX1NJTksoZGF0YSk7CisJR3N0QTJkcFNpbmsgKnNpbms7 CiAKIAlzd2l0Y2ggKGNvbmQpIHsKIAljYXNlIEdfSU9fSU46CisJCXNpbmsgPSBHU1RfQTJEUF9T SU5LKGRhdGEpOwogCQlpZiAoc2luay0+Y29uX3N0YXRlICE9IE5PVF9DT05GSUdVUkVEICYmCiAJ CQlzaW5rLT5jb25fc3RhdGUgIT0gQ09ORklHVVJFRCkKIAkJCWdzdF9hMmRwX3NpbmtfY29uZl9y ZWN2X2RhdGEoc2luayk7CkBAIC01MjYsMTIgKzUxOSwxNCBAQCBzdGF0aWMgZ2Jvb2xlYW4gc2Vy dmVyX2NhbGxiYWNrKEdJT0NoYW5uCiAJCXJldHVybiBGQUxTRTsKIAkJYnJlYWs7CiAJY2FzZSBH X0lPX0VSUjoKKwkJc2luayA9IEdTVF9BMkRQX1NJTksoZGF0YSk7CiAJCUdTVF9XQVJOSU5HX09C SkVDVChzaW5rLCAiVW50cmVhdGVkIGNhbGxiYWNrIEdfSU9fRVJSIik7CiAJCWJyZWFrOwogCWNh c2UgR19JT19OVkFMOgogCQlyZXR1cm4gRkFMU0U7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CisJCXNp bmsgPSBHU1RfQTJEUF9TSU5LKGRhdGEpOwogCQlHU1RfV0FSTklOR19PQkpFQ1Qoc2luaywgIlVu ZXhwZWN0ZWQgY2FsbGJhY2sgY2FsbCIpOwogCQlicmVhazsKIAl9CkBAIC01NDYsNiArNTQxLDgg QEAgc3RhdGljIGdib29sZWFuIGdzdF9hMmRwX3Npbmtfc3RhcnQoR3N0QgogCWdpbnQgc2s7CiAJ Z2ludCBlcnI7CiAKKwlzZWxmLT53YXRjaF9pZCA9IC0xOworCiAJc2sgPSBzb2NrZXQoUEZfTE9D QUwsIFNPQ0tfU1RSRUFNLCAwKTsKIAlpZiAoc2sgPCAwKSB7CiAJCWVyciA9IGVycm5vOwpAQCAt NTU2LDcgKzU1Myw3IEBAIHN0YXRpYyBnYm9vbGVhbiBnc3RfYTJkcF9zaW5rX3N0YXJ0KEdzdEIK IAogCWlmIChjb25uZWN0KHNrLCAoc3RydWN0IHNvY2thZGRyICopICZhZGRyLCBzaXplb2YoYWRk cikpIDwgMCkgewogCQllcnIgPSBlcnJubzsKLQkJR1NUX0VSUk9SX09CSkVDVChzZWxmLCAiQ29u bmVjdGlvbiBmYWlsICVzICglZCkiLCAKKwkJR1NUX0VSUk9SX09CSkVDVChzZWxmLCAiQ29ubmVj dGlvbiBmYWlsICVzICglZCkiLAogCQkJc3RyZXJyb3IoZXJyKSwgZXJyKTsKIAkJY2xvc2Uoc2sp OwogCQlyZXR1cm4gRkFMU0U7CkBAIC01NjQsMTIgKzU2MSwxOCBAQCBzdGF0aWMgZ2Jvb2xlYW4g Z3N0X2EyZHBfc2lua19zdGFydChHc3RCCiAKIAlzZWxmLT5zZXJ2ZXIgPSBnX2lvX2NoYW5uZWxf dW5peF9uZXcoc2spOwogCi0JZ19pb19hZGRfd2F0Y2goc2VsZi0+c2VydmVyLCBHX0lPX0lOIHwg R19JT19IVVAgfCBHX0lPX0VSUiB8IEdfSU9fTlZBTCwKLQkJCXNlcnZlcl9jYWxsYmFjaywgc2Vs Zik7CisJc2VsZi0+d2F0Y2hfaWQgPSBnX2lvX2FkZF93YXRjaChzZWxmLT5zZXJ2ZXIsIEdfSU9f SU4gfCBHX0lPX0hVUCB8CisJCQlHX0lPX0VSUiB8IEdfSU9fTlZBTCwgc2VydmVyX2NhbGxiYWNr LCBzZWxmKTsKIAogCXNlbGYtPmRhdGEgPSBnX25ldzAoc3RydWN0IGJsdWV0b290aF9kYXRhLCAx KTsKIAltZW1zZXQoc2VsZi0+ZGF0YSwgMCwgc2l6ZW9mKHN0cnVjdCBibHVldG9vdGhfZGF0YSkp OwogCisJc2VsZi0+c3RyZWFtID0gTlVMTDsKKwlzZWxmLT5jb25fc3RhdGUgPSBOT1RfQ09ORklH VVJFRDsKKwlzZWxmLT50b3RhbCA9IDA7CisKKwlzZWxmLT53YWl0aW5nX2Nvbl9jb25mID0gRkFM U0U7CisKIAlyZXR1cm4gVFJVRTsKIH0KIApAQCAtNjQzLDMzICs2NDYsMzAgQEAgc3RhdGljIEdz dEZsb3dSZXR1cm4gZ3N0X2EyZHBfc2lua19wcmVybwogCXJldHVybiBHU1RfRkxPV19PSzsKIH0K IAotc3RhdGljIGludCBnc3RfYTJkcF9zaW5rX2F2ZHRwX3dyaXRlKEdzdEEyZHBTaW5rICpzaW5r KQorc3RhdGljIGludCBnc3RfYTJkcF9zaW5rX2F2ZHRwX3dyaXRlKEdzdEEyZHBTaW5rICpzZWxm KQogewogCWludCByZXQgPSAwOwotCXN0cnVjdCBibHVldG9vdGhfZGF0YSAqZGF0YTsKKwlzdHJ1 Y3QgYmx1ZXRvb3RoX2RhdGEgKmRhdGEgPSBzZWxmLT5kYXRhOwogCXN0cnVjdCBydHBfaGVhZGVy ICpoZWFkZXI7CiAJc3RydWN0IHJ0cF9wYXlsb2FkICpwYXlsb2FkOwotCXN0cnVjdCBibHVldG9v dGhfYTJkcCAqYTJkcDsKIAlHSU9FcnJvciBlcnI7CiAKLQlkYXRhID0gc2luay0+ZGF0YTsKLQlh MmRwID0gJmRhdGEtPmEyZHA7Ci0KLQloZWFkZXIgPSAodm9pZCAqKSBhMmRwLT5idWZmZXI7Ci0J cGF5bG9hZCA9ICh2b2lkICopIChhMmRwLT5idWZmZXIgKyBzaXplb2YoKmhlYWRlcikpOworCWhl YWRlciA9ICh2b2lkICopIGRhdGEtPmJ1ZmZlcjsKKwlwYXlsb2FkID0gKHZvaWQgKikgKGRhdGEt PmJ1ZmZlciArIHNpemVvZigqaGVhZGVyKSk7CiAKLQltZW1zZXQoYTJkcC0+YnVmZmVyLCAwLCBz aXplb2YoKmhlYWRlcikgKyBzaXplb2YoKnBheWxvYWQpKTsKKwltZW1zZXQoZGF0YS0+YnVmZmVy LCAwLCBzaXplb2YoKmhlYWRlcikgKyBzaXplb2YoKnBheWxvYWQpKTsKIAotCXBheWxvYWQtPmZy YW1lX2NvdW50ID0gYTJkcC0+ZnJhbWVfY291bnQ7CisJcGF5bG9hZC0+ZnJhbWVfY291bnQgPSBk YXRhLT5mcmFtZV9jb3VudDsKIAloZWFkZXItPnYgPSAyOwogCWhlYWRlci0+cHQgPSAxOwotCWhl YWRlci0+c2VxdWVuY2VfbnVtYmVyID0gaHRvbnMoYTJkcC0+c2VxX251bSk7Ci0JaGVhZGVyLT50 aW1lc3RhbXAgPSBodG9ubChhMmRwLT5uc2FtcGxlcyk7CisJaGVhZGVyLT5zZXF1ZW5jZV9udW1i ZXIgPSBodG9ucyhkYXRhLT5zZXFfbnVtKTsKKwloZWFkZXItPnRpbWVzdGFtcCA9IGh0b25sKGRh dGEtPm5zYW1wbGVzKTsKIAloZWFkZXItPnNzcmMgPSBodG9ubCgxKTsKIAogCXdoaWxlICgxKSB7 Ci0JCWVyciA9IGdfaW9fY2hhbm5lbF93cml0ZShzaW5rLT5zdHJlYW0sIChjb25zdCBjaGFyICop IGEyZHAtPmJ1ZmZlciwKLQkJCQkJKGdzaXplKSBhMmRwLT5jb3VudCwgKGdzaXplICopICZyZXQp OworCQllcnIgPSBnX2lvX2NoYW5uZWxfd3JpdGUoc2VsZi0+c3RyZWFtLCBkYXRhLT5idWZmZXIs CisJCQkJCShnc2l6ZSkgZGF0YS0+Y291bnQsCisJCQkJCShnc2l6ZSAqKSAmcmV0KTsKIAogCQlp ZiAoZXJyID09IEdfSU9fRVJST1JfQUdBSU4pIHsKIAkJCXVzbGVlcCAoMTAwKTsKQEAgLTY4MCwx MCArNjgwLDEwIEBAIHN0YXRpYyBpbnQgZ3N0X2EyZHBfc2lua19hdmR0cF93cml0ZShHc3QKIAl9 CiAKIAkvKiBSZXNldCBidWZmZXIgb2YgZGF0YSB0byBzZW5kICovCi0JYTJkcC0+Y291bnQgPSBz aXplb2Yoc3RydWN0IHJ0cF9oZWFkZXIpICsgc2l6ZW9mKHN0cnVjdCBydHBfcGF5bG9hZCk7Ci0J YTJkcC0+ZnJhbWVfY291bnQgPSAwOwotCWEyZHAtPnNhbXBsZXMgPSAwOwotCWEyZHAtPnNlcV9u dW0rKzsKKwlkYXRhLT5jb3VudCA9IHNpemVvZihzdHJ1Y3QgcnRwX2hlYWRlcikgKyBzaXplb2Yo c3RydWN0IHJ0cF9wYXlsb2FkKTsKKwlkYXRhLT5mcmFtZV9jb3VudCA9IDA7CisJZGF0YS0+c2Ft cGxlcyA9IDA7CisJZGF0YS0+c2VxX251bSsrOwogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTY5MSwy OSArNjkxLDIyIEBAIHN0YXRpYyBpbnQgZ3N0X2EyZHBfc2lua19hdmR0cF93cml0ZShHc3QKIHN0 YXRpYyBHc3RGbG93UmV0dXJuIGdzdF9hMmRwX3NpbmtfcmVuZGVyKEdzdEJhc2VTaW5rICpiYXNl c2luaywKIAkJCQkJR3N0QnVmZmVyICpidWZmZXIpCiB7Ci0JR3N0QTJkcFNpbmsgKnNpbms7Ci0J c3RydWN0IGJsdWV0b290aF9kYXRhICpkYXRhOwotCXN0cnVjdCBibHVldG9vdGhfYTJkcCAqYTJk cDsKLQlnaW50IGVuY29kZWQsIGZyYW1lX3NpemU9MTAyNDsKLQlnaW50IHJldD0wOwotCi0Jc2lu ayA9IEdTVF9BMkRQX1NJTksoYmFzZXNpbmspOwotCWRhdGEgPSAoc3RydWN0IGJsdWV0b290aF9k YXRhKikgc2luay0+ZGF0YTsKLQlhMmRwID0gJmRhdGEtPmEyZHA7CisJR3N0QTJkcFNpbmsgKnNl bGYgPSBHU1RfQTJEUF9TSU5LKGJhc2VzaW5rKTsKKwlzdHJ1Y3QgYmx1ZXRvb3RoX2RhdGEgKmRh dGEgPSBzZWxmLT5kYXRhOworCWdpbnQgZW5jb2RlZCA9IDA7CisJZ2ludCByZXQgPSAwOwogCiAJ ZW5jb2RlZCA9IEdTVF9CVUZGRVJfU0laRShidWZmZXIpOwogCi0JaWYgKGEyZHAtPmNvdW50ICsg ZW5jb2RlZCA+PSBkYXRhLT5jZmcucGt0X2xlbikgewotCQlyZXQgPSBnc3RfYTJkcF9zaW5rX2F2 ZHRwX3dyaXRlKHNpbmspOworCWlmIChkYXRhLT5jb3VudCArIGVuY29kZWQgPj0gZGF0YS0+Y2Zn LnBrdF9sZW4pIHsKKwkJcmV0ID0gZ3N0X2EyZHBfc2lua19hdmR0cF93cml0ZShzZWxmKTsKIAkJ aWYgKHJldCA8IDApCiAJCQlyZXR1cm4gR1NUX0ZMT1dfRVJST1I7CiAJfQogCi0JbWVtY3B5KGEy ZHAtPmJ1ZmZlciArIGEyZHAtPmNvdW50LCBHU1RfQlVGRkVSX0RBVEEoYnVmZmVyKSwgZW5jb2Rl ZCk7Ci0JYTJkcC0+Y291bnQgKz0gZW5jb2RlZDsKLQlhMmRwLT5mcmFtZV9jb3VudCsrOwotCWEy ZHAtPnNhbXBsZXMgKz0gZW5jb2RlZCAvIGZyYW1lX3NpemU7Ci0JYTJkcC0+bnNhbXBsZXMgKz0g ZW5jb2RlZCAvIGZyYW1lX3NpemU7CisJbWVtY3B5KGRhdGEtPmJ1ZmZlciArIGRhdGEtPmNvdW50 LCBHU1RfQlVGRkVSX0RBVEEoYnVmZmVyKSwgZW5jb2RlZCk7CisJZGF0YS0+Y291bnQgKz0gZW5j b2RlZDsKKwlkYXRhLT5mcmFtZV9jb3VudCsrOwogCiAJcmV0dXJuIEdTVF9GTE9XX09LOwogfQpJ bmRleDogZ3N0YTJkcHNpbmsuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9ibHVlei91 dGlscy9hdWRpby9nc3RhMmRwc2luay5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQKZGlmZiAt dSAtMyAtcCAtdSAtcjEuNCBnc3RhMmRwc2luay5oCi0tLSBnc3RhMmRwc2luay5oCTE4IE9jdCAy MDA3IDIxOjUwOjAwIC0wMDAwCTEuNAorKysgZ3N0YTJkcHNpbmsuaAkyMyBPY3QgMjAwNyAxNzoy NDozNyAtMDAwMApAQCAtNjcsNiArNjcsNyBAQCBzdHJ1Y3QgX0dzdEEyZHBTaW5rIHsKIAlHTXV0 ZXggKnNpbmtfbG9jazsKIAogCWdpbnQgdG90YWw7CisJZ2ludCB3YXRjaF9pZDsKIAogfTsKIApJ bmRleDogbWFuYWdlci5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2JsdWV6L3V0aWxz L2F1ZGlvL21hbmFnZXIuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS43NQpkaWZmIC11IC0zIC1w IC11IC1yMS43NSBtYW5hZ2VyLmMKLS0tIG1hbmFnZXIuYwk5IE9jdCAyMDA3IDEzOjMxOjU3IC0w MDAwCTEuNzUKKysrIG1hbmFnZXIuYwkyMyBPY3QgMjAwNyAxNzoyNDozNyAtMDAwMApAQCAtMTA3 OCwxMCArMTA3OCw5IEBAIHN0YXRpYyB2b2lkIHJlZ2lzdGVyX2RldmljZXNfc3RvcmVkKGNvbnMK IAogCWJhY3B5KCZkZWZhdWx0X3NyYywgQkRBRERSX0FOWSk7CiAJZGV2X2lkID0gaGNpX2dldF9y b3V0ZSgmZGVmYXVsdF9zcmMpOwotCWlmIChkZXZfaWQgPCAwKQorCWlmIChkZXZfaWQgPCAwIHx8 IGhjaV9kZXZiYShkZXZfaWQsICZkZWZhdWx0X3NyYykpCiAJCXJldHVybjsKIAotCWhjaV9kZXZi YShkZXZfaWQsICZkZWZhdWx0X3NyYyk7CiAJaWYgKGJhY21wKCZkZWZhdWx0X3NyYywgJnNyYykg IT0gMCkKIAkJcmV0dXJuOwogCg== ------=_Part_2035_20602022.1193160891611 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ------=_Part_2035_20602022.1193160891611 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Bluez-devel mailing list Bluez-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bluez-devel ------=_Part_2035_20602022.1193160891611--