diff options
author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2013-11-23 19:22:53 -0600 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-12-02 22:11:20 +0100 |
commit | 72dccce0c9a7cf59ca51a3174fc11eb8899e1761 (patch) | |
tree | 0201395e975f173ebc8badcc952598d559e8a745 /src/mainboard | |
parent | bcfcfa4473357eb6272bc8bcc5e03f4ba517bcd2 (diff) |
global: Fix usage of get_option() to make use of CB_CMOS_ codes
Do not directly check the return value of get_option, but instead compare
the returned value against a CB_CMOS_ error code, or against CB_SUCCESS.
Change-Id: I2fa7761d13ebb5e9b4606076991a43f18ae370ad
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/4266
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/ibase/mb899/mainboard.c | 12 | ||||
-rw-r--r-- | src/mainboard/kontron/986lcd-m/mainboard.c | 12 | ||||
-rw-r--r-- | src/mainboard/kontron/ktqm77/mainboard.c | 4 | ||||
-rw-r--r-- | src/mainboard/lenovo/t60/mainboard.c | 2 | ||||
-rw-r--r-- | src/mainboard/siemens/sitemp_g1p1/mainboard.c | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c index ea3b010df1..373edaec19 100644 --- a/src/mainboard/ibase/mb899/mainboard.c +++ b/src/mainboard/ibase/mb899/mainboard.c @@ -117,18 +117,18 @@ static void hwm_setup(void) int cpufan_speed = 0, sysfan_speed = 0; int cpufan_temperature = 0, sysfan_temperature = 0; - if (get_option(&cpufan_control, "cpufan_cruise_control") < 0) + if (get_option(&cpufan_control, "cpufan_cruise_control") != CB_SUCCESS) cpufan_control = FAN_CRUISE_CONTROL_DISABLED; - if (get_option(&cpufan_speed, "cpufan_speed") < 0) + if (get_option(&cpufan_speed, "cpufan_speed") != CB_SUCCESS) cpufan_speed = FAN_SPEED_5625; - //if (get_option(&cpufan_temperature, "cpufan_temperature") < 0) + //if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS) // cpufan_temperature = FAN_TEMPERATURE_30DEGC; - if (get_option(&sysfan_control, "sysfan_cruise_control") < 0) + if (get_option(&sysfan_control, "sysfan_cruise_control") != CB_SUCCESS) sysfan_control = FAN_CRUISE_CONTROL_DISABLED; - if (get_option(&sysfan_speed, "sysfan_speed") < 0) + if (get_option(&sysfan_speed, "sysfan_speed") != CB_SUCCESS) sysfan_speed = FAN_SPEED_5625; - //if (get_option(&sysfan_temperature, "sysfan_temperature") < 0) + //if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS) // sysfan_temperature = FAN_TEMPERATURE_30DEGC; // hwm_write(0x31, 0x20); // AVCC high limit diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index 0bee70e1ee..f4e1a24b22 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -124,18 +124,18 @@ static void hwm_setup(void) int cpufan_speed = 0, sysfan_speed = 0; int cpufan_temperature = 0, sysfan_temperature = 0; - if (get_option(&cpufan_control, "cpufan_cruise_control") < 0) + if (get_option(&cpufan_control, "cpufan_cruise_control") != CB_SUCCESS) cpufan_control = FAN_CRUISE_CONTROL_DISABLED; - if (get_option(&cpufan_speed, "cpufan_speed") < 0) + if (get_option(&cpufan_speed, "cpufan_speed") != CB_SUCCESS) cpufan_speed = FAN_SPEED_5625; - //if (get_option(&cpufan_temperature, "cpufan_temperature") < 0) + //if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS) // cpufan_temperature = FAN_TEMPERATURE_30DEGC; - if (get_option(&sysfan_control, "sysfan_cruise_control") < 0) + if (get_option(&sysfan_control, "sysfan_cruise_control") != CB_SUCCESS) sysfan_control = FAN_CRUISE_CONTROL_DISABLED; - if (get_option(&sysfan_speed, "sysfan_speed") < 0) + if (get_option(&sysfan_speed, "sysfan_speed") != CB_SUCCESS) sysfan_speed = FAN_SPEED_5625; - //if (get_option(&sysfan_temperature, "sysfan_temperature") < 0) + //if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS) // sysfan_temperature = FAN_TEMPERATURE_30DEGC; // hwm_write(0x31, 0x20); // AVCC high limit diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c index 3829d72669..30f0468ef3 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -163,7 +163,7 @@ static void mainboard_enable(device_t dev) verb_setup(); unsigned disable = 0; - if ((get_option(&disable, "ethernet1") == 0) && disable) { + if ((get_option(&disable, "ethernet1") == CB_SUCCESS) && disable) { device_t nic = dev_find_slot(0, PCI_DEVFN(0x1c, 2)); if (nic) { printk(BIOS_DEBUG, "DISABLE FIRST NIC!\n"); @@ -171,7 +171,7 @@ static void mainboard_enable(device_t dev) } } disable = 0; - if ((get_option(&disable, "ethernet2") == 0) && disable) { + if ((get_option(&disable, "ethernet2") == CB_SUCCESS) && disable) { device_t nic = dev_find_slot(0, PCI_DEVFN(0x1c, 3)); if (nic) { printk(BIOS_DEBUG, "DISABLE SECOND NIC!\n"); diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c index 2e54c7bc1c..52f5dcf1e2 100644 --- a/src/mainboard/lenovo/t60/mainboard.c +++ b/src/mainboard/lenovo/t60/mainboard.c @@ -78,7 +78,7 @@ static void mainboard_enable(device_t dev) ec_write(0x0c, 0x08); ec_write(0x0c, inb(0x164c) & 8 ? 0x89 : 0x09); - if (get_option(&defaults_loaded, "cmos_defaults_loaded") < 0) { + if (get_option(&defaults_loaded, "cmos_defaults_loaded") != CB_SUCCESS) { printk(BIOS_INFO, "failed to get cmos_defaults_loaded"); defaults_loaded = 0; } diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c index 4fc685567f..89309f2335 100644 --- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c +++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c @@ -448,11 +448,11 @@ static void set_thermal_config(void) cpu_fan_control = cpu_fan_control_defaults; case_fan_control = case_fan_control_defaults; - if( get_option(&byte, "cpu_fan_control") == -4 ) { + if (get_option(&byte, "cpu_fan_control") == CB_CMOS_CHECKSUM_INVALID) { printk(BIOS_WARNING, "%s: CMOS checksum invalid, keeping default values\n",__func__); } else { // get all the options needed - if( get_option(&byte, "cpu_fan_control") == 0 ) + if( get_option(&byte, "cpu_fan_control") == CB_SUCCESS ) cpu_fan_control.enable = byte ? 1 : 0; get_option(&cpu_fan_control.polarity, "cpu_fan_polarity"); @@ -461,7 +461,7 @@ static void set_thermal_config(void) get_option(&cpu_fan_control.pwm_min, "cpu_dutycycle_min"); get_option(&cpu_fan_control.pwm_max, "cpu_dutycycle_max"); - if( get_option(&byte, "chassis_fan_control") == 0) + if( get_option(&byte, "chassis_fan_control") == CB_SUCCESS) case_fan_control.enable = byte ? 1 : 0; get_option(&case_fan_control.polarity, "chassis_fan_polarity"); get_option(&case_fan_control.t_min, "chassis_t_min"); @@ -816,7 +816,7 @@ static void mainboard_init(device_t dev) dev_name(dev), dev_path(dev), dev->subsystem_vendor, dev->subsystem_device, __func__); #if CONFIG_PCI_OPTION_ROM_RUN_REALMODE - if( get_option(&int15_func.regs.func00_LCD_panel_id, "lcd_panel_id") < 0 ) + if (get_option(&int15_func.regs.func00_LCD_panel_id, "lcd_panel_id") != CB_SUCCESS) int15_func.regs.func00_LCD_panel_id = PANEL_TABLE_ID_NO; int15_func.regs.func05_TV_standard = TV_MODE_NO; install_INT15_function_extensions(&int15_func); |