From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Krzysztof Helt" Subject: [PATCH] sparc dbri: recording is back Date: Wed, 23 Aug 2006 20:10:35 +0200 Message-ID: <44ec9a1bf3034@wp.pl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="part44ec9a1c03c2c" Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@lists.sourceforge.net Errors-To: alsa-devel-bounces@lists.sourceforge.net To: alsa-devel List-Id: alsa-devel@alsa-project.org This is a multi-part message in MIME format. --part44ec9a1c03c2c Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable From: Krzysztof Helt (krzysztof.h1@wp.pl) This patch fixes recording after convertion to ring buffered driver. It also contains smaller fixes to the conversion. Signed-off-by: Krzysztof Helt (krzysztof.h1@wp.pl) --- ---------------------------------------------------- Ogl=B1daj -> Wydarzenia.wp.pl -> Wiesz, co najwa=BFniejsze! Najbardziej aktualne materia=B3y filmowe - Kliknij: http://klik.wp.pl/?adr=3Dwww.wydarzenia.wp.pl&sid=3D848 --part44ec9a1c03c2c Content-Type: application/octet-stream; name="dbri-patch11.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="dbri-patch11.diff" LS0tIGFsc2EtZHJpdmVyLTEuMC4xMnJjMi9hbHNhLWtlcm5lbC9zcGFyYy9kYnJpLmMJMjAwNi0w OC0yMiAxOTozNjozNy4wMDAwMDAwMDAgKzAyMDAKKysrIGxpbnV4LTIuNi4xN2Evc291bmQvc3Bh cmMvZGJyaS5jCTIwMDYtMDgtMjIgMjE6NTk6MzguMDAwMDAwMDAwICswMjAwCkBAIC02MTAsMTAg KzYxMCwxMCBAQCBDUFUgaW50ZXJydXB0IHRvIHNpZ25hbCBjb21wbGV0aW9uLgogCiBTaW5jZSB0 aGUgREJSSSBjYW4gcnVuIGluIHBhcmFsbGVsIHdpdGggdGhlIENQVSwgc2V2ZXJhbCBtZWFucyBv Zgogc3luY2hyb25pemF0aW9uIHByZXNlbnQgdGhlbXNlbHZlcy4gVGhlIG1ldGhvZCBpbXBsZW1l bnRlZCBoZXJlIGlzIG9ubHkKLXRvIHVzZSB0aGUgZGJyaV9jbWR3YWl0KCkgdG8gd2FpdCBmb3Ig ZXhlY3V0aW9uIG9mIGJhdGNoIG9mIHNlbnQgY29tbWFuZHMuCit1c2Ugb2YgdGhlIGRicmlfY21k d2FpdCgpIHRvIHdhaXQgZm9yIGV4ZWN1dGlvbiBvZiBiYXRjaCBvZiBzZW50IGNvbW1hbmRzLgog CiBBIGNpcmN1bGFyIGNvbW1hbmQgYnVmZmVyIGlzIHVzZWQgaGVyZS4gQSBuZXcgY29tbWFuZCBp cyBiZWluZyBhZGRlZCAKLXdoaWxlIG90aGVyIGNhbiBiZSBleGVjdXRlZC4gVGhlIHNjaGVtZSB3 b3JrcyBieSBhZGRpbmcgdHdvIFdBSVQgY29tbWFuZHMKK3doaWxlIGFub3RoZXIgY2FuIGJlIGV4 ZWN1dGVkLiBUaGUgc2NoZW1lIHdvcmtzIGJ5IGFkZGluZyB0d28gV0FJVCBjb21tYW5kcwogYWZ0 ZXIgZWFjaCBzZW50IGJhdGNoIG9mIGNvbW1hbmRzLiBXaGVuIHRoZSBuZXh0IGJhdGNoIGlzIHBy ZXBhcmVkIGl0IGlzCiBhZGRlZCBhZnRlciB0aGUgV0FJVCBjb21tYW5kcyB0aGVuIHRoZSBXQUlU cyBhcmUgcmVwbGFjZWQgd2l0aCBzaW5nbGUgSlVNUAogY29tbWFuZCB0byB0aGUgbmV3IGJhdGNo LiBUaGUgdGhlIERCUkkgaXMgZm9yY2VkIHRvIHJlcmVhZCB0aGUgbGFzdCBXQUlUIApAQCAtNjg5 LDEzICs2ODksMTMgQEAgc3RhdGljIHZvaWQgZGJyaV9jbWRzZW5kKHN0cnVjdCBzbmRfZGJyaQog CSooZGJyaS0+Y21kcHRyKSA9IERCUklfQ01EKERfSlVNUCwgMCwgMCk7CiAKICNpZmRlZiBEQlJJ X0RFQlVHCi0JaWYgKGNtZCA+IGRicmktPmNtZHB0ciApCisJaWYgKGNtZCA+IGRicmktPmNtZHB0 ciApIHsKIAkJczMyICpwdHI7CiAKIAkJZm9yIChwdHIgPSBkYnJpLT5jbWRwdHI7IHB0ciA8IGNt ZCsyOyBwdHIrKykgewogCQkJZHByaW50ayhEX0NNRCwgImNtZDogJWx4OiUwOHhcbiIsICh1bnNp Z25lZCBsb25nKXB0ciwgKnB0cik7CiAJCX0KLQllbHNlIHsKKwl9IGVsc2UgewogCQlzMzIgKnB0 ciA9IGRicmktPmNtZHB0cjsKIAogCQlkcHJpbnRrKERfQ01ELCAiY21kOiAlbHg6JTA4eFxuIiwg KHVuc2lnbmVkIGxvbmcpcHRyLCAqcHRyKTsKQEAgLTExNDEsMTMgKzExNDEsOSBAQCBzdGF0aWMg aW50IHNldHVwX2Rlc2NzKHN0cnVjdCBzbmRfZGJyaSAqCiAJCXJldHVybiAtMTsKIAl9CiAKLQlp ZiAoc3RyZWFtbm8gPT0gREJSSV9QTEFZKSB7Ci0JCWRicmktPmRtYS0+ZGVzY1tsYXN0X2Rlc2Nd LndvcmQxIHw9Ci0JCSAgICBEQlJJX1REX0YgfCBEQlJJX1REX0I7Ci0JCWRicmktPmRtYS0+ZGVz Y1tsYXN0X2Rlc2NdLm5kYSA9Ci0JCSAgICBkYnJpLT5kbWFfZHZtYSArIGRicmlfZG1hX29mZihk ZXNjLCBmaXJzdF9kZXNjKTsKLQkJZGJyaS0+bmV4dF9kZXNjW2xhc3RfZGVzY10gPSBmaXJzdF9k ZXNjOwotCX0KKwlkYnJpLT5kbWEtPmRlc2NbbGFzdF9kZXNjXS5uZGEgPQorCSAgICBkYnJpLT5k bWFfZHZtYSArIGRicmlfZG1hX29mZihkZXNjLCBmaXJzdF9kZXNjKTsKKwlkYnJpLT5uZXh0X2Rl c2NbbGFzdF9kZXNjXSA9IGZpcnN0X2Rlc2M7CiAJZGJyaS0+cGlwZXNbaW5mby0+cGlwZV0uZmly c3RfZGVzYyA9IGZpcnN0X2Rlc2M7CiAJZGJyaS0+cGlwZXNbaW5mby0+cGlwZV0uZGVzYyA9IGZp cnN0X2Rlc2M7CiAKQEAgLTE2MzksNyArMTYzNSw2IEBAIHN0YXRpYyB2b2lkIHhtaXRfZGVzY3Mo c3RydWN0IHNuZF9kYnJpICoKIAlpZiAoZGJyaSA9PSBOVUxMKQogCQlyZXR1cm47CQkvKiBEaXNh YmxlZCAqLwogCi0JLyogRmlyc3QgY2hlY2sgdGhlIHJlY29yZGluZyBzdHJlYW0gZm9yIGJ1ZmZl ciBvdmVyZmxvdyAqLwogCWluZm8gPSAmZGJyaS0+c3RyZWFtX2luZm9bREJSSV9SRUNdOwogCXNw aW5fbG9ja19pcnFzYXZlKCZkYnJpLT5sb2NrLCBmbGFncyk7CiAKQEAgLTE2NDksMjcgKzE2NDQs MjAgQEAgc3RhdGljIHZvaWQgeG1pdF9kZXNjcyhzdHJ1Y3Qgc25kX2RicmkgKgogCQlkcHJpbnRr KERfREVTQywgInhtaXRfZGVzY3MgcmVjIEAgVEQgJWRcbiIsIGZpcnN0X3RkKTsKIAogCQkvKiBT dHJlYW0gY291bGQgYmUgY2xvc2VkIGJ5IHRoZSB0aW1lIHdlIHJ1bi4gKi8KLQkJaWYgKGZpcnN0 X3RkIDwgMCkgewotCQkJZ290byBwbGF5OwotCQl9Ci0KLQkJY21kID0gZGJyaV9jbWRsb2NrKGRi cmksIDIpOwotCQkqKGNtZCsrKSA9IERCUklfQ01EKERfU0RQLCAwLAotCQkJCSAgICBkYnJpLT5w aXBlc1tpbmZvLT5waXBlXS5zZHAKLQkJCQkgICAgfCBEX1NEUF9QIHwgRF9TRFBfRVZFUlkgfCBE X1NEUF9DKTsKLQkJKihjbWQrKykgPSBkYnJpLT5kbWFfZHZtYSArIGRicmlfZG1hX29mZihkZXNj LCBmaXJzdF90ZCk7Ci0JCWRicmlfY21kc2VuZChkYnJpLCBjbWQsIDIpOworCQlpZiAoZmlyc3Rf dGQgPj0gMCkgeworCQkJY21kID0gZGJyaV9jbWRsb2NrKGRicmksIDIpOworCQkJKihjbWQrKykg PSBEQlJJX0NNRChEX1NEUCwgMCwKKwkJCQkJICAgIGRicmktPnBpcGVzW2luZm8tPnBpcGVdLnNk cAorCQkJCQkgICAgfCBEX1NEUF9QIHwgRF9TRFBfRVZFUlkgfCBEX1NEUF9DKTsKKwkJCSooY21k KyspID0gZGJyaS0+ZG1hX2R2bWEgKyBkYnJpX2RtYV9vZmYoZGVzYywgZmlyc3RfdGQpOworCQkJ ZGJyaV9jbWRzZW5kKGRicmksIGNtZCwgMik7CiAKLQkJLyogUmVzZXQgb3VyIGFkbWluIG9mIHRo ZSBwaXBlICYgYnl0ZXMgcmVhZC4gKi8KLQkJZGJyaS0+cGlwZXNbaW5mby0+cGlwZV0uZGVzYyA9 IGZpcnN0X3RkOworCQkJLyogUmVzZXQgb3VyIGFkbWluIG9mIHRoZSBwaXBlLiAqLworCQkJZGJy aS0+cGlwZXNbaW5mby0+cGlwZV0uZGVzYyA9IGZpcnN0X3RkOworCQl9CiAJfQogCi1wbGF5Ogot CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRicmktPmxvY2ssIGZsYWdzKTsKLQotCS8qIE5vdyBj aGVjayB0aGUgcGxheWJhY2sgc3RyZWFtIGZvciBidWZmZXIgdW5kZXJmbG93ICovCiAJaW5mbyA9 ICZkYnJpLT5zdHJlYW1faW5mb1tEQlJJX1BMQVldOwotCXNwaW5fbG9ja19pcnFzYXZlKCZkYnJp LT5sb2NrLCBmbGFncyk7CiAKIAlpZiAoaW5mby0+cGlwZSA+PSAwKSB7CiAJCWZpcnN0X3RkID0g ZGJyaS0+cGlwZXNbaW5mby0+cGlwZV0uZmlyc3RfZGVzYzsKQEAgLTE2ODUsNyArMTY3Myw3IEBA IHBsYXk6CiAJCQkqKGNtZCsrKSA9IGRicmktPmRtYV9kdm1hICsgZGJyaV9kbWFfb2ZmKGRlc2Ms IGZpcnN0X3RkKTsKIAkJCWRicmlfY21kc2VuZChkYnJpLCBjbWQsIDIpOwogCi0JCQkvKiBSZXNl dCBvdXIgYWRtaW4gb2YgdGhlIHBpcGUgJiBieXRlcyB3cml0dGVuLiAqLworCQkJLyogUmVzZXQg b3VyIGFkbWluIG9mIHRoZSBwaXBlLiAqLwogCQkJZGJyaS0+cGlwZXNbaW5mby0+cGlwZV0uZGVz YyA9IGZpcnN0X3RkOwogCQl9CiAJfQpAQCAtMTc1NSw3ICsxNzQzLDYgQEAgc3RhdGljIHZvaWQg cmVjZXB0aW9uX2NvbXBsZXRlX2ludHIoc3RydQogCQlyZXR1cm47CiAJfQogCi0JZGJyaS0+ZG1h LT5kZXNjW3JkXS5iYSA9IDA7CiAJZGJyaS0+cGlwZXNbcGlwZV0uZGVzYyA9IGRicmktPm5leHRf ZGVzY1tyZF07CiAJc3RhdHVzID0gZGJyaS0+ZG1hLT5kZXNjW3JkXS53b3JkMTsKIAlkYnJpLT5k bWEtPmRlc2NbcmRdLndvcmQxID0gMDsJLyogUmVzZXQgaXQgZm9yIG5leHQgdGltZS4gKi8KQEAg LTE3NjgsMTggKzE3NTUsNiBAQCBzdGF0aWMgdm9pZCByZWNlcHRpb25fY29tcGxldGVfaW50cihz dHJ1CiAJZHByaW50ayhEX0lOVCwgIlJlY3YgUkQgJWQsIHN0YXR1cyAweCUwMngsIGxlbiAlZFxu IiwKIAkJcmQsIERCUklfUkRfU1RBVFVTKHN0YXR1cyksIERCUklfUkRfQ05UKHN0YXR1cykpOwog Ci0JLyogT24gdGhlIGxhc3QgVEQsIHRyYW5zbWl0IHRoZW0gYWxsIGFnYWluLiAqLwotI2lmIDAK LQlpZiAoZGJyaS0+bmV4dF9kZXNjW3JkXSA9PSAtMSkgewotCQlpZiAoaW5mby0+bGVmdCA+IGlu Zm8tPnNpemUpIHsKLQkJCXByaW50ayhLRVJOX1dBUk5JTkcKLQkJCSAgICAgICAiJWQgYnl0ZXMg cmVjb3JkZWQgaW4gJWQgc2l6ZSBidWZmZXIuXG4iLAotCQkJICAgICAgIGluZm8tPmxlZnQsIGlu Zm8tPnNpemUpOwotCQl9Ci0JCXRhc2tsZXRfc2NoZWR1bGUoJnhtaXRfZGVzY3NfdGFzayk7Ci0J fQotI2VuZGlmCi0KIAkvKiBOb3RpZnkgQUxTQSAqLwogCWlmIChzcGluX2lzX2xvY2tlZCgmZGJy aS0+bG9jaykpIHsKIAkJc3Bpbl91bmxvY2soJmRicmktPmxvY2spOwpAQCAtMjE1OSw3ICsyMTM5 LDcgQEAgc3RhdGljIHNuZF9wY21fdWZyYW1lc190IHNuZF9kYnJpX3BvaW50ZQogCXNuZF9wY21f dWZyYW1lc190IHJldDsKIAogCXJldCA9IGJ5dGVzX3RvX2ZyYW1lcyhzdWJzdHJlYW0tPnJ1bnRp bWUsIGluZm8tPm9mZnNldCkKLQkJJSBzdWJzdHJlYW0tPnJ1bnRpbWUtPmJ1ZmZlcl9zaXplOwor CQklIChzdWJzdHJlYW0tPnJ1bnRpbWUtPmJ1ZmZlcl9zaXplICsgMSk7CiAJZHByaW50ayhEX1VT UiwgIkkvTyBwb2ludGVyOiAlbGQgZnJhbWVzIG9mICVsZC5cbiIsCiAJCXJldCwgc3Vic3RyZWFt LT5ydW50aW1lLT5idWZmZXJfc2l6ZSk7CiAJcmV0dXJuIHJldDsK --part44ec9a1c03c2c Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 --part44ec9a1c03c2c Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Alsa-devel mailing list Alsa-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/alsa-devel --part44ec9a1c03c2c--