PERFORCE change 222670 for review

[Robert Watson]

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

Change 222670 by rwatson at 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";
 		};
 	};
 };