userspace/libwr: clean up of fan.c

Following functions were made static: pwm_configure_fpga pwm_configure_pin shw_init_i2c_sensors shw_pwm_speed shw_pwm_update_timeout tmp100_read_temp tmp100_read_reg tmp100_write_reg

userspace/libwr: clean up of fan.c
Following functions were made static: pwm_configure_fpga pwm_configure_pin shw_init_i2c_sensors shw_pwm_speed shw_pwm_update_timeout tmp100_read_temp tmp100_read_reg tmp100_write_reg
6ad82a56 · Adam Wujek · 105052f6 · 6ad82a56 · 6ad82a56
Commit 6ad82a56 authored Oct 15, 2014 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 16 deletions

fan.h userspace/include/fan.h +0 -8

fan.c userspace/libwr/fan.c +8 -8

No files found.
--- a/userspace/include/fan.h
+++ b/userspace/include/fan.h
@@ -7,12 +7,4 @@
 int shw_init_fans();
 void shw_update_fans();

-void shw_pwm_speed(int enable_mask, float rate);
-void shw_pwm_update_timeout(int tout_100ms);
-
-int shw_init_i2c_sensors();
-float tmp100_read_temp(int dev_addr);
-void tmp100_write_reg(int dev_addr, uint8_t reg_addr, uint8_t value);
-float tmp100_read_temp(int dev_addr);
-
 #endif
--- a/userspace/libwr/fan.c
+++ b/userspace/libwr/fan.c
@@ -81,7 +81,7 @@ static int pwm_fd;
 static volatile struct SPWM_WB *spwm_wbr;
 //----------------------------------------

-void shw_pwm_update_timeout(int tout_100ms)
+static void shw_pwm_update_timeout(int tout_100ms)
 {
 	fan_update_timeout=tout_100ms*100000;
 	TRACE(TRACE_INFO,"Fan tick timeout is =%d",fan_update_timeout);
@@ -123,7 +123,7 @@ static inline void pi_init(pi_controller_t *pi)
 }

 /* Configures a PWM output on gpio pin (pin). Rate accepts range from 0 (0%) to 1000 (100%) */
-void pwm_configure_pin(const pio_pin_t *pin, int enable, int rate)
+static void pwm_configure_pin(const pio_pin_t *pin, int enable, int rate)
 {
 	int index = pin->port * 32 + pin->pin;
 	if(pin==0) return;
@@ -139,7 +139,7 @@ void pwm_configure_pin(const pio_pin_t *pin, int enable, int rate)


 /* Configures a PWM output on gpio pin (pin). Rate accepts range from 0 (0%) to 1000 (100%) */
-void pwm_configure_fpga(int enmask, float rate)
+static void pwm_configure_fpga(int enmask, float rate)
 {
 	uint8_t u8speed=(uint8_t)((rate>=1)?0xff:(rate*255.0));

@@ -148,7 +148,7 @@ void pwm_configure_fpga(int enmask, float rate)
 }

 /* Configures a PWM output. Rate accepts range is from 0 (0%) to 1 (100%) */
-void shw_pwm_speed(int enmask, float rate)
+static void shw_pwm_speed(int enmask, float rate)
 {
 	//TRACE(TRACE_INFO,"%x %f",enmask,rate);
 	if(is_cpu_pwn)
@@ -163,7 +163,7 @@ void shw_pwm_speed(int enmask, float rate)


 /* Texas Instruments TMP100 temperature sensor driver */
-uint32_t tmp100_read_reg(int dev_addr, uint8_t reg_addr, int n_bytes)
+static uint32_t tmp100_read_reg(int dev_addr, uint8_t reg_addr, int n_bytes)
 {
 	uint8_t data[8];
 	uint32_t rv=0, i;
@@ -183,7 +183,7 @@ uint32_t tmp100_read_reg(int dev_addr, uint8_t reg_addr, int n_bytes)



-void tmp100_write_reg(int dev_addr, uint8_t reg_addr, uint8_t value)
+static void tmp100_write_reg(int dev_addr, uint8_t reg_addr, uint8_t value)
 {
 	uint8_t data[2];

@@ -193,13 +193,13 @@ void tmp100_write_reg(int dev_addr, uint8_t reg_addr, uint8_t value)
 }


-float tmp100_read_temp(int dev_addr)
+static float tmp100_read_temp(int dev_addr)
 {
 	int temp = tmp100_read_reg(dev_addr, 0, 2);
 	return ((float) (temp >> 4)) / 16.0;
 }

-int shw_init_i2c_sensors()
+static int shw_init_i2c_sensors()
 {
 	if (i2c_init_bus(&fpga_sensors_i2c) < 0) {
 		TRACE(TRACE_FATAL, "can't initialize temperature sensors I2C bus.\n");