From 86a7727f25d49828089de4787e7dcb67171f5cef Mon Sep 17 00:00:00 2001 From: Timo Lotterbach Date: Mon, 7 Apr 2014 09:57:58 +0200 Subject: removed obsolete code most of this code was specific to IVI LayerManagement (ILM) implementation and is not used in other implementations of ILM API. Signed-off-by: Timo Lotterbach --- ivi-layermanagement-api/ilmCommon/CMakeLists.txt | 2 - .../ilmCommon/include/ilm_common.h | 4 - .../ilmCommon/include/ilm_common_platform.h | 2 - .../ilmCommon/include/ilm_configuration.h | 53 ------------ .../ilmCommon/include/ilm_tools.h | 97 ---------------------- .../ilmCommon/include/ilm_types.h | 4 + ivi-layermanagement-api/ilmCommon/src/ilm_common.c | 2 - .../ilmCommon/src/ilm_common_wayland_platform.c | 2 - 8 files changed, 4 insertions(+), 162 deletions(-) delete mode 100644 ivi-layermanagement-api/ilmCommon/include/ilm_configuration.h delete mode 100644 ivi-layermanagement-api/ilmCommon/include/ilm_tools.h diff --git a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt index b7b979d..e57e3c6 100644 --- a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt @@ -60,8 +60,6 @@ install ( install ( FILES ${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include/ilm_common.h ${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include/ilm_types.h - ${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include/ilm_configuration.h - ${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include/ilm_tools.h ${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include/ilm_platform.h DESTINATION include/ilm ) diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_common.h b/ivi-layermanagement-api/ilmCommon/include/ilm_common.h index 7ebf157..43ecdbd 100644 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_common.h +++ b/ivi-layermanagement-api/ilmCommon/include/ilm_common.h @@ -25,10 +25,6 @@ extern "C" { #endif /* __cplusplus */ #include "ilm_types.h" -#include "ilm_configuration.h" -#include "ilm_tools.h" - -extern struct IpcModule gIpcModule; /** * \brief Initializes the IVI LayerManagement Client. diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h index 59d4b74..4e7b55e 100644 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h +++ b/ivi-layermanagement-api/ilmCommon/include/ilm_common_platform.h @@ -23,8 +23,6 @@ extern "C" { #endif /* __cplusplus */ #include "ilm_types.h" -#include "ilm_configuration.h" -#include "ilm_tools.h" typedef struct _ILM_COMMON_PLATFORM_FUNC { diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_configuration.h b/ivi-layermanagement-api/ilmCommon/include/ilm_configuration.h deleted file mode 100644 index 671cf15..0000000 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_configuration.h +++ /dev/null @@ -1,53 +0,0 @@ -/*************************************************************************** -* -* Copyright 2013 BMW Car IT GmbH -* -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -****************************************************************************/ -#ifndef _ILM_CONFIGURATION_H_ -#define _ILM_CONFIGURATION_H_ - -/* - * in ms, negative value for infinite - */ -#define RECEIVE_TIMEOUT_IN_MS -1 - -/* - * in ms - */ -#define RESPONSE_TIMEOUT_IN_MS 500 - -/* - * must be same as GraphicalObject::INVALID_ID, but this is defined in C++ - * and can not be used here - */ -#define INVALID_ID 0xFFFFFFFF - -/* - * maximum number of registered notification callbacks - */ -#define MAX_CALLBACK_COUNT 16 - -/* - * internal thread synchronized queue - */ -#define MAX_THREAD_SYNC_QUEUE_SIZE 4 - -/* - * exported from ilm_common.h, shared for all client APIs - */ -extern struct IpcModule gIpcModule; - -#endif /* _ILM_CONFIGURATION_H_ */ diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_tools.h b/ivi-layermanagement-api/ilmCommon/include/ilm_tools.h deleted file mode 100644 index 20742c4..0000000 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_tools.h +++ /dev/null @@ -1,97 +0,0 @@ -/*************************************************************************** -* -* Copyright 2013 BMW Car IT GmbH -* -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -****************************************************************************/ -#ifndef _ILM_TOOLS_H_ -#define _ILM_TOOLS_H_ - -#include "ilm_configuration.h" -#include "ilm_types.h" -#include -#include - -/* - *============================================================================= - * Implementation of thread-safe circular queue for local use - *============================================================================= - */ -typedef struct -{ - pthread_mutex_t queueMutex; - sem_t readBlockSemaphore; - - t_ilm_uint size; - t_ilm_uint maxSize; - t_ilm_uint readPos; - t_ilm_uint writePos; - - t_ilm_message* messages; -} t_ilm_msg_queue; - -extern t_ilm_msg_queue notificationQueue; -extern t_ilm_msg_queue incomingQueue; -extern pthread_mutex_t gSendReceiveLock; - -void init_msg_queue(t_ilm_msg_queue* pQueue, t_ilm_uint maxSize); -t_ilm_bool msg_enqueue(t_ilm_msg_queue* pQueue, t_ilm_message message); -t_ilm_message msg_dequeue(t_ilm_msg_queue* pQueue); -void destroy_msg_queue(t_ilm_msg_queue* pQueue); - -/* - *============================================================================= - * notification callback management - *============================================================================= - */ -struct LayerCallback -{ - t_ilm_uint id; - layerNotificationFunc callback; -}; - -struct SurfaceCallback -{ - t_ilm_uint id; - surfaceNotificationFunc callback; -}; - -void initNotificationCallbacks(); -layerNotificationFunc getLayerNotificationCallback(t_ilm_layer layer); -surfaceNotificationFunc getSurfaceNotificationCallback(t_ilm_surface surface); -t_ilm_bool findLayerCallback(t_ilm_layer layer); -t_ilm_bool addLayerCallback(t_ilm_layer layer, layerNotificationFunc func); -t_ilm_bool findSurfaceCallback(t_ilm_surface surface); -t_ilm_bool addSurfaceCallback(t_ilm_surface surface, surfaceNotificationFunc func); -void removeLayerCallback(t_ilm_layer layer); -void removeSurfaceCallback(t_ilm_surface layer); - -/* - *============================================================================= - * internal thread management - *============================================================================= - */ -void* notificationThreadLoop(void* param); -void* receiveThreadLoop(void* param); - -/* - *============================================================================= - * receive with timeout - *============================================================================= - */ -void calculateTimeout(struct timeval* currentTime, int giventimeout, struct timespec* timeout); -t_ilm_bool sendAndWaitForResponse(t_ilm_message command, t_ilm_message* response, int timeoutInMs, ilmErrorTypes* error); - -#endif /* _ILM_TOOLS_H_ */ diff --git a/ivi-layermanagement-api/ilmCommon/include/ilm_types.h b/ivi-layermanagement-api/ilmCommon/include/ilm_types.h index aed9e81..3119a5c 100644 --- a/ivi-layermanagement-api/ilmCommon/include/ilm_types.h +++ b/ivi-layermanagement-api/ilmCommon/include/ilm_types.h @@ -27,6 +27,10 @@ */ #define ILM_BIT(x) (1 << (x)) +/** + * invalid ID does not refer to an acutaly object id. + */ +#define INVALID_ID 0xFFFFFFFF /** * \brief Represent the logical true value diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c index 311eab8..f487f79 100644 --- a/ivi-layermanagement-api/ilmCommon/src/ilm_common.c +++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common.c @@ -23,9 +23,7 @@ #include #include "ilm_common.h" #include "ilm_common_platform.h" -#include "ilm_tools.h" #include "ilm_types.h" -#include "ilm_configuration.h" /* GCC visibility */ #if defined(__GNUC__) && __GNUC__ >= 4 diff --git a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c index 7eb6210..a7f90cc 100644 --- a/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c +++ b/ivi-layermanagement-api/ilmCommon/src/ilm_common_wayland_platform.c @@ -23,9 +23,7 @@ #include #include "ilm_common.h" #include "ilm_common_platform.h" -#include "ilm_tools.h" #include "ilm_types.h" -#include "ilm_configuration.h" #include "wayland-util.h" #include "wayland-client.h" -- cgit v1.2.1