Change in ...coreboot[master]: mb/ibase/mb899/superio_hwm.c: Fix coding style - coreboot-gerrit

30 Jan 2019

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31156
Change subject: mb/ibase/mb899/superio_hwm.c: Fix coding style
......................................................................
mb/ibase/mb899/superio_hwm.c: Fix coding style
Change-Id: I6ce74a006a5bf461a1f33203a9e5ea37a1bc7d7b
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
M src/mainboard/ibase/mb899/superio_hwm.c
1 file changed, 62 insertions(+), 47 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/31156/1

diff --git a/src/mainboard/ibase/mb899/superio_hwm.c b/src/mainboard/ibase/mb899/superio_hwm.c
index 7fb45f9..5e3d5c5 100644
--- a/src/mainboard/ibase/mb899/superio_hwm.c
+++ b/src/mainboard/ibase/mb899/superio_hwm.c
@@ -29,7 +29,7 @@
 #define FAN_CRUISE_CONTROL_THERMAL	2
#define FAN_SPEED_5625	0
-//#define FAN_TEMPERATURE_30DEGC	0
+#define FAN_TEMPERATURE_30DEGC	0
#define HWM_BASE 0x290
@@ -52,10 +52,10 @@
 // FANIN Target Speed Register
 // FANIN = 337500 / RPM
 struct fan_speed fan_speeds[] = {
-	{ 0x3c, 5625 }, { 0x41, 5192 }, { 0x47, 4753 }, { 0x4e, 4326 },
-	{ 0x56, 3924 }, { 0x5f, 3552 }, { 0x69, 3214 }, { 0x74, 2909 },
-	{ 0x80, 2636 }, { 0x8d, 2393 }, { 0x9b, 2177 }, { 0xaa, 1985 },
-	{ 0xba, 1814 }, { 0xcb, 1662 }, { 0xdd, 1527 }, { 0xf0, 1406 }
+	{0x3c, 5625}, {0x41, 5192}, {0x47, 4753}, {0x4e, 4326},
+	{0x56, 3924}, {0x5f, 3552}, {0x69, 3214}, {0x74, 2909},
+	{0x80, 2636}, {0x8d, 2393}, {0x9b, 2177}, {0xaa, 1985},
+	{0xba, 1814}, {0xcb, 1662}, {0xdd, 1527}, {0xf0, 1406}
 };
struct temperature {
@@ -64,94 +64,109 @@
 };
struct temperature temperatures[] = {
-	{ 30,  86 }, { 33,  91 }, { 36,  96 }, { 39, 102 },
-	{ 42, 107 }, { 45, 113 }, { 48, 118 }, { 51, 123 },
-	{ 54, 129 }, { 57, 134 }, { 60, 140 }, { 63, 145 },
-	{ 66, 150 }, { 69, 156 }, { 72, 161 }, { 75, 167 }
+	{30, 86}, {33, 91}, {36, 96}, {39, 102},
+	{42, 107}, {45, 113}, {48, 118}, {51, 123},
+	{54, 129}, {57, 134}, {60, 140}, {63, 145},
+	{66, 150}, {69, 156}, {72, 161}, {75, 167}
 };
void hwm_setup(void)
 {
-	int cpufan_control = 0, sysfan_control = 0;
-	int cpufan_speed = 0, sysfan_speed = 0;
-	int cpufan_temperature = 0, sysfan_temperature = 0;
+	int cpufan_control = FAN_CRUISE_CONTROL_DISABLED;
+	int cpufan_speed = FAN_SPEED_5625;
+	int cpufan_temperature = FAN_TEMPERATURE_30DEGC;
+	int sysfan_control = FAN_CRUISE_CONTROL_DISABLED;
+	int sysfan_speed = FAN_SPEED_5625;
+	int sysfan_temperature = FAN_TEMPERATURE_30DEGC;
-	cpufan_control = FAN_CRUISE_CONTROL_DISABLED;
    get_option(&cpufan_control, "cpufan_cruise_control");
-	cpufan_speed = FAN_SPEED_5625;
    get_option(&cpufan_speed, "cpufan_speed");
-	//cpufan_temperature = FAN_TEMPERATURE_30DEGC;
    //get_option(&cpufan_temperature, "cpufan_temperature");
-	sysfan_control = FAN_CRUISE_CONTROL_DISABLED;
    get_option(&sysfan_control, "sysfan_cruise_control");
-	sysfan_speed = FAN_SPEED_5625;
    get_option(&sysfan_speed, "sysfan_speed");
-	//sysfan_temperature = FAN_TEMPERATURE_30DEGC;
    //get_option(&sysfan_temperature, "sysfan_temperature");
// hwm_write(0x31, 0x20); // AVCC high limit
    // hwm_write(0x34, 0x06); // VIN2 low limit
hwm_bank(0);
-	hwm_write(0x59, 0x20); // Diode Selection
-	hwm_write(0x5d, 0x0f); // All Sensors Diode, not Thermistor
+	hwm_write(0x59, 0x20);	// Diode Selection
+	hwm_write(0x5d, 0x0f);	// All Sensors Diode, not Thermistor
hwm_bank(4);
-	hwm_write(0x54, 0xf1); // SYSTIN temperature offset
-	hwm_write(0x55, 0x19); // CPUTIN temperature offset
-	hwm_write(0x56, 0xfc); // AUXTIN temperature offset
+	hwm_write(0x54, 0xf1);	// SYSTIN temperature offset
+	hwm_write(0x55, 0x19);	// CPUTIN temperature offset
+	hwm_write(0x56, 0xfc);	// AUXTIN temperature offset
-	hwm_bank(0x80); // Default
+	hwm_bank(0x80);		// Default
u8 fan_config = 0;
    // 00 FANOUT is Manual Mode
    // 01 FANOUT is Thermal Cruise Mode
    // 10 FANOUT is Fan Speed Cruise Mode
    switch (cpufan_control) {
-	case FAN_CRUISE_CONTROL_SPEED:	 fan_config |= (2 << 4); break;
-	case FAN_CRUISE_CONTROL_THERMAL: fan_config |= (1 << 4); break;
+	case FAN_CRUISE_CONTROL_SPEED:
+		fan_config |= (2 << 4);
+		break;
+	case FAN_CRUISE_CONTROL_THERMAL:
+		fan_config |= (1 << 4);
+		break;
    }
    switch (sysfan_control) {
-	case FAN_CRUISE_CONTROL_SPEED:	 fan_config |= (2 << 2); break;
-	case FAN_CRUISE_CONTROL_THERMAL: fan_config |= (1 << 2); break;
+	case FAN_CRUISE_CONTROL_SPEED:
+		fan_config |= (2 << 2);
+		break;
+	case FAN_CRUISE_CONTROL_THERMAL:
+		fan_config |= (1 << 2);
+		break;
    }
    // This register must be written first
    hwm_write(0x04, fan_config);
switch (cpufan_control) {
    case FAN_CRUISE_CONTROL_SPEED:
-		printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to %d RPM\n",
-				fan_speeds[cpufan_speed].fan_speed);
-		hwm_write(0x06, fan_speeds[cpufan_speed].fan_in);  // CPUFANIN target speed
+		printk(BIOS_DEBUG,
+		       "Fan Cruise Control setting CPU fan to %d RPM\n",
+		       fan_speeds[cpufan_speed].fan_speed);
+		// CPUFANIN target speed
+		hwm_write(0x06, fan_speeds[cpufan_speed].fan_in);
    	break;
    case FAN_CRUISE_CONTROL_THERMAL:
-		printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to activation at %d deg C/%d deg F\n",
-				temperatures[cpufan_temperature].deg_celsius,
-				temperatures[cpufan_temperature].deg_fahrenheit);
-		hwm_write(0x06, temperatures[cpufan_temperature].deg_celsius);  // CPUFANIN target temperature
+		printk(BIOS_DEBUG,
+		       "Fan Cruise Control setting CPU fan to activation "
+		       "at %d deg C/%d deg F\n",
+		       temperatures[cpufan_temperature].deg_celsius,
+		       temperatures[cpufan_temperature].deg_fahrenheit);
+		// CPUFANIN target temperature
+		hwm_write(0x06, temperatures[cpufan_temperature].deg_celsius);
    	break;
    }
switch (sysfan_control) {
    case FAN_CRUISE_CONTROL_SPEED:
-		printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to %d RPM\n",
-				fan_speeds[sysfan_speed].fan_speed);
-		hwm_write(0x05, fan_speeds[sysfan_speed].fan_in);  // SYSFANIN target speed
+		printk(BIOS_DEBUG,
+		       "Fan Cruise Control setting system fan to %d RPM\n",
+		       fan_speeds[sysfan_speed].fan_speed);
+		// SYSFANIN target speed
+		hwm_write(0x05, fan_speeds[sysfan_speed].fan_in);
    	break;
    case FAN_CRUISE_CONTROL_THERMAL:
-		printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to activation at %d deg C/%d deg F\n",
-				temperatures[sysfan_temperature].deg_celsius,
-				temperatures[sysfan_temperature].deg_fahrenheit);
-		hwm_write(0x05, temperatures[sysfan_temperature].deg_celsius); // SYSFANIN target temperature
+		printk(BIOS_DEBUG,
+		       "Fan Cruise Control setting system fan to activation "
+		       "at %d deg C/%d deg F\n",
+		       temperatures[sysfan_temperature].deg_celsius,
+		       temperatures[sysfan_temperature].deg_fahrenheit);
+		// SYSFANIN target temperature
+		hwm_write(0x05, temperatures[sysfan_temperature].deg_celsius);
    	break;
    }
-	hwm_write(0x0e, 0x02); // Fan Output Step Down Time
-	hwm_write(0x0f, 0x02); // Fan Output Step Up Time
+	hwm_write(0x0e, 0x02);	// Fan Output Step Down Time
+	hwm_write(0x0f, 0x02);	// Fan Output Step Up Time
-	hwm_write(0x47, 0xaf); // FAN divisor register
-	hwm_write(0x4b, 0x84); // AUXFANIN speed divisor
+	hwm_write(0x47, 0xaf);	// FAN divisor register
+	hwm_write(0x4b, 0x84);	// AUXFANIN speed divisor
-	hwm_write(0x40, 0x01); // Init, but no SMI#
+	hwm_write(0x40, 0x01);	// Init, but no SMI#
 }
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/31156
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6ce74a006a5bf461a1f33203a9e5ea37a1bc7d7b
Gerrit-Change-Number: 31156
Gerrit-PatchSet: 1
Gerrit-Owner: HAOUAS Elyes ehaouas@noos.fr
Gerrit-MessageType: newchange



    