Modify multi-LED APIs

Change-Id: Ie36ac4ed295267454e9a05dcfe89b174a1bafc64
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/include/led-internal.h b/include/led-internal.h
index 7d2e016..ac56a5d 100644 (file)
--- a/include/led-internal.h
+++ b/include/led-internal.h
@@ -51,8 +51,7 @@ int device_multi_led_get_number(int *num_of_leds);
  * @privilege %http://tizen.org/privilege/led
  * @remarks This API is related to the following feature: %http://tizen.org/feature/led
  * @remarks The array size must be the same as the number of LEDs, which is obtained by device_multi_led_get_number().
- * @param[in] led[] Indicate LEDs to be controlled
- * @param[in] color[] The Color values \n
+ * @param[in] color[] The Color value for each LED\n
  *                    The first byte means opaque, and the other 3 bytes mean RGB values
  * @return @c 0 on success,
  *         otherwise a negative error value
@@ -62,25 +61,7 @@ int device_multi_led_get_number(int *num_of_leds);
  * @retval #DEVICE_ERROR_OPERATION_FAILED Operation failed
  * @retval #DEVICE_ERROR_NOT_SUPPORTED Not supported device
  */
-int device_multi_led_play_custom(bool led[], unsigned int color[]);
-
-/**
- * @brief Stops multiple LEDs at the same time.
- * @since_tizen @if MOBILE 5.0 @elseif WEARABLE 5.0 @endif
- * @privlevel public
- * @privilege %http://tizen.org/privilege/led
- * @remarks This API is related to the following feature: %http://tizen.org/feature/led
- * @remarks The array size must be the same as the number of LEDs, which is obtained by device_multi_led_get_number().
- * @param[in] led[] Indicate LEDs to be controlled
- * @return @c 0 on success,
- *         otherwise a negative error value
- * @retval #DEVICE_ERROR_NONE Successful
- * @retval #DEVICE_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #DEVICE_ERROR_PERMISSION_DENIED Permission denied
- * @retval #DEVICE_ERROR_OPERATION_FAILED Operation failed
- * @retval #DEVICE_ERROR_NOT_SUPPORTED Not supported device
- */
-int device_multi_led_stop_custom(bool led[]);
+int device_multi_led_play_custom(unsigned int color[]);
 
 
 #ifdef __cplusplus

diff --git a/src/led.c b/src/led.c
index 43d8e07..c72691b 100755 (executable)
--- a/src/led.c
+++ b/src/led.c
@@ -197,7 +197,7 @@ int device_multi_led_get_number(int *num_of_leds)
        return DEVICE_ERROR_NONE;
 }
 
-int device_multi_led_play_custom(bool led[], unsigned int color[])
+int device_multi_led_play_custom(unsigned int color[])
 {
        GVariantBuilder *builder = NULL;
        GVariant *var = NULL;
@@ -206,44 +206,16 @@ int device_multi_led_play_custom(bool led[], unsigned int color[])
        if (!support_front_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
-       if (led == NULL || color == NULL)
+       if (color == NULL)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE("a(bu)"));
+       builder = g_variant_builder_new(G_VARIANT_TYPE("au"));
        for (i = 0; i < number_of_devices; i++)
-               g_variant_builder_add(builder, "(bu)", led[i], color[i]);
+               g_variant_builder_add(builder, "u", color[i]);
 
-       var = g_variant_new("(a(bu))", builder);
+       var = g_variant_new("(au)", builder);
        g_variant_builder_unref(builder);
 
        return dbus_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED,
                                DEVICED_INTERFACE_LED, METHOD_MULTI_PLAY_CUSTOM, var);
-
-}
-
-int device_multi_led_stop_custom(bool led[])
-{
-       GVariantBuilder *builder = NULL;
-       GVariant *var = NULL;
-       int ret, i;
-
-       if (!support_front_led)
-               return DEVICE_ERROR_NOT_SUPPORTED;
-
-       builder = g_variant_builder_new(G_VARIANT_TYPE("ab"));
-       for (i = 0 ; i < number_of_devices; i++)
-               g_variant_builder_add(builder, "b", led[i]);
-
-       var = g_variant_new("(ab)", builder);
-       g_variant_builder_unref(builder);
-
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
-               DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-               METHOD_MULTI_STOP_CUSTOM, var);
-       //LCOV_EXCL_START System Error
-       if (ret < 0)
-               return errno_to_device_error(ret);
-       //LCOV_EXCL_STOP
-
-       return DEVICE_ERROR_NONE;
 }