diff options
author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-02-01 20:05:08 +0000 |
---|---|---|
committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-02-01 20:05:08 +0000 |
commit | 0bdafa9ce292c464890affc3c2c0b381cb30ec81 (patch) | |
tree | 01cdd838c1c83f04a6b0420f0ed446f4da9a39ed /sysutils/xmbmon/files/patch-sens_lm85.c | |
parent | Update to DAT 4687 (diff) |
- Split into two ports: mbmon (tty) and xmbmon (X)
- Remove -s from LDFLAGS (do not unconditionally strip, let
${INSTALL_PROGRAM} do it)
- Use OPTIONS
- Decouple manpage installation from NOPORTDOCS
- xmbmon:
- use X prefix
- install xmbmon.resources into the appropriate location
- do not require a font package: use fixed rather than Helvetica [1]
- Take maintainership
[1]:
PR: ports/92600
Submitted by: Daniel Berlin <mail@daniel-berlin.de>
Notes
Notes:
svn path=/head/; revision=155020
Diffstat (limited to 'sysutils/xmbmon/files/patch-sens_lm85.c')
-rw-r--r-- | sysutils/xmbmon/files/patch-sens_lm85.c | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/sysutils/xmbmon/files/patch-sens_lm85.c b/sysutils/xmbmon/files/patch-sens_lm85.c deleted file mode 100644 index 3caa2c7a9754..000000000000 --- a/sysutils/xmbmon/files/patch-sens_lm85.c +++ /dev/null @@ -1,71 +0,0 @@ -$FreeBSD$ - ---- sens_lm85.c Mon Oct 13 10:12:58 2003 -+++ sens_lm85.c Wed Dec 21 15:37:56 2005 -@@ -53,7 +53,6 @@ - #define ADM_24FAN(nr) (0x28 + (nr)) - #define ADM_24FANDIV 0x47 - #define ADM_24MODE 0x16 --#define ADM_TEMPOFF(nr) (0x70 + (nr)) - #define ADM_EXTRES1 0x76 - #define ADM_EXTRES2 0x77 - #define ADM_FANPPR 0x7B -@@ -213,7 +212,7 @@ - static float lm85_temp( LM_METHODS *method, int no ) - { - int n, ne; -- float ext = 0.0, offset = 0.0; -+ float ext = 0.0; - - if (no < 0 || 2 < no) - return 0xFFFF; -@@ -226,18 +225,20 @@ - } else if (lm85chipid >= ADM1027) { - ne = method->Read(ADM_EXTRES2); - ext = 0.25 * ((ne >> ((no + 1) * 2)) & 0x03); -- n = method->Read(ADM_TEMPOFF(no)); -- if (n > 0x80) -- n -= 0xFF; -- offset = (float) n; -+ /* Unlock temperature registers. */ -+ if (no != 0) method->Read(LM85_TEMP(0)); -+ if (no != 1) method->Read(LM85_TEMP(1)); -+ if (no != 2) method->Read(LM85_TEMP(2)); -+ /* Unlock voltage register. */ -+ method->Read(LM85_VOLT(4)); - } - n = method->Read(LM85_TEMP(no)); - if (n == 0x80) - return 0xFFFF; - else if (n > 0x80) -- return (float) (n - 0xFF) + ext - offset; -+ return (float) (n - 0xFF) + ext; - else -- return (float) n + ext - offset; -+ return (float) n + ext; - } - - -@@ -262,10 +263,20 @@ - return 0xFFFF; - - if (lm85chipid >= ADM1027) { -- if (no == 4) -+ if (no == 4) { - ne = method->Read(ADM_EXTRES2) & 0x03; -- else -+ /* Unlock temperature registers. */ -+ method->Read(LM85_TEMP(0)); -+ method->Read(LM85_TEMP(1)); -+ method->Read(LM85_TEMP(2)); -+ } else { - ne = (method->Read(ADM_EXTRES1) >> (no * 2)) & 0x03; -+ /* Unlock voltage registers. */ -+ if (no != 0) method->Read(LM85_VOLT(0)); -+ if (no != 1) method->Read(LM85_VOLT(1)); -+ if (no != 2) method->Read(LM85_VOLT(2)); -+ if (no != 3) method->Read(LM85_VOLT(3)); -+ } - } - n = method->Read(LM85_VOLT(no)); - if (lm85chipid >= ADM1027) |