diff options
| author | loos <loos@FreeBSD.org> | 2015-02-14 18:37:36 +0000 |
|---|---|---|
| committer | loos <loos@FreeBSD.org> | 2015-02-14 18:37:36 +0000 |
| commit | 2c27c214706a894d470170c16be31383cb43024a (patch) | |
| tree | 56f53def89b7f1587629bad8176e87fa7b42e5de /sys/arm/broadcom | |
| parent | ce3fd33d9a28a62373afe390a26a18bb76293279 (diff) | |
| download | FreeBSD-src-2c27c214706a894d470170c16be31383cb43024a.zip FreeBSD-src-2c27c214706a894d470170c16be31383cb43024a.tar.gz | |
MFC r276296, r277207:
Make consistent use of the correct debug macros across the file.
Fix the C -> K temperature conversion for the dev.cpu.0.temperature sysctl.
Remove the unused temperature conversion macros.
Diffstat (limited to 'sys/arm/broadcom')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c index 7ea95a2..2ea5b49 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c @@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$"); #define MHZ2HZ(freq) ((freq) * (1000 * 1000)) #define OFFSET2MVOLT(val) (1200 + ((val) * 25)) #define MVOLT2OFFSET(val) (((val) - 1200) / 25) -#define RAW2K(temp) (((temp) + 273150) / 1000) -#define K2RAW(temp) (((temp) * 1000) - 273150) #define DEFAULT_ARM_FREQUENCY 700 #define DEFAULT_CORE_FREQUENCY 250 @@ -77,6 +75,7 @@ __FBSDID("$FreeBSD$"); #define MSG_ERROR -999999999 #define MHZSTEP 100 #define HZSTEP (MHZ2HZ(MHZSTEP)) +#define TZ_ZEROC 2732 #define VC_LOCK(sc) do { \ sema_wait(&vc_sema); \ @@ -125,7 +124,7 @@ TUNABLE_INT("hw.bcm2835.cpufreq.verbose", &cpufreq_verbose); static int cpufreq_lowest_freq = DEFAULT_LOWEST_FREQ; TUNABLE_INT("hw.bcm2835.cpufreq.lowest_freq", &cpufreq_lowest_freq); -#ifdef DEBUG +#ifdef PROP_DEBUG static void bcm2835_dump(const void *data, int len) { @@ -1215,7 +1214,7 @@ sysctl_bcm2835_devcpu_temperature(SYSCTL_HANDLER_ARGS) return (EIO); /* 1/1000 celsius (raw) to 1/10 kelvin */ - val = RAW2K(val) * 10; + val = val / 100 + TZ_ZEROC; err = sysctl_handle_int(oidp, &val, 0, req); if (err || !req->newptr) /* error || read request */ |
