Date: Wed, 12 Jul 2006 21:04:59 -0400 (EDT) From: Wesley Morgan <morganw@chemikals.org> To: Eric Anderson <anderson@centtech.com> Cc: freebsd-multimedia@freebsd.org, Andrea Bittau <a.bittau@cs.ucl.ac.uk>, freebsd-mobile@freebsd.org Subject: Re: HDA sound driver mod for sigmatel 92xx Message-ID: <20060712205940.J59349@volatile.chemikals.org> In-Reply-To: <44B4EC7B.9020004@centtech.com> References: <20060606124030.GA32057@shorty.sorbonet.org> <4485CEF8.10201@centtech.com> <20060606192229.GA4465@shorty.sorbonet.org> <4485DA6D.9020304@centtech.com> <4485E199.7000604@centtech.com> <20060606205918.GA6765@shorty.sorbonet.org> <20060606231025.R50560@volatile.chemikals.org> <20060607073918.GB9245@shorty.sorbonet.org> <448CE5A0.70806@centtech.com> <20060709093252.S31266@volatile.chemikals.org> <44B4EC7B.9020004@centtech.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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-683849342-1152752699=:59349 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed On Wed, 12 Jul 2006, Eric Anderson wrote: > On 07/09/06 09:11, Wesley Morgan wrote: >> >> With a little help from the netbsd azalia driver (a wonderful piece of >> work, by the way) and the hda specs, I've been able to get Andrea's hdac >> code to work with my laptop. I believe the problem was that the codec and >> dac started out in some kind of low-power mode and needed to be woken up >> before they would work. >> >> Hopefully someone is still working on a proper driver, but for now, I can >> watch movies again! >> >> A diff against Andrea's work is attached. > > > I couldn't get this patch to work - all hunks fail. What am I doing wrong? Make sure your mailer didn't wrap long lines? It applies cleanly for me. I've attached a newer diff that makes the mixer work properly as well, but it's hard-coded to the correct widget for me so it might not work for everyone. [morganw@catalyst:~$]: tar zxf hdac.tgz [morganw@catalyst:~$]: cd hdac [morganw@catalyst:~/hdac$]: patch < ../sigma.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -urb hdac/hdac.c hdac-sigma/hdac.c |--- hdac/hdac.c Mon Jun 5 15:15:12 2006 |+++ hdac-sigma/hdac.c Sun Jul 9 10:10:37 2006 -------------------------- Patching file hdac.c using Plan A... Hunk #1 succeeded at 247. Hunk #2 succeeded at 261. Hunk #3 succeeded at 787. Hunk #4 succeeded at 821. Hunk #5 succeeded at 894. Hunk #6 succeeded at 945. Hunk #7 succeeded at 974. Hunk #8 succeeded at 1270. Hmm... Ignoring the trailing garbage. done -- This .signature sanitized for your protection --0-683849342-1152752699=:59349 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=sigma.diff Content-Transfer-Encoding: BASE64 Content-ID: <20060712210459.L59349@volatile.chemikals.org> Content-Description: Content-Disposition: attachment; filename=sigma.diff ZGlmZiAtdXJiIGhkYWMvaGRhYy5jIGhkYWMtc2lnbWEvaGRhYy5jDQotLS0g aGRhYy9oZGFjLmMJTW9uIEp1biAgNSAxNToxNToxMiAyMDA2DQorKysgaGRh Yy1zaWdtYS9oZGFjLmMJV2VkIEp1bCAxMiAyMTowMjozMiAyMDA2DQpAQCAt MjQ3LDcgKzI0Nyw4IEBADQogCSAqIFJlc2V0IHRoZSBjb250cm9sbGVyLiBU aGUgcmVzZXQgbXVzdCByZW1haW4gYXNzZXJ0ZWQgZm9yDQogCSAqIGEgbWlu aW11bSBvZiAxMDB1cy4NCiAJICovDQotCUhEQUNfV1JJVEVfNCgmc2MtPm1l bSwgSERBQ19HQ1RMLCAweDApOw0KKwlnY3RsID0gSERBQ19SRUFEXzQoJnNj LT5tZW0sIEhEQUNfR0NUTCk7DQorCUhEQUNfV1JJVEVfNCgmc2MtPm1lbSwg SERBQ19HQ1RMLCBnY3RsICYgfiBIREFDX0dDVExfQ1JTVCk7DQogCWNvdW50 ID0gMTAwMDA7DQogCXdoaWxlIChjb3VudCkgew0KIAkJZ2N0bCA9IEhEQUNf UkVBRF80KCZzYy0+bWVtLCBIREFDX0dDVEwpOw0KQEAgLTI2MCwxMSArMjYx LDExIEBADQogCQlyZXR1cm4gKEVOWElPKTsNCiAJfQ0KIAlERUxBWSgxMDAp Ow0KLQlIREFDX1dSSVRFXzQoJnNjLT5tZW0sIEhEQUNfR0NUTCwgSERBQ19H Q1RMX0NSU1QpOw0KKwlnY3RsID0gSERBQ19SRUFEXzQoJnNjLT5tZW0sIEhE QUNfR0NUTCk7DQorCUhEQUNfV1JJVEVfNCgmc2MtPm1lbSwgSERBQ19HQ1RM LCBnY3RsIHwgSERBQ19HQ1RMX0NSU1QpOw0KIAljb3VudCA9IDEwMDAwOw0K IAl3aGlsZSAoY291bnQpIHsNCi0JCWdjdGwgPSBIREFDX1JFQURfNCgmc2Mt Pm1lbSwgSERBQ19HQ1RMKTsNCi0JCWlmICgoZ2N0bCAmIEhEQUNfR0NUTF9D UlNUKSA9PSBIREFDX0dDVExfQ1JTVCkNCisJCWlmIChIREFDX1JFQURfNCgm c2MtPm1lbSwgSERBQ19HQ1RMKSAmIEhEQUNfR0NUTF9DUlNUKQ0KIAkJCWJy ZWFrOw0KIAkJY291bnQtLTsNCiAJfQ0KQEAgLTI3Myw2ICsyNzQsMTAgQEAN CiAJCWRldmljZV9wcmludGYoc2MtPmRldiwgIkRldmljZSBzdHVjayBpbiBy ZXNldFxuIik7DQogCQlyZXR1cm4oRU5YSU8pOw0KIAl9DQorLyoNCisJZ2N0 bCA9IEhEQUNfUkVBRF80KCZzYy0+bWVtLCBIREFDX0dDVEwpOw0KKwlIREFD X1dSSVRFXzQoJnNjLT5tZW0sIEhEQUNfR0NUTCwgZ2N0bCB8IEhEQUNfR0NU TF9VTlNPTCk7DQorKi8NCiANCiAJLyoNCiAJICogV2FpdCBmb3IgY29kZWNz IHRvIGZpbmlzaCB0aGVpciBvd24gcmVzZXQgc2VxdWVuY2UuIFRoZSBkZWxh eSBoZXJlDQpAQCAtNzg2LDYgKzc5MSwxMCBAQA0KIAlkZXZpbmZvLT5zdGVw cGluZ19pZCA9IEhEQV9QQVJBTV9SRVZJU0lPTl9JRF9TVEVQUElOR19JRChy ZXZpc2lvbmlkKTsNCiAJZGV2aW5mby0+bm9kZV90eXBlID0gSERBX1BBUkFN X0ZDVF9HUlBfVFlQRV9OT0RFX1RZUEUoZmN0Z3JwdHlwZSk7DQogDQ0KKw0K KwlkZXZpY2VfcHJpbnRmKHNjLT5kZXYsICJWZW5kb3IgaW5mbzogJXggJXgg JXggJXggJXggJXhcbiIsIHZlbmRvcmlkLCBkZXZpbmZvLT52ZW5kb3JfaWQs IGRldmluZm8tPmRldmljZV9pZCwNCisJCWRldmluZm8tPnJldmlzaW9uX2lk LCBkZXZpbmZvLT5zdGVwcGluZ19pZCwgZGV2aW5mby0+bm9kZV90eXBlKTsN CisNCiAJaGRhY19hZGRfY2hpbGQoc2MsIGRldmluZm8pOw0KIH0NCiANCkBA IC04MTYsNiArODI1LDEwIEBADQogCXVpbnQzMl90IHJjLCBzZiwgc3Q7DQog CXVpbnQzMl90IGZtdCA9IHNvcmJvX2dldF9mbXQoc2MpOw0KIA0KKw0KKwly YyA9IEhEQV9DTURfR0VUX0NPTkZJR1VSQVRJT05fREVGQVVMVChjYWQsIG5p ZCk7DQorCWRldmljZV9wcmludGYoc2MtPmRldiwgIkNvbmZpZyAleFxuIiwg cmMpOw0KKw0KIAlyYyA9IGhkYWNfY29tbWFuZF9zZW5kb25lX2ludGVybmFs KHNjLA0KIAkJSERBX0NNRF9TRVRfQ09OVl9TVFJFQU1fQ0hBTihjYWQsIG5p ZCwgMSA8PCA0KSwgMCk7DQogCWlmIChyYykNCkBAIC04NTQsMTIgKzg2Nywy NiBAQA0KIH0NCiANCiBzdGF0aWMgdm9pZA0KLXNvcmJvX3NldF9hbXAoc3Ry dWN0IGhkYWNfc29mdGMgKnNjLCBpbnQgY2RhLCBpbnQgbmksIGludCBhbXAp DQorc29yYm9fc2V0X2FtcChzdHJ1Y3QgaGRhY19zb2Z0YyAqc2MsIGludCBj ZGEsIGludCBuaSwgaW50IGxlZnQsIGludCByaWdodCkNCiB7DQotCXVpbnQx Nl90IHBheSA9ICgxIDw8IDE1KSB8ICgzIDw8IDEyKSB8IGFtcDsNCisJdWlu dDE2X3QgcGF5ID0gMDsNCisJDQorCWlmIChsZWZ0ICE9IHJpZ2h0KSB7DQor CQlwYXkgPSAoMSA8PCAxNSkgfCAoMSA8PCAxMykgfCBsZWZ0Ow0KIA0KIAlo ZGFjX2NvbW1hbmRfc2VuZG9uZV9pbnRlcm5hbChzYywNCiAJCUhEQV9DTURf U0VUX0FNUF9HQUlOX01VVEUoY2RhLCBuaSwgcGF5KSwgY2RhKTsNCisNCisJ CXBheSA9ICgxIDw8IDE1KSB8ICgxIDw8IDEyKSB8IHJpZ2h0Ow0KKw0KKwkJ aGRhY19jb21tYW5kX3NlbmRvbmVfaW50ZXJuYWwoc2MsDQorCQkJSERBX0NN RF9TRVRfQU1QX0dBSU5fTVVURShjZGEsIG5pLCBwYXkpLCBjZGEpOw0KKwl9 IGVsc2Ugew0KKwkJcGF5ID0gKDEgPDwgMTUpIHwgKDMgPDwgMTIpIHwgbGVm dDsNCisNCisJCWhkYWNfY29tbWFuZF9zZW5kb25lX2ludGVybmFsKHNjLA0K KwkJCUhEQV9DTURfU0VUX0FNUF9HQUlOX01VVEUoY2RhLCBuaSwgcGF5KSwg Y2RhKTsNCisJfQ0KIH0NCiANCiBzdGF0aWMgdm9pZA0KQEAgLTg4NSw4ICs5 MTIsMTAgQEANCiANCiAJY3QgPSBoZGFjX2NvbW1hbmRfc2VuZG9uZV9pbnRl cm5hbChzYywNCiAJCUhEQV9DTURfR0VUX1BJTl9XSURHRVRfQ1RSTChjYWQs IG5pZCksIGNhZCk7DQotCWN0IHw9ICgxIDw8IDYpIHwgKDEgPDwgNyk7DQot CWN0ID0gaGRhY19jb21tYW5kX3NlbmRvbmVfaW50ZXJuYWwoc2MsDQorDQor CWN0IHw9ICgxIDw8IDYpIHwgKDEgPDwgMikgfCAoMSk7DQorDQorCWhkYWNf Y29tbWFuZF9zZW5kb25lX2ludGVybmFsKHNjLA0KIAkJSERBX0NNRF9TRVRf UElOX1dJREdFVF9DVFJMKGNhZCwgbmlkLCBjdCksIGNhZCk7DQogDQogCWNh cGEgPSBoZGFjX2NvbW1hbmRfc2VuZG9uZV9pbnRlcm5hbChzYywNCkBAIC05 MzQsMTggKzk2MywyNiBAQA0KIAkNCiAJZGV2aWNlX3ByaW50ZihzYy0+ZGV2 LCAibm9kZSAlZCB0eXBlICV4IGNhcCAleFxuIiwgbm9kZWlkLCB0eXBlLCBy Yyk7DQogDQotCWlmICgwKQ0KLQlzb3Jib19zZXRfYW1wKHNjLCBjb2RlY2lk LCBub2RlaWQsIDQwKTsNCisJaWYgKEhEQV9QQVJBTV9BVURJT19XSURHRVRf Q0FQX1BPV0VSX0NUUkwocmMpKSB7DQorCQloZGFjX2NvbW1hbmRfc2VuZG9u ZV9pbnRlcm5hbChzYywNCisJCQlIREFfQ01EX1NFVF9QT1dFUl9TVEFURShj b2RlY2lkLCBub2RlaWQsIEhEQV9DTURfUE9XRVJfU1RBVEVfRDApLCBjb2Rl Y2lkKTsNCisJfQ0KIA0KIAlpZiAoMCAmJiBIREFfUEFSQU1fQVVESU9fV0lE R0VUX0NBUF9QUk9DX1dJREdFVChyYykpIHsNCiAJCXNvcmJvX293bl9wcm9j KHNjLCBjb2RlY2lkLCBub2RlaWQpOw0KIAl9DQogDQotCWlmICgwICYmIHR5 cGUgPT0gSERBX1BBUkFNX0FVRElPX1dJREdFVF9DQVBfVFlQRV9BVURJT19P VVRQVVQpIHsNCisJaWYgKHR5cGUgPT0gSERBX1BBUkFNX0FVRElPX1dJREdF VF9DQVBfVFlQRV9BVURJT19PVVRQVVQpIHsNCiAJCXNvcmJvX2NvbmZfb3V0 cHV0KHNjLCBjb2RlY2lkLCBub2RlaWQpOw0KKwkJZGV2aWNlX3ByaW50Zihz Yy0+ZGV2LCAic29yYm9fY29uZl9vdXRwdXQ6IGNvZGVjOiAlZCBub2RlOiAl ZFxuIiwgY29kZWNpZCwgbm9kZWlkKTsNCiAJfQkNCi0JZWxzZSBpZiAoMCAm JiB0eXBlID09IEhEQV9QQVJBTV9BVURJT19XSURHRVRfQ0FQX1RZUEVfUElO X0NPTVBMRVgpDQorCWVsc2UgaWYgKHR5cGUgPT0gSERBX1BBUkFNX0FVRElP X1dJREdFVF9DQVBfVFlQRV9BVURJT19TRUxFQ1RPUikgew0KKwkJc29yYm9f c2V0X2FtcChzYywgY29kZWNpZCwgbm9kZWlkLCA3NSwgNzUpOw0KKwl9CQ0K KwllbHNlIGlmICh0eXBlID09IEhEQV9QQVJBTV9BVURJT19XSURHRVRfQ0FQ X1RZUEVfUElOX0NPTVBMRVgpIHsNCiAJCXNvcmJvX2NvbmZfcGluKHNjLCBj b2RlY2lkLCBub2RlaWQpOw0KKwkJc29yYm9fc2V0X2FtcChzYywgY29kZWNp ZCwgbm9kZWlkLCA3NSwgNzUpOw0KKwl9DQogfQ0KIA0KIHN0YXRpYyB2b2lk DQpAQCAtOTU1LDE5ICs5OTIsMjIgQEANCiAJaW50IHN0YXJ0bm9kZTsNCiAJ aW50IGVuZG5vZGU7DQogCWludCBpOw0KLS8vCXVpbnQzMl90IHB3Ow0KKwl1 aW50MzJfdCBwdzsNCiAJDQogCXN1Ym5vZGUgPSBoZGFjX2NvbW1hbmRfc2Vu ZG9uZV9pbnRlcm5hbChzYywNCiAJICAgIEhEQV9DTURfR0VUX1BBUkFNRVRF UigwICwgMSwgSERBX1BBUkFNX1NVQl9OT0RFX0NPVU5UKSwgMCk7DQorCQ0K IAlzdGFydG5vZGUgPSBIREFfUEFSQU1fU1VCX05PREVfQ09VTlRfU1RBUlQo c3Vibm9kZSk7DQogCWVuZG5vZGUgPSBzdGFydG5vZGUgKyBIREFfUEFSQU1f U1VCX05PREVfQ09VTlRfVE9UQUwoc3Vibm9kZSk7DQogDQotI2lmIDANCisJ aGRhY19jb21tYW5kX3NlbmRvbmVfaW50ZXJuYWwoc2MsDQorCQlIREFfQ01E X1NFVF9QT1dFUl9TVEFURSgwLCAxLCBIREFfQ01EX1BPV0VSX1NUQVRFX0Qw KSwgMCk7DQorDQogCXB3ID0gaGRhY19jb21tYW5kX3NlbmRvbmVfaW50ZXJu YWwoc2MsDQogCQlIREFfQ01EX0dFVF9QT1dFUl9TVEFURSgwLCAxKSwgMCk7 DQogDQogCWRldmljZV9wcmludGYoc2MtPmRldiwgIlBXICV4XG4iLCBwdyk7 DQotI2VuZGlmDQorCWRldmljZV9wcmludGYoc2MtPmRldiwgInN0YXJ0OiAl ZCBlbmRub2RlOiAlZFxuIiwgc3RhcnRub2RlLCBlbmRub2RlKTsNCiANCiAJ Zm9yIChpID0gc3RhcnRub2RlOyBpIDwgZW5kbm9kZTsgaSsrKSB7DQogCQlz b3Jib19wcmludF93aWRnZXQoc2MsIDAsIGkpOw0KQEAgLTEyNDgsMTUgKzEy ODgsMTIgQEANCiANCiAJaGRhY19zY2FuX2NvZGVjcyhzYyk7DQogDQotCWlm ICgwKQ0KIAlzb3Jib19lbnVtKHNjKTsNCiANCiAJc29yYm9fc3RvcF9zdHJl YW0oc2MpOw0KIAlzb3Jib19yZXNldF9zdHJlYW0oc2MpOw0KIAlzb3Jib19z dHJlYW1fc2V0aWQoc2MpOw0KIA0KLQlzb3Jib19jb25mX291dHB1dChzYywg MCwgMyk7DQotCXNvcmJvX3NldF9hbXAoc2MsIDAsIDUsIDQwKTsNCiAJc29y Ym9fYWxsb2NfYmRsKHNjLCAyNTYpOw0KIAlzb3Jib19lbmFibGVfc3RyZWFt X2ludGVycnVwdHMoc2MpOwkNCiAJc2MtPmxhbWUgPSAxOw0KQEAgLTE1OTEs MjEgKzE2MjgsMjYgQEANCiBzdGF0aWMgaW50DQogaGRhY21peF9zZXQoc3Ry dWN0IHNuZF9taXhlciAqbSwgdW5zaWduZWQgZGV2LCB1bnNpZ25lZCBsZWZ0 LCB1bnNpZ25lZCByaWdodCkNCiB7DQotCWludCB2b2wgPSAwOw0KLQlpbnQg bWF4ID0gNjM7DQorCWludCBsZWZ0X3ZvbCA9IDAsIHJpZ2h0X3ZvbCA9IDA7 DQorCWludCBtYXggPSAoKDE8PDUpIC0gMSk7DQogCXN0cnVjdCBoZGFjX3Nv ZnRjICpzYyA9IG1peF9nZXRkZXZpbmZvKG0pOw0KLQl2b2wgPSAobGVmdCo2 MykvMTAwOw0KIA0KLQlpZiAobGVmdCA9PSAxMDAgfHwgdm9sID4gbWF4KQ0K LQkJdm9sID0gbWF4Ow0KKwlsZWZ0X3ZvbCA9IChsZWZ0ICogbWF4KSAvIDEw MDsNCisJaWYgKChsZWZ0ID09IDEwMCkgfHwgKGxlZnRfdm9sID4gbWF4KSkN CisJCWxlZnRfdm9sID0gbWF4Ow0KIA0KLS8vCXByaW50ZigiVm9sID0gJWRc biIsIHZvbCk7DQotCWlmIChzYy0+bGFtZSkNCi0JCXNvcmJvX3NldF9hbXAo c2MsIDAsIDUsIHZvbCk7DQorCXJpZ2h0X3ZvbCA9IChyaWdodCAqIG1heCkg LyAxMDA7DQorCWlmICgocmlnaHQgPT0gMTAwKSB8fCAocmlnaHRfdm9sID4g bWF4KSkNCisJCXJpZ2h0X3ZvbCA9IG1heDsNCisNCisJaWYgKHNjLT5sYW1l KSB7DQorLyoJCWRldmljZV9wcmludGYoc2MtPmRldiwgInNldHRpbmcgdm9s dW1lIHRvICV4OiV4XG4iLCBsZWZ0X3ZvbCwgcmlnaHRfdm9sKTsgKi8NCisJ CXNvcmJvX3NldF9hbXAoc2MsIDAsIDExLCBsZWZ0X3ZvbCwgcmlnaHRfdm9s KTsNCisJfQ0KIAkNCi0Jdm9sID0gbGVmdCB8IChsZWZ0IDw8IDgpOw0KKwls ZWZ0X3ZvbCA9IGxlZnQgfCAocmlnaHQgPDwgOCk7DQogDQotCXJldHVybiB2 b2w7DQorCXJldHVybiBsZWZ0X3ZvbDsNCiB9DQogDQogc3RhdGljIGludA0K --0-683849342-1152752699=:59349--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060712205940.J59349>