Remove default pattern for vibration

- No need for a default frequency anymore.
- When feedbackd set frequency as 0,
kernel will determine the frequency as F0.
- F0 is the optimal frequency for each device.

Change-Id: Ic73cc877114d8e9c74ce7f1ca3760d6bcb76adcd
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/src/haptic/haptic.c b/src/haptic/haptic.c
index f198016..2d734a0 100644 (file)
--- a/src/haptic/haptic.c
+++ b/src/haptic/haptic.c
@@ -37,8 +37,6 @@
 #define STANDARD_FILE_PATH         FEEDBACK_BASE_PATH"vibration/"
 #define VIBRATION_CONF_PATH        FEEDBACK_BASE_PATH"vibration.conf"
 
-#define PATTERN_DEFAULT_MONOTONE       "FEEDBACK_PATTERN_DEFAULT"
-
 #define HAPTIC_CONF_PATH                "/etc/feedbackd/haptic.conf"
 #define SIGNAL_POWEROFF_STATE           "ChangeState"
 #define SIGNAL_VIBRATOR_INITIATED       "InitiateVibrator"
@@ -145,7 +143,6 @@ struct haptic_config {
 };
 
 static struct haptic_config haptic_conf;
-static struct duration_data haptic_default_data;
 
 static int haptic_start(void);
 static int haptic_stop(void);
@@ -524,34 +521,6 @@ void pattern_config_parse(void)
        load_standard_vibration_patterns();
 }
 
-static void get_default_haptic_data()
-{
-       dd_list *elem;
-       struct vibration_config *conf;
-       char pattern[PATH_MAX] = {0,};
-
-       memset(&haptic_default_data, 0, sizeof(struct duration_data));
-
-       snprintf(pattern, sizeof(pattern), "%s", PATTERN_DEFAULT_MONOTONE);
-       DD_LIST_FOREACH(vib_conf_list, elem, conf) {
-               if (!conf->pattern)
-                       continue;
-               if (strcmp(conf->pattern, pattern))
-                       continue;
-
-               if (conf->standard) {
-                       snprintf(pattern, sizeof(pattern), "%s", conf->standard);
-                       continue;
-               }
-
-               if (conf->data)
-                       memcpy(&haptic_default_data, conf->data->data, sizeof(struct duration_data));
-
-               break;
-       }
-       _D("Default haptic data: intensity=%d, frequency=%d", haptic_default_data.intensity, haptic_default_data.frequency);
-}
-
 static int haptic_module_load(void)
 {
        struct haptic_ops *ops;
@@ -559,7 +528,6 @@ static int haptic_module_load(void)
        int r;
 
        pattern_config_parse();
-       get_default_haptic_data();
        /* find valid plugin */
        DD_LIST_FOREACH(h_head, elem, ops) {
                if (ops->is_valid && ops->is_valid()) {
@@ -851,12 +819,12 @@ static void vibrate_monotone_idler_cb(void *data)
        if (ret != DEVICE_ERROR_NONE)
                _E("Failed to request power lock.");
 
-       _D("Handle(%d) play=%dms, level=%d, intensity=%d, frequency=%d)",
+       _D("Handle(%d) play=%dms, level=%d, intensity=%d, frequency=0)",
                        cur_h_data.handle, vibrate_info->duration, cur_h_data.level,
-                       vibrate_info->intensity, haptic_default_data.frequency);
+                       vibrate_info->intensity);
 
        duration_timer = g_timeout_add(vibrate_info->duration, _cb, NULL);
-       h_ops->vibrate_monotone(cur_h_data.handle, vibrate_info->duration, haptic_default_data.frequency, 0, cur_h_data.level, vibrate_info->intensity, cur_h_data.priority);
+       h_ops->vibrate_monotone(cur_h_data.handle, vibrate_info->duration, 0, 0, cur_h_data.level, vibrate_info->intensity, cur_h_data.priority);
 
        free(vibrate_info);
 }
@@ -1246,10 +1214,10 @@ static void haptic_poweroff_cb(GDBusConnection  *conn,
        level = (level/2) + 1;
 
        /* power off vibration */
-       _I("Handle=%d dur=%dms pri=%d level=%d intensity=%d frequency=%d",
+       _I("Handle=%d dur=%dms pri=%d level=%d intensity=%d frequency=0",
                g_handle, POWER_OFF_VIB_DURATION, PRIORITY_HIGH, level,
-               POWER_VIB_FEEDBACK * 100, haptic_default_data.frequency);
-       ret = h_ops->vibrate_monotone(g_handle, POWER_OFF_VIB_DURATION, haptic_default_data.frequency, 0,
+               POWER_VIB_FEEDBACK * 100);
+       ret = h_ops->vibrate_monotone(g_handle, POWER_OFF_VIB_DURATION, 0, 0,
                        level, POWER_VIB_FEEDBACK * 100, PRIORITY_HIGH);
        if (ret < 0) {
                _E("Failed to vibrate_monotone: %d", ret);