battery: Change macro HAL_DEVICE_BATTERY_HARDWARE_DEVICE_ID 66/309766/1
authorYunhee Seo <yuni.seo@samsung.com>
Tue, 16 Apr 2024 11:04:55 +0000 (20:04 +0900)
committerYunhee Seo <yuni.seo@samsung.com>
Tue, 16 Apr 2024 11:04:55 +0000 (20:04 +0900)
As HAL_DEVICE_BATTERY_HARDWARE_DEVICE_ID is removed from hal/api/device,
it is changed to BATTERY_HARDWARE_DEVICE_ID.
Because that macro is removed from platform side before,
and only used in hal-backend device-emulator.

Change-Id: I4b33f60cdea84ff5a98e9bc28d3979df479e9596
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>
hw/battery/battery.c

index 5d7423665e1146fb8edd1a85bb2b4ad97a482281..78d24e936e07d57d5723b9e124dfdf0316e05bcf 100644 (file)
@@ -42,6 +42,8 @@
 #define FILE_BATTERY_CHARGE_FULL "/sys/class/power_supply/battery/charge_full"
 #define FILE_BATTERY_CHARGE_NOW "/sys/class/power_supply/battery/charge_now"
 
+#define BATTERY_HARDWARE_DEVICE_ID     "battery"
+
 static struct signal_data {
        hal_device_battery_updated_cb updated_cb;
        void *data;
@@ -95,7 +97,7 @@ static void signal_delivered(GDBusConnection *conn,
        g_variant_get(parameters, "(sisssss)", &sig, &num,
                        &capacity, &status, &health, &online, &present);
 
-       info.name = HAL_DEVICE_BATTERY_HARDWARE_DEVICE_ID;
+       info.name = BATTERY_HARDWARE_DEVICE_ID;
        info.status = status;
        info.health = health;
        info.online = atoi(online);
@@ -180,7 +182,7 @@ static int battery_get_current_state(
        if (!updated_cb)
                return -EINVAL;
 
-       info.name = HAL_DEVICE_BATTERY_HARDWARE_DEVICE_ID;
+       info.name = BATTERY_HARDWARE_DEVICE_ID;
 
        ret = sys_get_str(FILE_BATTERY_CAPACITY, capacity_str, sizeof(capacity_str));
        if (ret < 0) {