Fix Tizen coding rule 61/107861/6
authorKichan Kwon <k_c.kwon@samsung.com>
Fri, 30 Dec 2016 08:01:18 +0000 (17:01 +0900)
committerKichan Kwon <k_c.kwon@samsung.com>
Wed, 18 Jan 2017 02:15:57 +0000 (11:15 +0900)
Change-Id: Ia22c4efed664898d786cde7e619d5fa53b915af2
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>
src/common/smaps.c
src/common/util.h
src/heart/heart-battery.c
src/proc-stat/include/proc-main.h

index 3917000a9bad66bfb032882e4ba54545f9aac635..bf79bcf05d72035d77bb2b60a5134c588b3a955d 100644 (file)
@@ -35,9 +35,8 @@ static int have_totmaps = 0;
 
 static bool totmaps_available(void)
 {
-       if (have_totmaps == 2) {
+       if (have_totmaps == 2)
                have_totmaps = (access("/proc/1/totmaps", R_OK) == 0);
-       }
 
        return have_totmaps;
 }
index 3ba4f04d4a499c7e8428956491c26535cdfcea7e..6c0697853fed58dd1967105ca4c9980dba3251be 100644 (file)
@@ -70,12 +70,14 @@ static inline void closedirp(DIR **d)
                closedir(*d);
 }
 
-static inline void __dbus_error_free(DBusError *error) {
+static inline void __dbus_error_free(DBusError *error)
+{
        if (error && dbus_error_is_set(error))
                dbus_error_free(error);
 }
 
-static inline void __dbus_message_unref(DBusMessage **message) {
+static inline void __dbus_message_unref(DBusMessage **message)
+{
        if (*message)
                dbus_message_unref(*message);
 }
index fbd52398d49ebaedd55b88f509a0339c627418fc..6848eca62d9203ed66664d164ce1abebeeb55e5d 100644 (file)
 #define SHORT_TIME_WEIGHT              (1-LONG_TIME_WEIGHT) /*weightage given for short time discharge*/
 #define MIN_TIME_FOR_LVL_CHANGE                50
 
-/*
- * Below 6 values are the co-efficient of the polynomial. These are devired from
- * OCV and  and battery percentage level based on experiment
- */
-#define OCV_SOC_POLY_COEF_1                    (3402.664)
-#define OCV_SOC_POLY_COEF_2                    (42.031)
-#define OCV_SOC_POLY_COEF_3                    (-1.76745)
-#define OCV_SOC_POLY_COEF_4                    (0.034798)
-#define OCV_SOC_POLY_COEF_5                    (-0.00030516)
-#define OCV_SOC_POLY_COEF_6                    (0.0000010116)
 #define UPS_FACTOR                             (2.88)
 #define DOUBLE_ZERO                            (0.000000)
 #define FULL_CAPACITY                  100
@@ -410,9 +400,8 @@ inline int heart_battery_get_learning_mode(void)
 
        if (logic_v2) { /* new logic */
                /*wait till enough data gets collected to estimated battery remaining time */
-               if (batt_stat.data_available == TRUE) {
+               if (batt_stat.data_available == TRUE)
                        return 1;
-               }
                return 0;
        }
         /* old logic */
@@ -1018,7 +1007,7 @@ static void heart_battery_write_data_to_file(void)
 {
        int i;
        int len = 0;
-       char buff[BATTERY_DATA_MAX] = {0,0};
+       char buff[BATTERY_DATA_MAX] = {0, 0};
        _cleanup_fclose_ FILE *fp = NULL;
 
        fp = fopen(HEART_BATTERY_DATA_FILE, "w");
@@ -1037,7 +1026,7 @@ static void heart_battery_write_data_to_file(void)
                }
        }
        len += snprintf(buff + len, BATTERY_DATA_MAX - len, "%d %d %d %d %lf %d", \
-               batt_stat.curr_index, batt_stat.last_capacity,batt_stat.remaining_time, \
+               batt_stat.curr_index, batt_stat.last_capacity, batt_stat.remaining_time, \
                batt_stat.remaining_time_ups, batt_stat.last_pwr_bchg, batt_stat.data_available);
 
        fputs(buff, fp);
@@ -1051,7 +1040,7 @@ static void heart_battery_read_data_from_file(void)
 {
        int i;
        int len = 0;
-       char buff[BATTERY_DATA_MAX] = {0,0};
+       char buff[BATTERY_DATA_MAX] = {0, 0};
        char *ch;
        _cleanup_fclose_ FILE *fp = NULL;
 
@@ -1112,9 +1101,8 @@ static void heart_battery_calculate_pivot(void)
 {
        int i;
 
-       for (i = 0; i < ocv_degree; i++) {
+       for (i = 0; i < ocv_degree; i++)
                volt_intg_full += (intg[i] /(i+1)) * pow(100 , i+1);
-       }
        volt_intg_full = volt_intg_full/100000.0;
 
        pivot_nor = ((sqrt(discharge_fast) + sqrt(discharge_slow))/2);
@@ -1168,8 +1156,7 @@ static void heart_battery_power_off_time_adjustment(void)
                if (batt_stat.last_wall_time[i] == 0) {
                        /* we do not have stored time value from this point onwards, stop updating*/
                        break;
-               }
-               else
+               } else
                        batt_stat.last_wall_time[i] += time_diff;
        }
 
@@ -1308,7 +1295,7 @@ static void heart_battery_cal_charging_rem_time(void)
                data_avail_chg, batt_stat.index_chg);
        _I("last_wall_time_chg = %ld, curr_wall_time = %ld\n",
                batt_stat.last_wall_time_chg, curr_wall_time);
-       _I("time diff before averaging = %d seconds\n",time_diff);
+       _I("time diff before averaging = %d seconds\n", time_diff);
 
        /*
         * get the average of all time diff values stored including current
@@ -1364,14 +1351,13 @@ static void heart_battery_cal_discharge_rem_time(void)
        long curr_wall_time = 0;
        long time_diff1, time_diff2;
 
-       _I("last capacity = %d, current capacity = %d\n",batt_stat.last_capacity, batt_stat.curr_capacity);
+       _I("last capacity = %d, current capacity = %d\n", batt_stat.last_capacity, batt_stat.curr_capacity);
 
        /* if battery level change happen then only calculate the new time*/
        if (batt_stat.last_capacity != batt_stat.curr_capacity) {
                /* calculate the voltage integral(energy) for current capacity */
-               for (i = 0; i < ocv_degree; i++) {
+               for (i = 0; i < ocv_degree; i++)
                        curr_volt_intg += (intg[i] /(i+1)) * pow(batt_stat.curr_capacity , i+1);
-               }
                curr_volt_intg = curr_volt_intg /100000.0;
 
                /*current time*/
@@ -1388,8 +1374,7 @@ static void heart_battery_cal_discharge_rem_time(void)
                         */
                        batt_pwr = batt_stat.last_pwr_bchg;
                        heart_battery_reject_data();
-               }
-               else {
+               } else {
                        index = BATTERY_WINDOW_INDEX(batt_stat.curr_index - BATTERY_LEVEL_GAP);
                        if (batt_stat.last_wall_time[index] == 0 &&
                                batt_stat.last_volt_intg[index] == 0) {
@@ -1401,8 +1386,7 @@ static void heart_battery_cal_discharge_rem_time(void)
                                volt_intg_diff = batt_stat.last_volt_intg[0] - curr_volt_intg;
                                if (volt_intg_diff < DOUBLE_ZERO)
                                        volt_intg_diff = volt_intg_full - curr_volt_intg;
-                       }
-                       else {
+                       } else {
                                /* time differenc since last battery level change*/
                                time_diff1 = curr_wall_time - batt_stat.last_wall_time[index];
                                /* voltage integral(energy) change since last battery level change */
@@ -1462,7 +1446,7 @@ static void heart_battery_cal_discharge_rem_time(void)
                /* total remaining time based on current battery level*/
                rem_time = (total_battery_capacity * curr_volt_intg) / batt_pwr;
 
-               _I("pivot_nor = %lf, curr_volt_intg = %lf , volt_intg_full %lf, batt_pwr = %lf", pivot_nor, curr_volt_intg,volt_intg_full, batt_pwr);
+               _I("pivot_nor = %lf, curr_volt_intg = %lf , volt_intg_full %lf, batt_pwr = %lf", pivot_nor, curr_volt_intg, volt_intg_full, batt_pwr);
 
                /* calculate remaining time for normal mode */
                update_time = (pivot_nor * curr_volt_intg) / volt_intg_full;
@@ -2033,7 +2017,7 @@ static void heart_battery_capacity_status(void *data, DBusMessage *msg)
 
        if (logic_v2) {
                /* get the device mode */
-               if (vconf_get_int( VCONFKEY_HEART_BATTERY_DEVICE_MODE, &device_mode))
+               if (vconf_get_int(VCONFKEY_HEART_BATTERY_DEVICE_MODE, &device_mode))
                        _E("failed to get VCONFKEY_HEART_BATTERY_DEVICE_MODE\n");
 
                /* for every battery level change, calculate the battery estimation time using new logic*/
@@ -2462,7 +2446,7 @@ static int get_battery_remaining_time(int mode, enum charger_status_type status)
                return BATTERY_USAGE_LEARNING;
 
         /* old logic */
-       switch(mode){
+       switch (mode) {
        case ULTRA_SAVING_MODE:
                /* Fall through */
        case POWER_SAVING_MODE:
index 23e73d8018ef7a1bc7ab22e0a6d9dc4c775bcfd2..ea979a59adce2109dc5a0f6043ad575b79708531 100644 (file)
@@ -74,7 +74,7 @@ void resourced_proc_dump(int type, const char *path);
 resourced_ret_c proc_set_runtime_exclude_list(const int pid, int type);
 
 struct proc_app_info *proc_add_app_info(const char *appid, const char *pkgid, pid_t pid, int flags,
-    int categories, enum application_type type, enum proc_state state);
+               int categories, enum application_type type, enum proc_state state);
 
 char *proc_get_appid_from_pid(const pid_t pid);