From owner-p4-projects@FreeBSD.ORG  Wed Mar  6 16:09:10 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id BBA06B38; Wed,  6 Mar 2013 16:09:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 796B4B36
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 16:09:10 +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 5E825384
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 16:09:10 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r26G9APp033116
 for <perforce@freebsd.org>; Wed, 6 Mar 2013 16:09:10 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 r26G99GF033112
 for perforce@freebsd.org; Wed, 6 Mar 2013 16:09:09 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 6 Mar 2013 16:09:09 GMT
Message-Id: <201303061609.r26G99GF033112@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 222670 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 16:09:10 -0000

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

Change 222670 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/06 16:08:52

	On reflection, rename the fan/temperature control device to make it
	more clear that it's DE4-related, and can only be used by de4ctl.
	
	Fix a bug in de4ctl involving silly misuse of string functions (doh).

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/de4ctl/de4ctl.c#3 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#17 edit

Differences ...

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

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#define	PATH_TEMPFANCTL	"/dev/tempfanctl"
+#define	PATH_TEMPFANCTL	"/dev/de4tempfan"
 
 #define	OFF_TEMP	0
 #define	OFF_FAN	4
@@ -120,9 +120,9 @@
 	if (argc < 1)
 		usage();
 
-	if (strcmp(argv[0], "fan"))
+	if (strcmp(argv[0], "fan") == 0)
 		do_fan();
-	else if (strcmp(argv[0], "temp"))
+	else if (strcmp(argv[0], "temp") == 0)
 		do_temp();
 	else
 		usage();

==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#17 (text+ko) ====

@@ -154,7 +154,7 @@
 			reg = <0x7f00c000 0x8>;
 			sri-cambridge,width = <4>;
 			sri-cambridge,fileio = "rw";
-			sri-cambridge,devname = "tempfanctl";
+			sri-cambridge,devname = "de4tempfan";
 		};
 	};
 };