this module's role is more related saving client data.
So, changed module name from mmi-core to mmi-client
Change-Id: Iaa90457d8bc60996c26789e79ec32c62804048eb
'mmi-dbg.h',
'mmi_proxy.h',
'mmi_proxy.c',
- 'mmi-core.h',
- 'mmi-core.c',
+ 'mmi-client.h',
+ 'mmi-client.c',
]
install_headers(
--- /dev/null
+/*
+* Copyright © 2022 Samsung Electronics co., Ltd. All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice (including the next
+* paragraph) shall be included in all copies or substantial portions of the
+* Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+* DEALINGS IN THE SOFTWARE.
+*/
+
+#include "mmi-ipc.h"
+#include "mmi-dbg.h"
+#include "mmi-client.h"
+
+static mmi_handle mmi_h = NULL;
+
+int mmi_client_create(void)
+{
+ mmi_h = (mmi_handle)calloc(1, sizeof(mmi_struct_s));
+
+ if (mmi_h == NULL) {
+ LOGE("Failed to allocate memory for mmi_h !\n");
+ return MMI_ERROR_OUT_OF_MEMORY;
+ }
+
+ if (mmi_ipc_init()) {
+ LOGE("Failed to init mmi ipc !\n");
+ if(mmi_h != NULL) {
+ free(mmi_h);
+ mmi_h = NULL;
+ }
+ return MMI_ERROR_NOT_SUPPORTED;
+ }
+
+ mmi_h->rpc_h = mmi_ipc_get_rpc_h();
+ mmi_h->stub_appid = mmi_ipc_get_stub_appid();
+ mmi_h->state = mmi_ipc_get_state();
+
+ return MMI_ERROR_NONE;
+}
+
+int mmi_client_destroy(void)
+{
+ if (mmi_h == NULL) {
+ LOGE("A mmi_h is already NULL");
+ return MMI_ERROR_NONE;
+ }
+
+ mmi_ipc_shutdown();
+ free(mmi_h);
+ mmi_h = NULL;
+
+ return MMI_ERROR_NONE;
+}
--- /dev/null
+/*
+* Copyright © 2022 Samsung Electronics co., Ltd. All Rights Reserved.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice (including the next
+* paragraph) shall be included in all copies or substantial portions of the
+* Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+* DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef __MMI_CLIENT_H__
+#define __MMI_CLIENT_H__
+
+#include "mmi-common.h"
+
+typedef void* mmi_rpc_h;
+
+typedef struct {
+ mmi_rpc_h rpc_h;
+ const char *stub_appid;
+ int state;
+} mmi_struct_s;
+
+typedef mmi_struct_s* mmi_handle;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int mmi_client_create(void);
+int mmi_client_destroy(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //__MMI_CLIENT_H__
\ No newline at end of file
+++ /dev/null
-/*
-* Copyright © 2022 Samsung Electronics co., Ltd. All Rights Reserved.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice (including the next
-* paragraph) shall be included in all copies or substantial portions of the
-* Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
-*/
-
-#include "mmi-ipc.h"
-#include "mmi-dbg.h"
-#include "mmi-core.h"
-
-static mmi_handle mmi_h = NULL;
-
-int mmi_core_create(void)
-{
- mmi_h = (mmi_handle)calloc(1, sizeof(mmi_struct_s));
-
- if (mmi_h == NULL) {
- LOGE("Failed to allocate memory for mmi_h !\n");
- return MMI_ERROR_OUT_OF_MEMORY;
- }
-
- if (mmi_ipc_init()) {
- LOGE("Failed to init mmi ipc !\n");
- if(mmi_h != NULL) {
- free(mmi_h);
- mmi_h = NULL;
- }
- return MMI_ERROR_NOT_SUPPORTED;
- }
-
- mmi_h->rpc_h = mmi_ipc_get_rpc_h();
- mmi_h->stub_appid = mmi_ipc_get_stub_appid();
- mmi_h->state = mmi_ipc_get_state();
-
- return MMI_ERROR_NONE;
-}
-
-int mmi_core_destroy(void)
-{
- if (mmi_h == NULL) {
- LOGE("A mmi_h is already NULL");
- return MMI_ERROR_NONE;
- }
-
- mmi_ipc_shutdown();
- free(mmi_h);
- mmi_h = NULL;
-
- return MMI_ERROR_NONE;
-}
+++ /dev/null
-/*
-* Copyright © 2022 Samsung Electronics co., Ltd. All Rights Reserved.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice (including the next
-* paragraph) shall be included in all copies or substantial portions of the
-* Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef __MMI_CORE_H__
-#define __MMI_CORE_H__
-
-#include "mmi-common.h"
-
-typedef void* mmi_rpc_h;
-
-typedef struct {
- mmi_rpc_h rpc_h;
- const char *stub_appid;
- int state;
-} mmi_struct_s;
-
-typedef mmi_struct_s* mmi_handle;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int mmi_core_create(void);
-int mmi_core_destroy(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //__MMI_CORE_H__
\ No newline at end of file
*/
#include "mmi.h"
-#include "mmi-core.h"
+#include "mmi-client.h"
#include "mmi-dbg.h"
MMI_API int mmi_init(void)
{
- int ret = mmi_core_create();
+ int ret = mmi_client_create();
if(ret != MMI_ERROR_NONE) {
- LOGE("Fail to create mmi handle instance(%d)", ret);
+ LOGE("Fail to create mmi client(%d)", ret);
return MMI_ERROR_NOT_SUPPORTED;
}
MMI_API int mmi_shutdown(void)
{
- int ret = mmi_core_destroy();
+ int ret = mmi_client_destroy();
if(ret != MMI_ERROR_NONE) {
- LOGE("Fail to destroy mmi handle instance(%d)", ret);
+ LOGE("Fail to destroy mmi client(%d)", ret);
return MMI_ERROR_NOT_SUPPORTED;
}
*/
#include "mmi.h"
-#include "mmi-core.h"
+#include "mmi-client.h"
#include "mmi-tests.h"
#include "mmi-ipc.h"
mmi_shutdown();
}
-TEST_F(MMIMainTest, MmiInstanceCreateSuccess)
+TEST_F(MMIMainTest, MmiClientCreateSuccess)
{
- int res = mmi_core_create();
+ int res = mmi_client_create();
EXPECT_EQ(res, MMI_ERROR_NONE);
- mmi_core_destroy();
+ mmi_client_destroy();
}
projects / platform / core / uifw / mmi-framework.git / commitdiff