diff options
Diffstat (limited to 'ucs2-interface')
-rw-r--r-- | ucs2-interface/CMakeLists.txt | 4 | ||||
-rw-r--r-- | ucs2-interface/ucs_interface.h | 12 | ||||
-rw-r--r-- | ucs2-interface/ucs_vol_interf.c | 57 |
3 files changed, 2 insertions, 71 deletions
diff --git a/ucs2-interface/CMakeLists.txt b/ucs2-interface/CMakeLists.txt index 4d3c5ee..cd5e880 100644 --- a/ucs2-interface/CMakeLists.txt +++ b/ucs2-interface/CMakeLists.txt @@ -21,13 +21,13 @@ PROJECT_TARGET_ADD(ucs2-inter) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDEBUG") # Define targets - ADD_LIBRARY(ucs2-inter STATIC ucs_lib_interf.c ucs_vol_interf.c ucs-xml/UcsXml.c ucs-xml/UcsXml_Private.c) + ADD_LIBRARY(ucs2-inter STATIC ucs_lib_interf.c ucs-xml/UcsXml.c ucs-xml/UcsXml_Private.c) # Library properties SET_TARGET_PROPERTIES(ucs2-inter PROPERTIES OUTPUT_NAME ucs2interface) # Depends on Unicens2 lib - TARGET_LINK_LIBRARIES(ucs2-inter ucs2-lib ucs2-vol) + TARGET_LINK_LIBRARIES(ucs2-inter ucs2-lib) # Define includes TARGET_INCLUDE_DIRECTORIES(ucs2-inter diff --git a/ucs2-interface/ucs_interface.h b/ucs2-interface/ucs_interface.h index 82bba55..5f02851 100644 --- a/ucs2-interface/ucs_interface.h +++ b/ucs2-interface/ucs_interface.h @@ -41,18 +41,6 @@ extern "C" { /* Public API */ /*>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ -// Fulup interface added to support ucs2vol -typedef const struct { - char* name; - int numid; -} UCSI_channelsT; - -typedef void (*UCSI_VolumeServiceCB_t)(uint16_t timeout); -UCSI_channelsT *UCSI_Vol_Init (UCSI_Data_t *pPriv, UCSI_VolumeServiceCB_t serviceCB); -uint8_t UCSI_Vol_Set (UCSI_Data_t *pPriv, int numId, uint8_t volume); -void UCSI_Vol_Service (UCSI_Data_t *pPriv); - - /** * \brief Initializes Unicens Integration module. * \note Must be called before any other function of this component diff --git a/ucs2-interface/ucs_vol_interf.c b/ucs2-interface/ucs_vol_interf.c deleted file mode 100644 index 5d65d4a..0000000 --- a/ucs2-interface/ucs_vol_interf.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Unicens Integration Helper Component - * - * Copyright (C) 2017 Microchip Technology Germany II GmbH & Co. KG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * You may also obtain this software under a propriety license from Microchip. - * Please contact Microchip for further information. - * - */ -#include <assert.h> -#include "ucs_interface.h" -#include "libmostvolume.h" - -static UCSI_channelsT ucsiChannels[] = { - {.name= "FRONT_LEFT" , .numid= (int)LIB_MOST_VOLUME_CH_FRONT_LEFT}, - {.name= "FRONT_RIGHT", .numid= (int)LIB_MOST_VOLUME_CH_FRONT_RIGHT}, - {.name= "REAR_LEFT" , .numid= (int)LIB_MOST_VOLUME_CH_REAR_LEFT}, - {.name= "REAR_LEFT" , .numid= (int)LIB_MOST_VOLUME_CH_REAR_RIGHT}, - {.name= "CENTER" , .numid= (int)LIB_MOST_VOLUME_CH_CENTER}, - {.name= "SUB" , .numid= (int)LIB_MOST_VOLUME_CH_SUB}, - {.name= "MASTER" , .numid= (int)LIB_MOST_VOLUME_MASTER}, - - {.name= NULL} -}; - -// Small wrapper as UCSI and UCSVOL do not use the same handle -void UCSI_Vol_Service (UCSI_Data_t *pPriv) { - (void)lib_most_volume_service(); - -} - -UCSI_channelsT *UCSI_Vol_Init (UCSI_Data_t *pPriv, UCSI_VolumeServiceCB_t serviceCB) { - int err; - err = lib_most_volume_init(pPriv->unicens, (lib_most_volume_service_cb_t) serviceCB); - if (err) return (NULL); - else return (ucsiChannels); -} - -uint8_t UCSI_Vol_Set(UCSI_Data_t *pPriv, int numid, uint8_t volume) { - - return (lib_most_volume_set((enum lib_most_volume_channel_t)numid, volume)); -} - - |