From owner-svn-src-head@FreeBSD.ORG Sat Jun 4 09:19:53 2011 Return-Path: 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 7BE2D1065672; Sat, 4 Jun 2011 09:19:53 +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 6BC8D8FC13; Sat, 4 Jun 2011 09:19:53 +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 p549JrHO002740; Sat, 4 Jun 2011 09:19:53 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p549Jr0f002738; Sat, 4 Jun 2011 09:19:53 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201106040919.p549Jr0f002738@svn.freebsd.org> From: Andreas Tobler Date: Sat, 4 Jun 2011 09:19:53 +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: r222673 - head/sys/dev/iicbus 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2011 09:19:53 -0000 Author: andreast Date: Sat Jun 4 09:19:53 2011 New Revision: 222673 URL: http://svn.freebsd.org/changeset/base/222673 Log: Replace the FCU_ZERO_C_TO_K with the ZERO_C_TO_K from powermac_thermal.h. Approved by: nwhitehorn (mentor) Modified: head/sys/dev/iicbus/ds1775.c Modified: head/sys/dev/iicbus/ds1775.c ============================================================================== --- head/sys/dev/iicbus/ds1775.c Sat Jun 4 08:24:58 2011 (r222672) +++ head/sys/dev/iicbus/ds1775.c Sat Jun 4 09:19:53 2011 (r222673) @@ -51,8 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include -#define FCU_ZERO_C_TO_K 2732 - /* Drivebay sensor: LM75/DS1775. */ #define DS1775_TEMP 0x0 @@ -211,12 +209,12 @@ ds1775_start(void *xdev) /* Make up target temperatures. These are low, for the drive bay. */ if (sc->sc_sensor.zone == 0) { - sc->sc_sensor.target_temp = 500 + FCU_ZERO_C_TO_K; - sc->sc_sensor.max_temp = 600 + FCU_ZERO_C_TO_K; + sc->sc_sensor.target_temp = 500 + ZERO_C_TO_K; + sc->sc_sensor.max_temp = 600 + ZERO_C_TO_K; } else { - sc->sc_sensor.target_temp = 300 + FCU_ZERO_C_TO_K; - sc->sc_sensor.max_temp = 600 + FCU_ZERO_C_TO_K; + sc->sc_sensor.target_temp = 300 + ZERO_C_TO_K; + sc->sc_sensor.max_temp = 600 + ZERO_C_TO_K; } sc->sc_sensor.read = @@ -248,7 +246,7 @@ ds1775_sensor_read(struct ds1775_softc * /* The default mode of the ADC is 9 bit, the resolution is 0.5 C per bit. The temperature is in tenth kelvin. */ - return (((int16_t)(read) >> 7) * 5 + FCU_ZERO_C_TO_K); + return (((int16_t)(read) >> 7) * 5 + ZERO_C_TO_K); } static int