Return-Path: MIME-Version: 1.0 In-Reply-To: <20090529132046.GA10997@jh-x301> References: <1243601080-27314-1-git-send-email-alok.barsode@azingo.com> <20090529132046.GA10997@jh-x301> Date: Fri, 29 May 2009 19:13:25 +0530 Message-ID: <8b5debfa0905290643o45b6488cp177eafac3b629dd1@mail.gmail.com> Subject: Re: [PATCH 1/1] Adding start_discovery functionality to hciops plugin. From: alok barsode To: linux-bluetooth@vger.kernel.org Content-Type: multipart/mixed; boundary=000e0cd47ddac14153046b0d421a Sender: linux-bluetooth-owner@vger.kernel.org List-ID: --000e0cd47ddac14153046b0d421a Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi Johan, On Fri, May 29, 2009 at 6:50 PM, Johan Hedberg wr= ote: > Hi Alok, > > One minor comment: > > On Fri, May 29, 2009, alokbarsode@gmail.com wrote: >> +static int hciops_start_discovery(int index, gboolean periodic) >> +{ >> + =A0 =A0 inquiry_cp inq_cp; >> + =A0 =A0 periodic_inquiry_cp cp; > > Put these two variables into the if-else statement since that's the only > place where they are used. Otherwise the patch looks pretty good. Done. attaching the modified patch. > > Johan > Alok --000e0cd47ddac14153046b0d421a Content-Type: text/x-diff; charset=US-ASCII; name="0001-Adding-start_discovery-functionality-to-hciops-plugi.patch" Content-Disposition: attachment; filename="0001-Adding-start_discovery-functionality-to-hciops-plugi.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fvaxwgoh0 RnJvbSA4NjNkYTA3OWJiODA3NjRiZThiMzhiMjIzZGViMjI0ZjNmMzNjMjRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbG9rIEJhcnNvZGUgPGFsb2suYmFyc29kZUBhemluZ28uY29t PgpEYXRlOiBGcmksIDI5IE1heSAyMDA5IDE5OjA2OjEzICswNTMwClN1YmplY3Q6IFtQQVRDSCAx LzFdIEFkZGluZyBzdGFydF9kaXNjb3ZlcnkgZnVuY3Rpb25hbGl0eSB0byBoY2lvcHMgcGx1Z2lu LgoKLS0tCiBwbHVnaW5zL2hjaW9wcy5jIHwgICA0MiArKysrKysrKysrKysrKysrKysrKwogc3Jj L2FkYXB0ZXIuYyAgICB8ICAxMTUgKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvYWRhcHRlci5oICAgIHwgICAgMiArCiAzIGZpbGVzIGNo YW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDEwMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9w bHVnaW5zL2hjaW9wcy5jIGIvcGx1Z2lucy9oY2lvcHMuYwppbmRleCA4ZjllZTA2Li5kMzM3Yjc1 IDEwMDY0NAotLS0gYS9wbHVnaW5zL2hjaW9wcy5jCisrKyBiL3BsdWdpbnMvaGNpb3BzLmMKQEAg LTU2MSw2ICs1NjEsNDcgQEAgZG9uZToKIAlyZXR1cm4gZXJyOwogfQogCitzdGF0aWMgaW50IGhj aW9wc19zdGFydF9kaXNjb3ZlcnkoaW50IGluZGV4LCBnYm9vbGVhbiBwZXJpb2RpYykKK3sKKwl1 aW50OF90IGxhcFszXSA9IHsgMHgzMywgMHg4YiwgMHg5ZSB9OworCWludCBkZCwgZXJyID0gMDsK KworCWRkID0gaGNpX29wZW5fZGV2KGluZGV4KTsKKwlpZiAoZGQgPCAwKQorCQlyZXR1cm4gLUVJ TzsKKworCWlmIChwZXJpb2RpYykgeworCQlwZXJpb2RpY19pbnF1aXJ5X2NwIGNwOworCisJCW1l bXNldCgmY3AsIDAsIHNpemVvZihjcCkpOworCQltZW1jcHkoJmNwLmxhcCwgbGFwLCAzKTsKKwkJ Y3AubWF4X3BlcmlvZCA9IGh0b2JzKDI0KTsKKwkJY3AubWluX3BlcmlvZCA9IGh0b2JzKDE2KTsK KwkJY3AubGVuZ3RoICA9IDB4MDg7CisJCWNwLm51bV9yc3AgPSAweDAwOworCisJCWVyciA9IGhj aV9zZW5kX2NtZChkZCwgT0dGX0xJTktfQ1RMLCBPQ0ZfUEVSSU9ESUNfSU5RVUlSWSwKKwkJCQkJ UEVSSU9ESUNfSU5RVUlSWV9DUF9TSVpFLCAmY3ApOworCX0gZWxzZSB7CisJCWlucXVpcnlfY3Ag aW5xX2NwOworCisJCW1lbXNldCgmaW5xX2NwLCAwLCBzaXplb2YoaW5xX2NwKSk7CisJCW1lbWNw eSgmaW5xX2NwLmxhcCwgbGFwLCAzKTsKKwkJaW5xX2NwLmxlbmd0aCA9IDB4MDg7CisJCWlucV9j cC5udW1fcnNwID0gMHgwMDsKKworCQllcnIgPSBoY2lfc2VuZF9jbWQoZGQsIE9HRl9MSU5LX0NU TCwgT0NGX0lOUVVJUlksCisJCQkJCUlOUVVJUllfQ1BfU0laRSwgJmlucV9jcCk7CisJfQorCisJ aWYgKGVyciA8IDApCisJCWVyciA9IC1lcnJubzsKKworCWhjaV9jbG9zZV9kZXYoZGQpOworCisJ cmV0dXJuIGVycjsKK30KKwogc3RhdGljIHN0cnVjdCBidGRfYWRhcHRlcl9vcHMgaGNpX29wcyA9 IHsKIAkuc2V0dXAgPSBoY2lvcHNfc2V0dXAsCiAJLmNsZWFudXAgPSBoY2lvcHNfY2xlYW51cCwK QEAgLTU3MCw2ICs2MTEsNyBAQCBzdGF0aWMgc3RydWN0IGJ0ZF9hZGFwdGVyX29wcyBoY2lfb3Bz ID0gewogCS5zZXRfY29ubmVjdGFibGUgPSBoY2lvcHNfY29ubmVjdGFibGUsCiAJLnNldF9kaXNj b3ZlcmFibGUgPSBoY2lvcHNfZGlzY292ZXJhYmxlLAogCS5zZXRfbGltaXRlZF9kaXNjb3ZlcmFi bGUgPSBoY2lvcHNfc2V0X2xpbWl0ZWRfZGlzY292ZXJhYmxlLAorCS5zdGFydF9kaXNjb3Zlcnkg PSBoY2lvcHNfc3RhcnRfZGlzY292ZXJ5LAogfTsKIAogc3RhdGljIGludCBoY2lvcHNfaW5pdCh2 b2lkKQpkaWZmIC0tZ2l0IGEvc3JjL2FkYXB0ZXIuYyBiL3NyYy9hZGFwdGVyLmMKaW5kZXggMjVl YzMzYS4uM2RiNWJhNiAxMDA2NDQKLS0tIGEvc3JjL2FkYXB0ZXIuYworKysgYi9zcmMvYWRhcHRl ci5jCkBAIC05NDUsMTA2ICs5NDUsMTYgQEAgc3RydWN0IGJ0ZF9kZXZpY2UgKmFkYXB0ZXJfZ2V0 X2RldmljZShEQnVzQ29ubmVjdGlvbiAqY29ubiwKIAlyZXR1cm4gYWRhcHRlcl9jcmVhdGVfZGV2 aWNlKGNvbm4sIGFkYXB0ZXIsIGFkZHJlc3MpOwogfQogCi1zdGF0aWMgaW50IHN0YXJ0X2lucXVp cnkoc3RydWN0IGJ0ZF9hZGFwdGVyICphZGFwdGVyKQorc3RhdGljIGludCBhZGFwdGVyX3N0YXJ0 X2lucXVpcnkoc3RydWN0IGJ0ZF9hZGFwdGVyICphZGFwdGVyKQogewotCWlucXVpcnlfY3AgY3A7 Ci0JZXZ0X2NtZF9zdGF0dXMgcnA7Ci0Jc3RydWN0IGhjaV9yZXF1ZXN0IHJxOwotCXVpbnQ4X3Qg bGFwWzNdID0geyAweDMzLCAweDhiLCAweDllIH07Ci0JaW50IGRkLCBlcnI7Ci0KLQlwZW5kaW5n X3JlbW90ZV9uYW1lX2NhbmNlbChhZGFwdGVyKTsKLQotCWRkID0gaGNpX29wZW5fZGV2KGFkYXB0 ZXItPmRldl9pZCk7Ci0JaWYgKGRkIDwgMCkKLQkJcmV0dXJuIGRkOwotCi0JbWVtc2V0KCZjcCwg MCwgc2l6ZW9mKGNwKSk7Ci0JbWVtY3B5KCZjcC5sYXAsIGxhcCwgMyk7Ci0JY3AubGVuZ3RoID0g MHgwODsKLQljcC5udW1fcnNwID0gMHgwMDsKLQotCW1lbXNldCgmcnEsIDAsIHNpemVvZihycSkp OwotCXJxLm9nZiA9IE9HRl9MSU5LX0NUTDsKLQlycS5vY2YgPSBPQ0ZfSU5RVUlSWTsKLQlycS5j cGFyYW0gPSAmY3A7Ci0JcnEuY2xlbiA9IElOUVVJUllfQ1BfU0laRTsKLQlycS5ycGFyYW0gPSAm cnA7Ci0JcnEucmxlbiA9IEVWVF9DTURfU1RBVFVTX1NJWkU7Ci0JcnEuZXZlbnQgPSBFVlRfQ01E X1NUQVRVUzsKLQotCWlmIChoY2lfc2VuZF9yZXEoZGQsICZycSwgSENJX1JFUV9USU1FT1VUKSA8 IDApIHsKLQkJZXJyID0gLWVycm5vOwotCQllcnJvcigiVW5hYmxlIHRvIHN0YXJ0IGlucXVpcnk6 ICVzICglZCkiLAotCQkJCQkJc3RyZXJyb3IoZXJybm8pLCBlcnJubyk7Ci0JCWhjaV9jbG9zZV9k ZXYoZGQpOwotCQlyZXR1cm4gZXJyOwotCX0KLQotCWlmIChycC5zdGF0dXMpIHsKLQkJZXJyb3Io IkhDSV9JbnF1aXJ5IGNvbW1hbmQgZmFpbGVkIHdpdGggc3RhdHVzIDB4JTAyeCIsCi0JCQlycC5z dGF0dXMpOwotCQloY2lfY2xvc2VfZGV2KGRkKTsKLQkJcmV0dXJuIC1idF9lcnJvcihycC5zdGF0 dXMpOwotCX0KLQotCWhjaV9jbG9zZV9kZXYoZGQpOwotCi0JaWYgKG1haW5fb3B0cy5uYW1lX3Jl c29sdikKLQkJYWRhcHRlci0+c3RhdGUgfD0gUkVTT0xWRV9OQU1FOwotCi0JcmV0dXJuIDA7Ci19 Ci0KLXN0YXRpYyBpbnQgc3RhcnRfcGVyaW9kaWNfaW5xdWlyeShzdHJ1Y3QgYnRkX2FkYXB0ZXIg KmFkYXB0ZXIpCi17Ci0JcGVyaW9kaWNfaW5xdWlyeV9jcCBjcDsKLQlzdHJ1Y3QgaGNpX3JlcXVl c3QgcnE7Ci0JdWludDhfdCBsYXBbM10gPSB7IDB4MzMsIDB4OGIsIDB4OWUgfTsKLQl1aW50OF90 IHN0YXR1czsKLQlpbnQgZGQsIGVycjsKLQotCWRkID0gaGNpX29wZW5fZGV2KGFkYXB0ZXItPmRl dl9pZCk7Ci0JaWYgKGRkIDwgMCkKLQkJcmV0dXJuIGRkOwotCi0JbWVtc2V0KCZjcCwgMCwgc2l6 ZW9mKGNwKSk7Ci0JbWVtY3B5KCZjcC5sYXAsIGxhcCwgMyk7Ci0JY3AubWF4X3BlcmlvZCA9IGh0 b2JzKDI0KTsKLQljcC5taW5fcGVyaW9kID0gaHRvYnMoMTYpOwotCWNwLmxlbmd0aCAgPSAweDA4 OwotCWNwLm51bV9yc3AgPSAweDAwOwotCi0JbWVtc2V0KCZycSwgMCwgc2l6ZW9mKHJxKSk7Ci0J cnEub2dmICAgID0gT0dGX0xJTktfQ1RMOwotCXJxLm9jZiAgICA9IE9DRl9QRVJJT0RJQ19JTlFV SVJZOwotCXJxLmNwYXJhbSA9ICZjcDsKLQlycS5jbGVuICAgPSBQRVJJT0RJQ19JTlFVSVJZX0NQ X1NJWkU7Ci0JcnEucnBhcmFtID0gJnN0YXR1czsKLQlycS5ybGVuICAgPSBzaXplb2Yoc3RhdHVz KTsKLQlycS5ldmVudCAgPSBFVlRfQ01EX0NPTVBMRVRFOwotCi0JaWYgKGhjaV9zZW5kX3JlcShk ZCwgJnJxLCBIQ0lfUkVRX1RJTUVPVVQpIDwgMCkgewotCQllcnIgPSAtZXJybm87Ci0JCWVycm9y KCJVbmFibGUgdG8gc3RhcnQgcGVyaW9kaWMgaW5xdWlyeTogJXMgKCVkKSIsCi0JCQkJCQlzdHJl cnJvcihlcnJubyksIGVycm5vKTsKLQkJaGNpX2Nsb3NlX2RldihkZCk7Ci0JCXJldHVybiBlcnI7 Ci0JfQotCi0JaWYgKHN0YXR1cykgewotCQllcnJvcigiSENJX1BlcmlvZGljX0lucXVpcnlfTW9k ZSBmYWlsZWQgd2l0aCBzdGF0dXMgMHglMDJ4IiwKLQkJCQlzdGF0dXMpOwotCQloY2lfY2xvc2Vf ZGV2KGRkKTsKLQkJcmV0dXJuIC1idF9lcnJvcihzdGF0dXMpOwotCX0KKwlnYm9vbGVhbiBwZXJp b2RpYyA9IFRSVUU7CiAKLQloY2lfY2xvc2VfZGV2KGRkKTsKKwlpZiAobWFpbl9vcHRzLmRpc2Nv dl9pbnRlcnZhbCkKKwkJcGVyaW9kaWMgPSBGQUxTRTsKIAotCWlmIChtYWluX29wdHMubmFtZV9y ZXNvbHYpCi0JCWFkYXB0ZXItPnN0YXRlIHw9IFJFU09MVkVfTkFNRTsKKwlwZW5kaW5nX3JlbW90 ZV9uYW1lX2NhbmNlbChhZGFwdGVyKTsKIAotCXJldHVybiAwOworCXJldHVybiBhZGFwdGVyX29w cy0+c3RhcnRfZGlzY292ZXJ5KGFkYXB0ZXItPmRldl9pZCwgcGVyaW9kaWMpOwogfQogCiBzdGF0 aWMgREJ1c01lc3NhZ2UgKmFkYXB0ZXJfc3RhcnRfZGlzY292ZXJ5KERCdXNDb25uZWN0aW9uICpj b25uLApAQCAtMTA2NywxMiArOTc3LDExIEBAIHN0YXRpYyBEQnVzTWVzc2FnZSAqYWRhcHRlcl9z dGFydF9kaXNjb3ZlcnkoREJ1c0Nvbm5lY3Rpb24gKmNvbm4sCiAJaWYgKGFkYXB0ZXItPmRpc2Nf c2Vzc2lvbnMpCiAJCWdvdG8gZG9uZTsKIAotCWlmIChtYWluX29wdHMuZGlzY292X2ludGVydmFs KQotCQllcnIgPSBzdGFydF9pbnF1aXJ5KGFkYXB0ZXIpOwotCWVsc2UKLQkJZXJyID0gc3RhcnRf cGVyaW9kaWNfaW5xdWlyeShhZGFwdGVyKTsKKwlpZiAobWFpbl9vcHRzLm5hbWVfcmVzb2x2KQor CQlhZGFwdGVyLT5zdGF0ZSB8PSBSRVNPTFZFX05BTUU7CiAKLQlpZiAoZXJyIDwgMCkKKwllcnIg PSBhZGFwdGVyX3N0YXJ0X2lucXVpcnkoYWRhcHRlcik7CisgCWlmIChlcnIgPCAwKQogCQlyZXR1 cm4gZmFpbGVkX3N0cmVycm9yKG1zZywgLWVycik7CiAKIGRvbmU6CkBAIC0yNDQxLDggKzIzNTAs OCBAQCB2b2lkIGFkYXB0ZXJfc2V0X3N0YXRlKHN0cnVjdCBidGRfYWRhcHRlciAqYWRhcHRlciwg aW50IHN0YXRlKQogCWVsc2UgaWYgKGFkYXB0ZXItPmRpc2Nfc2Vzc2lvbnMgJiYgbWFpbl9vcHRz LmRpc2Nvdl9pbnRlcnZhbCkKIAkJYWRhcHRlci0+c2NoZWR1bGVyX2lkID0gZ190aW1lb3V0X2Fk ZF9zZWNvbmRzKAogCQkJCQkJbWFpbl9vcHRzLmRpc2Nvdl9pbnRlcnZhbCwKLQkJCQkJCShHU291 cmNlRnVuYykgc3RhcnRfaW5xdWlyeSwKLQkJCQkJCWFkYXB0ZXIpOworCQkJCQkJKEdTb3VyY2VG dW5jKSBhZGFwdGVyX3N0YXJ0X2lucXVpcnksCisJCQkJCQkoZ3BvaW50ZXIpIGFkYXB0ZXIpOwog CiAJLyogU2VuZCBvdXQgb2YgcmFuZ2UgKi8KIAlpZiAoIWRpc2Nvdl9hY3RpdmUpCmRpZmYgLS1n aXQgYS9zcmMvYWRhcHRlci5oIGIvc3JjL2FkYXB0ZXIuaAppbmRleCBhOTRlZGM2Li40MmVlMGUx IDEwMDY0NAotLS0gYS9zcmMvYWRhcHRlci5oCisrKyBiL3NyYy9hZGFwdGVyLmgKQEAgLTE1Nyw2 ICsxNTcsOCBAQCBzdHJ1Y3QgYnRkX2FkYXB0ZXJfb3BzIHsKIAlpbnQgKCpzZXRfZGlzY292ZXJh YmxlKSAoaW50IGluZGV4KTsKIAlpbnQgKCpzZXRfbGltaXRlZF9kaXNjb3ZlcmFibGUpIChpbnQg aW5kZXgsIGNvbnN0IHVpbnQ4X3QgKmNscywKIAkJCQkJCWdib29sZWFuIGxpbWl0ZWQpOworCWlu dCAoKnN0YXJ0X2Rpc2NvdmVyeSkgKGludCBpbmRleCwgZ2Jvb2xlYW4gcGVyaW9kaWMpOworCWlu dCAoKnN0b3BfZGlzY292ZXJ5KSAoaW50IGluZGV4LCBnYm9vbGVhbiBwZXJpb2RpYyk7CiB9Owog CiBpbnQgYnRkX3JlZ2lzdGVyX2FkYXB0ZXJfb3BzKHN0cnVjdCBidGRfYWRhcHRlcl9vcHMgKmJ0 ZF9hZGFwdGVyX29wcyk7Ci0tIAoxLjUuNi4zCgo= --000e0cd47ddac14153046b0d421a--