From owner-svn-src-head@FreeBSD.ORG  Fri Jun  3 20:43:13 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 088FF106567E;
	Fri,  3 Jun 2011 20:43:13 +0000 (UTC)
	(envelope-from andreast@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EBF148FC0C;
	Fri,  3 Jun 2011 20:43:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p53KhCox079236;
	Fri, 3 Jun 2011 20:43:12 GMT (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p53KhC8v079233;
	Fri, 3 Jun 2011 20:43:12 GMT (envelope-from andreast@svn.freebsd.org)
Message-Id: <201106032043.p53KhC8v079233@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Fri, 3 Jun 2011 20:43:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222659 - head/sys/powerpc/powermac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2011 20:43:13 -0000

Author: andreast
Date: Fri Jun  3 20:43:12 2011
New Revision: 222659
URL: http://svn.freebsd.org/changeset/base/222659

Log:
  - Introduce a define for ZERO_C_TO_K.
  - Fix the printing of the temperature when we exceed the critical value.
  
  Approved by:	nwhitehorn (mentor)

Modified:
  head/sys/powerpc/powermac/powermac_thermal.c
  head/sys/powerpc/powermac/powermac_thermal.h

Modified: head/sys/powerpc/powermac/powermac_thermal.c
==============================================================================
--- head/sys/powerpc/powermac/powermac_thermal.c	Fri Jun  3 18:58:32 2011	(r222658)
+++ head/sys/powerpc/powermac/powermac_thermal.c	Fri Jun  3 20:43:12 2011	(r222659)
@@ -109,9 +109,10 @@ pmac_therm_manage_fans(void)
 			printf("WARNING: Current temperature (%s: %d.%d C) "
 			    "exceeds critical temperature (%d.%d C)! "
 			    "Shutting down!\n", sensor->sensor->name,
-			    sensor->last_val / 10, sensor->last_val % 10,
-			    sensor->sensor->max_temp / 10,
-			    sensor->sensor->max_temp % 10);
+			       (sensor->last_val - ZERO_C_TO_K) / 10,
+			       (sensor->last_val - ZERO_C_TO_K) % 10,
+			       (sensor->sensor->max_temp - ZERO_C_TO_K) / 10,
+			       (sensor->sensor->max_temp - ZERO_C_TO_K) % 10);
 			shutdown_nice(RB_POWEROFF);
 		}
 	}

Modified: head/sys/powerpc/powermac/powermac_thermal.h
==============================================================================
--- head/sys/powerpc/powermac/powermac_thermal.h	Fri Jun  3 18:58:32 2011	(r222658)
+++ head/sys/powerpc/powermac/powermac_thermal.h	Fri Jun  3 20:43:12 2011	(r222659)
@@ -29,6 +29,8 @@
 #ifndef _POWERPC_POWERMAC_POWERMAC_THERMAL_H
 #define _POWERPC_POWERMAC_POWERMAC_THERMAL_H
 
+#define ZERO_C_TO_K 2732
+
 struct pmac_fan {
 	int min_rpm, max_rpm, default_rpm;