halapi: Fix cpp build issue when including hal-common.h

If the defined enum value is not sequential, some build error happen as
following. So that fix this issue by making enum hal_module sequential.

And remove the temporary defined HAL_MODULE_FOO.

[Build error message with cpp compiler]
"sorry, unimplemented: non-trivial designated initializers not supported "

Change-Id: I8dcd8c7c11807d8873d8e92413e4137ce84a3c6f
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/include/hal-common.h b/include/hal-common.h
index 09df968..daffd14 100644 (file)
--- a/include/hal-common.h
+++ b/include/hal-common.h
@@ -41,7 +41,6 @@ enum hal_group {
        HAL_GROUP_TELEPHONY,
        HAL_GROUP_LOCATION,
        HAL_GROUP_SYSTEM,
-       HAL_GROUP_MISCELLANEOUS,
        HAL_GROUP_END,
 };
 
@@ -49,13 +48,13 @@ enum hal_module {
        HAL_MODULE_UNKNOWN = 0,
 
        /* HAL_GROUP_GRAPHICS */
-       HAL_MODULE_TBM = 1,
+       HAL_MODULE_TBM,
        HAL_MODULE_TDM,
        HAL_MODULE_COREGL,
        HAL_MODULE_INPUT,
 
        /* HAL_GROUP_MULTIMEDIA */
-       HAL_MODULE_AUDIO = 15,
+       HAL_MODULE_AUDIO,
        HAL_MODULE_CAMERA,
        HAL_MODULE_RADIO,
        HAL_MODULE_CODEC,
@@ -63,7 +62,7 @@ enum hal_module {
        HAL_MODULE_ALSAUCM,
 
        /* HAL_GROUP_CONNECTIVITY */
-       HAL_MODULE_BLUETOOTH = 30,
+       HAL_MODULE_BLUETOOTH,
        HAL_MODULE_WIFI,
        HAL_MODULE_NAN,
        HAL_MODULE_NFC,
@@ -72,13 +71,13 @@ enum hal_module {
        HAL_MODULE_MTP,
 
        /* HAL_GROUP_TELEPHONY */
-       HAL_MODULE_TELEPHONY = 45,
+       HAL_MODULE_TELEPHONY,
 
        /* HAL_GROUP_LOCATION */
-       HAL_MODULE_LOCATION = 50,
+       HAL_MODULE_LOCATION,
 
        /* HAL_GROUP_SYSTEM */
-       HAL_MODULE_COMMON = 55,
+       HAL_MODULE_COMMON,
        HAL_MODULE_POWER,
        HAL_MODULE_SENSOR,
        HAL_MODULE_PERIPHERAL,
@@ -94,8 +93,11 @@ enum hal_module {
        HAL_MODULE_DEVICE_USB_GADGET,
        HAL_MODULE_DEVICE_HAPTIC,
 
-       /* HAL_GROUP_MISCELLANEOUS */
-       HAL_MODULE_FOO,         /* FIXME: Add for test and will be removed */
+       /*
+        * TODO: If need to add new module, have to add it below
+        * without modifying already defined module id.
+        */
+
        HAL_MODULE_END,
 };
 

diff --git a/src/common.h b/src/common.h
index f07d7c6..af1a0f1 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -287,16 +287,6 @@ struct hal_abi_version_match {
                        .backend_min_abi_version        = HAL_ABI_VERSION_TIZEN_6_5,
                },
        },
-
-       /* FIXME: Add for test and will be removed */
-       /* HAL_GROUP_MISCELLANEOUS */
-       [HAL_MODULE_FOO] = {
-               /* FIXME: Need to be initialized by configuration file like xml */
-               [0] = {
-                       .platform_abi_version   = HAL_ABI_VERSION_TIZEN_6_5,
-                       .backend_min_abi_version        = HAL_ABI_VERSION_TIZEN_6_5,
-               },
-       },
 };
 
 static struct __hal_module_info {
@@ -734,20 +724,6 @@ static struct __hal_module_info {
                .abi_versions           = abi_version_match_data[HAL_MODULE_DEVICE_HAPTIC],
                .hal_api                = true,
        },
-
-       /* HAL_GROUP_MISCELLANEOUS */
-       [HAL_MODULE_FOO] = {    /* FIXME: Add for test and will be removed */
-               .group                  = HAL_GROUP_SYSTEM,
-               .module                 = HAL_MODULE_FOO,
-               .license                = HAL_LICENSE_APACHE_2_0,
-               .module_name            = "FOO",
-               .library_name           = "/hal/lib/libhal-backend-foo.so",
-               .library_name_64bit     = "/hal/lib64/libhal-backend-foo.so",
-               .symbol_name            = "hal_backend_foo_data",
-               .num_abi_versions       = ARRAY_SIZE(abi_version_match_data[HAL_MODULE_FOO]),
-               .abi_versions           = abi_version_match_data[HAL_MODULE_FOO],
-               .hal_api                = true,
-       },
 };
 
 #endif /* __COMMON_H__ */