From owner-p4-projects@FreeBSD.ORG  Wed Mar  6 15:30:27 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id AC6EE1AA; Wed,  6 Mar 2013 15:30:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6E86F1A8
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 15:30:27 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5DB0B162
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 15:30:27 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r26FURwQ030255
 for <perforce@freebsd.org>; Wed, 6 Mar 2013 15:30:27 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r26FURoT030252
 for perforce@freebsd.org; Wed, 6 Mar 2013 15:30:27 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 6 Mar 2013 15:30:27 GMT
Message-Id: <201303061530.r26FURoT030252@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 222669 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 15:30:27 -0000

http://p4web.freebsd.org/@@222669?ac=10

Change 222669 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/06 15:30:23

	Fan/temperature-control device is little-endian, so byte swap as
	needed.
	
	Implement "-q" so that you can request just the numeric value
	without a label.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/de4ctl/de4ctl.c#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd/de4ctl/de4ctl.c#2 (text+ko) ====

@@ -31,6 +31,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/endian.h>
 
 #include <err.h>
 #include <fcntl.h>
@@ -50,8 +51,7 @@
 usage(void)
 {
 
-	fprintf(stderr, "usage: de4ctl temp\n");
-	fprintf(stderr, "usage: de4ctl fan\n");
+	fprintf(stderr, "usage: de4ctl [-q] fan | temp\n");
 	exit(0);
 }
 
@@ -71,7 +71,7 @@
 		err(1, "%s", PATH_TEMPFANCTL);
 	if (len != sizeof(temp))
 		errx(1, "%s: short read", PATH_TEMPFANCTL);
-	printf("temp: %u\n", temp);
+	printf("%s%u\n", qflag ? "" : "temp:\t", le32toh(temp));
 	close(fd);
 }
 
@@ -91,7 +91,7 @@
 		err(1, "%s", PATH_TEMPFANCTL);
 	if (len != sizeof(fan))
 		errx(1, "%s: short read", PATH_TEMPFANCTL);
-	printf("fan: %u\n", fan);
+	printf("%s%u\n", qflag ? "" : "fan:\t", le32toh(fan));
 	close(fd);
 }