[Pkg-mactel-devel] Bug#761809: Add crontrol for a fan3, eg. CPU

[Anton Lundin]

Package: macfanctld
Severity: important
Tags: patch

On my iMac11,2 i have 3 fans that needs to be controlled, so this just
extens the current code to control the 3rd fan in the same way as the
first two.

It has also bin reported that the same problem exists on iMac8,1 too.

Without this patch, those models might overheat due to the fact that the
last fan isn't spun up on thermal load.


This bug report and patch was sent to the author of this code 1.5 years
ago, but no reaction have happened since then, so i send this to Debian
in the hope of having it included as a distro-patch so it automatically
ends up on my machines without having to patch the package manually, and
the patch doesn't get accidentally removed on package upgrade.


//Anton


-- 
Anton Lundin	+46702-161604
-------------- next part --------------
>From c0d40f2ebab2a630bb07d2ebf50f64d6843e753e Mon Sep 17 00:00:00 2001
From: Anton Lundin <anton at dohi.se>
Date: Tue, 28 May 2013 16:34:09 +0200
Subject: [PATCH] Add crontrol for a fan3, eg. CPU

On my iMac11,2 i have 3 fans that needs to be controlled, so this just
extens the current code to control the 3rd fan in the same way as the
first two.
---
 control.c | 71 +++++++++++++++++++++++++++------------------------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/control.c b/control.c
index 1612983..556463d 100644
--- a/control.c
+++ b/control.c
@@ -72,8 +72,10 @@ struct sensor
 char base_path[PATH_MAX];
 char fan1_min[PATH_MAX];
 char fan2_min[PATH_MAX];
+char fan3_min[PATH_MAX];
 char fan1_man[PATH_MAX];
 char fan2_man[PATH_MAX];
+char fan3_man[PATH_MAX];
 
 int sensor_count = 0;
 int fan_count = 0;
@@ -165,8 +167,10 @@ void find_applesmc()
 
 	sprintf(fan1_min, "%s/fan1_min", base_path);
 	sprintf(fan2_min, "%s/fan2_min", base_path);
+	sprintf(fan3_min, "%s/fan3_min", base_path);
 	sprintf(fan1_man, "%s/fan1_manual", base_path);
 	sprintf(fan2_man, "%s/fan2_manual", base_path);
+	sprintf(fan3_man, "%s/fan3_manual", base_path);
 
 	printf("Found applesmc at %s\n", base_path);
 }
@@ -278,44 +282,25 @@ void calc_fan()
 
 void set_fan()
 {
-	char buf[16];
-
-	// update fan 1
-
-	int fd = open(fan1_min, O_WRONLY);
-	if(fd < 0)
-	{
-		printf("Error: Can't open %s\n", fan1_min);
-	}
-	else
-	{
-		sprintf(buf, "%d", fan_speed);
-		write(fd, buf, strlen(buf));
-		close(fd);
-	}
-
-	// set fan 1 manual to zero
-
-	fd = open(fan1_man, O_WRONLY);
-	if(fd < 0)
+	struct
 	{
-		printf("Error: Can't open %s\n", fan1_man);
+		char *fan_min;
+		char *fan_man;
 	}
-	else
-	{
-		strcpy(buf, "0");
-		write(fd, buf, strlen(buf));
-		close(fd);
-	}
-
-	// update fan 2
-
-	if(fan_count > 1)
-	{
-		fd = open(fan2_min, O_WRONLY);
+	fans[] = {
+		{fan1_min, fan1_man},
+		{fan2_min, fan2_man},
+		{fan3_min, fan3_man}
+	};
+	int fan_no;
+
+	for (fan_no = 0; fan_no < fan_count; fan_no++) {
+		char buf[16];
+		int fd = open(fans[fan_no].fan_min, O_WRONLY);
+		// update fan
 		if(fd < 0)
 		{
-			printf("Error: Can't open %s\n", fan2_min);
+			printf("Error: Can't open %s\n", fans[fan_no].fan_min);
 		}
 		else
 		{
@@ -324,12 +309,11 @@ void set_fan()
 			close(fd);
 		}
 
-		// set fan 2 manual to zero
-
-		fd = open(fan2_man, O_WRONLY);
+		// set fan manual to zero
+		fd = open(fans[fan_no].fan_man, O_WRONLY);
 		if(fd < 0)
 		{
-			printf("Error: Can't open %s\n", fan2_man);
+			printf("Error: Can't open %s\n", fans[fan_no].fan_man);
 		}
 		else
 		{
@@ -338,7 +322,6 @@ void set_fan()
 			close(fd);
 		}
 	}
-
 	fflush(stdout);
 }
 
@@ -383,8 +366,14 @@ void scan_sensors()
 	}
 	else
 	{
-		fan_count = 2;
-		printf("Found 2 fans.\n");
+		result = stat(fan3_min, &buf);
+		if (result != 0) {
+			fan_count = 2;
+			printf("Found 2 fans.\n");
+		} else {
+			fan_count = 3;
+			printf("Found 3 fans.\n");
+		}
 	}
 
 	// count number of sensors
-- 
2.0.0