Date: Tue, 12 Dec 2006 02:57:12 -0600 From: "Scot Hetzel" <swhetzel@gmail.com> To: "Rong-En Fan" <rafan@freebsd.org> Cc: ports@freebsd.org, sumikawa@freebsd.org Subject: Re: sysutils/xbattbar for !i386 Message-ID: <790a9fff0612120057j7ab3c6fdxb3761c7e6ef4cae6@mail.gmail.com> In-Reply-To: <790a9fff0612112345k2e727817j34d2acf3881186cd@mail.gmail.com> References: <20061212064859.GA33414@svm.csie.ntu.edu.tw> <790a9fff0612112345k2e727817j34d2acf3881186cd@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_155760_3393920.1165913832455 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline On 12/12/06, Scot Hetzel <swhetzel@gmail.com> wrote: > On 12/12/06, Rong-En Fan <rafan@freebsd.org> wrote: > > Recently, I installed a FreeBSD/amd64 laptop. I found this port > > uses apm (i386 only) interface to get battery information. The > > patch below changes it to use sysctl(3). Thus, it is usable on > > amd64. > > > > http://people.freebsd.org/~rafan/xbattbar.diff > > > > It works on my ThinkPad X60 (-CURRENT). If you are running this > > port, please have a test. > > > Works on my HP dv8135nr (-CURRENT) system. > I have updated the patch so that it can be compiled for systems that have either an APM or ACPI interface for battery status. The Makefile has been changed to always use the ACPI interface when not being built on the i386 arch (i.e. amd64, ...). On the i386 arch it defaults to ACPI, but can be changed via the options menu to use APM. Scot -- DISCLAIMER: No electrons were mamed while sending this message. Only slightly bruised. ------=_Part_155760_3393920.1165913832455 Content-Type: text/x-diff; name=xbattbar.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_evm2w6rr Content-Disposition: attachment; filename="xbattbar.diff" SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMvc3lz dXRpbHMveGJhdHRiYXIvTWFrZWZpbGUsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTQKZGlmZiAt dSAtcjEuMTQgTWFrZWZpbGUKLS0tIE1ha2VmaWxlCTYgRmViIDIwMDQgMTM6MTI6MzQgLTAwMDAJ MS4xNAorKysgTWFrZWZpbGUJMTIgRGVjIDIwMDYgMDg6NTA6MDkgLTAwMDAKQEAgLTcsNyArNyw3 IEBACiAKIFBPUlROQU1FPQl4YmF0dGJhcgogUE9SVFZFUlNJT049CTEuNC4yCi1QT1JUUkVWSVNJ T049CTIKK1BPUlRSRVZJU0lPTj0JMwogQ0FURUdPUklFUz0Jc3lzdXRpbHMKIE1BU1RFUl9TSVRF Uz0JaHR0cDovL2lwbGFiLmFpc3QtbmFyYS5hYy5qcC9tZW1iZXIvc3VndXJ1LwogRElTVE5BTUU9 CSR7UE9SVE5BTUV9XyR7UE9SVFZFUlNJT059CkBAIC0xNSwxMiArMTUsMjQgQEAKIE1BSU5UQUlO RVI9CXN1bWlrYXdhQEZyZWVCU0Qub3JnCiBDT01NRU5UPQlTaW1wbGUgYmF0dGVyeSBtZXRlcgog Ci1PTkxZX0ZPUl9BUkNIUz0JaTM4NgotCiBVU0VfSU1BS0U9CXllcwogVVNFX1hfUFJFRklYPQl5 ZXMKIFdSS1NSQz0JCSR7V1JLRElSfS94YmF0dGJhci0ke1BPUlRWRVJTSU9OfQogTUFOMT0JCXhi YXR0YmFyLjEKIFBMSVNUX0ZJTEVTPQliaW4veGJhdHRiYXIKIAotLmluY2x1ZGUgPGJzZC5wb3J0 Lm1rPgorT1BUSU9OUz0JQVBNCSJVc2UgQVBNIEludGVyZmFjZSBmb3IgQmF0dGVyeSBTdGF0dXMi CU9GRiBcCisJCUFDUEkJIlVzZSBBQ1BJIEludGVyZmFjZSBmb3IgQmF0dGVyeSBTdGF0dXMiIE9O CisKKy5pbmNsdWRlIDxic2QucG9ydC5wcmUubWs+CisuaWYgZGVmaW5lZChXSVRIT1VUX0FQTSkg fHwgJHtBUkNIfSAhPSAiaTM4NiIKK0NGTEFHUys9CS1EQUNQSV9JTlRFUkZBQ0UKKy5lbmRpZgor CisuaWYgZGVmaW5lZChXSVRIX0FQTSkgJiYgZGVmaW5lZChXSVRIX0FDUEkpCitwcmUtZXZlcnl0 aGluZzo6CisJQCR7RUNIT19NU0d9ICJXSVRIX0FQTSBhbmQgV0lUSF9BQ1BJIGJvdGggZGVmaW5l ZCwgY2hvb3NlIG9uZS4iCisJQCR7RkFMU0V9CisuZW5kaWYKKworLmluY2x1ZGUgPGJzZC5wb3J0 LnBvc3QubWs+CkluZGV4OiBmaWxlcy9wYXRjaC1hYgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiBmaWxl cy9wYXRjaC1hYgpkaWZmIC1OIGZpbGVzL3BhdGNoLWFiCi0tLSBmaWxlcy9wYXRjaC1hYgkzMSBE ZWMgMjAwMSAwOTo0Nzo1OCAtMDAwMAkxLjEKKysrIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAw OjAwIC0wMDAwCkBAIC0xLDEzICswLDAgQEAKLS0tLSB4YmF0dGJhci5jLm9sZAlNb24gRGVjIDMx IDAzOjMyOjA0IDIwMDEKLSsrKyB4YmF0dGJhci5jCU1vbiBEZWMgMzEgMDM6MzI6MDggMjAwMQot QEAgLTUyMiw4ICs1MjIsOCBAQAotICAgaW50IGZkLCByLCBwOwotICAgc3RydWN0IGFwbV9pbmZv ICAgICBpbmZvOwotIAotLSAgaWYgKChmZCA9IG9wZW4oQVBNREVWMjEsIE9fUkRXUikpID09IC0x ICYmCi0tICAgICAgKGZkID0gb3BlbihBUE1ERVYyMiwgT19SRFdSKSkgPT0gLTEpIHsKLSsgIGlm ICgoZmQgPSBvcGVuKEFQTURFVjIxLCBPX1JET05MWSkpID09IC0xICYmCi0rICAgICAgKGZkID0g b3BlbihBUE1ERVYyMiwgT19SRE9OTFkpKSA9PSAtMSkgewotICAgICBmcHJpbnRmKHN0ZGVyciwg InhiYXR0YmFyOiBjYW5ub3Qgb3BlbiBhcG0gZGV2aWNlXG4iKTsKLSAgICAgZXhpdCgxKTsKLSAg IH0KSW5kZXg6IGZpbGVzL3BhdGNoLXhiYXR0YmFyLmMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogZmls ZXMvcGF0Y2gteGJhdHRiYXIuYwpkaWZmIC1OIGZpbGVzL3BhdGNoLXhiYXR0YmFyLmMKLS0tIC9k ZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBmaWxlcy9wYXRjaC14YmF0dGJh ci5jCTEyIERlYyAyMDA2IDA4OjA2OjUwIC0wMDAwCkBAIC0wLDAgKzEsNjYgQEAKKy0tLSB4YmF0 dGJhci5jLm9yaWcJVGh1IEZlYiAgMSAyMzoyNToyOSAyMDAxCisrKysgeGJhdHRiYXIuYwlUdWUg RGVjIDEyIDAyOjA1OjU5IDIwMDYKK0BAIC01MDEsNiArNTAxLDQzIEBACisgCisgI2lmZGVmIF9f RnJlZUJTRF9fCisgCisrI2lmZGVmIEFDUElfSU5URVJGQUNFCisrCisrI2luY2x1ZGUgPHN5cy90 eXBlcy5oPgorKyNpbmNsdWRlIDxzeXMvc3lzY3RsLmg+CisrCisraW50IGZpcnN0ID0gMTsKKyt2 b2lkIGJhdHRlcnlfY2hlY2sodm9pZCkKKyt7CisrICBpbnQgciwgcDsKKysgIHNpemVfdCByX3Np emUsIHBfc2l6ZTsKKysKKysgICsrZWxhcHNlZF90aW1lOworKworKyAgLyogZ2V0IGN1cnJlbnQg c3RhdHVzICovCisrICByX3NpemUgPSBzaXplb2Yocik7CisrICBpZiAoc3lzY3RsYnluYW1lKCJo dy5hY3BpLmJhdHRlcnkubGlmZSIsICZyLCAmcl9zaXplLCBOVUxMLCAwKSA9PSAtMSkgeworKyAg ICBmcHJpbnRmKHN0ZGVyciwgInhiYXR0YmFyOiBjYW4gbm90IGdldCBiYXR0ZXJ5IHN0YXR1c1xu Iik7CisrICAgIGV4aXQoMSk7CisrICB9CisrCisrICAvKiBnZXQgQUMtbGluZSBzdGF0dXMgKi8K KysgIHBfc2l6ZSA9IHNpemVvZihwKTsKKysgIGlmIChzeXNjdGxieW5hbWUoImh3LmFjcGkuYWNs aW5lIiwgJnAsICZwX3NpemUsIE5VTEwsIDApID09IC0xKSB7CisrICAgIGZwcmludGYoc3RkZXJy LCAieGJhdHRiYXI6IGNhbiBub3QgZ2V0IEFDLWxpbmUgc3RhdHVzXG4iKTsKKysgICAgZXhpdCgx KTsKKysgIH0KKysKKysgIGlmIChmaXJzdCB8fCBhY19saW5lICE9IHAgfHwgYmF0dGVyeV9sZXZl bCAhPSByKSB7CisrICAgIGZpcnN0ID0gMDsKKysgICAgYWNfbGluZSA9IHA7CisrICAgIGJhdHRl cnlfbGV2ZWwgPSByOworKyAgICByZWRyYXcoKTsKKysgIH0KKysgIHNpZ25hbChTSUdBTFJNLCAo dm9pZCAqKShiYXR0ZXJ5X2NoZWNrKSk7CisrfQorKyNlbHNlIC8qIEFDUElfSU5URVJGQUNFICov CisrCisgI2luY2x1ZGUgPG1hY2hpbmUvYXBtX2Jpb3MuaD4KKyAKKyAjZGVmaW5lIEFQTURFVjIx ICAgICAgICIvZGV2L2FwbTAiCitAQCAtNTIyLDggKzU1OSw4IEBACisgICBpbnQgZmQsIHIsIHA7 CisgICBzdHJ1Y3QgYXBtX2luZm8gICAgIGluZm87CisgCistICBpZiAoKGZkID0gb3BlbihBUE1E RVYyMSwgT19SRFdSKSkgPT0gLTEgJiYKKy0gICAgICAoZmQgPSBvcGVuKEFQTURFVjIyLCBPX1JE V1IpKSA9PSAtMSkgeworKyAgaWYgKChmZCA9IG9wZW4oQVBNREVWMjEsIE9fUkRPTkxZKSkgPT0g LTEgJiYKKysgICAgICAoZmQgPSBvcGVuKEFQTURFVjIyLCBPX1JET05MWSkpID09IC0xKSB7Cisg ICAgIGZwcmludGYoc3RkZXJyLCAieGJhdHRiYXI6IGNhbm5vdCBvcGVuIGFwbSBkZXZpY2VcbiIp OworICAgICBleGl0KDEpOworICAgfQorQEAgLTU3Miw2ICs2MDksOCBAQAorICAgfQorICAgc2ln bmFsKFNJR0FMUk0sICh2b2lkICopKGJhdHRlcnlfY2hlY2spKTsKKyB9CisrCisrI2VuZGlmIC8q IEFQTSBJTlRFUkZBQ0UgKi8KKyAKKyAjZW5kaWYgLyogX19GcmVlQlNEX18gKi8KKyAK ------=_Part_155760_3393920.1165913832455--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?790a9fff0612120057j7ab3c6fdxb3761c7e6ef4cae6>