aboutsummaryrefslogtreecommitdiffstats
path: root/ucs2-interface
diff options
context:
space:
mode:
Diffstat (limited to 'ucs2-interface')
-rw-r--r--ucs2-interface/ucs_config.h4
-rw-r--r--ucs2-interface/ucs_interface.h4
-rw-r--r--ucs2-interface/ucs_lib_interf.c20
-rw-r--r--ucs2-interface/ucs_vol_interf.c6
4 files changed, 17 insertions, 17 deletions
diff --git a/ucs2-interface/ucs_config.h b/ucs2-interface/ucs_config.h
index fdca515..2b61f16 100644
--- a/ucs2-interface/ucs_config.h
+++ b/ucs2-interface/ucs_config.h
@@ -134,7 +134,7 @@ typedef struct
bool initialized;
RB_t rb;
uint8_t rbBuf[(CMD_QUEUE_LEN * sizeof(UnicensCmdEntry_t))];
- Ucs_Inst_t *unicens;
+ Ucs_Inst_t *UNICENS;
Ucs_InitData_t uniInitData;
bool triggerService;
Ucs_Lld_Api_t *uniLld;
@@ -142,4 +142,4 @@ typedef struct
UnicensCmdEntry_t *currentCmd;
} UCSI_Data_t;
-#endif /* UNICENSINTEGRATION_H_ */ \ No newline at end of file
+#endif /* UNICENSINTEGRATION_H_ */
diff --git a/ucs2-interface/ucs_interface.h b/ucs2-interface/ucs_interface.h
index 39ecdf7..5696897 100644
--- a/ucs2-interface/ucs_interface.h
+++ b/ucs2-interface/ucs_interface.h
@@ -33,7 +33,7 @@ extern "C" {
/*>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
/* Public API */
/*>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-
+
// Fulup interface added to support ucs2vol
typedef const struct {
char* name;
@@ -194,4 +194,4 @@ extern void UCSI_CB_OnMgrReport(void *pTag, Ucs_MgrReport_t code, uint16_t nodeA
}
#endif
-#endif /* UCSI_H_ */ \ No newline at end of file
+#endif /* UCSI_H_ */
diff --git a/ucs2-interface/ucs_lib_interf.c b/ucs2-interface/ucs_lib_interf.c
index 6f3acbe..c0d4ce4 100644
--- a/ucs2-interface/ucs_lib_interf.c
+++ b/ucs2-interface/ucs_lib_interf.c
@@ -69,8 +69,8 @@ void UCSI_Init(UCSI_Data_t *my, void *pTag)
memset(my, 0, sizeof(UCSI_Data_t));
my->magic = MAGIC;
my->tag = pTag;
- my->unicens = Ucs_CreateInstance();
- if (NULL == my->unicens)
+ my->UNICENS = Ucs_CreateInstance();
+ if (NULL == my->UNICENS)
{
UCSI_CB_OnUserMessage(my->tag, "Can not instance a new version of UNICENS, "\
"increase UCS_NUM_INSTANCES define", 0);
@@ -157,32 +157,32 @@ void UCSI_Service(UCSI_Data_t *my) {
UnicensCmdEntry_t *e;
bool popEntry = true; //Set to false in specific case, where function will callback asynchrony.
assert(MAGIC == my->magic);
- if (NULL != my->unicens && my->triggerService) {
+ if (NULL != my->UNICENS && my->triggerService) {
my->triggerService = false;
- Ucs_Service(my->unicens);
+ Ucs_Service(my->UNICENS);
}
if (NULL != my->currentCmd) return;
my->currentCmd = e = (UnicensCmdEntry_t *)RB_GetReadPtr(&my->rb);
if (NULL == e) return;
switch (e->cmd) {
case UnicensCmd_Init:
- if (UCS_RET_SUCCESS == Ucs_Init(my->unicens, e->val.Init.init_ptr, OnUcsInitResult))
+ if (UCS_RET_SUCCESS == Ucs_Init(my->UNICENS, e->val.Init.init_ptr, OnUcsInitResult))
popEntry = false;
else
UCSI_CB_OnUserMessage(my->tag, "Ucs_Init failed", 0);
break;
case UnicensCmd_Stop:
- if (UCS_RET_SUCCESS == Ucs_Stop(my->unicens, OnUcsStopResult))
+ if (UCS_RET_SUCCESS == Ucs_Stop(my->UNICENS, OnUcsStopResult))
popEntry = false;
else
UCSI_CB_OnUserMessage(my->tag, "Ucs_Stop failed", 0);
break;
case UnicensCmd_RmSetRoute:
- if (UCS_RET_SUCCESS != Ucs_Rm_SetRouteActive(my->unicens, e->val.RmSetRoute.routePtr, e->val.RmSetRoute.isActive))
+ if (UCS_RET_SUCCESS != Ucs_Rm_SetRouteActive(my->UNICENS, e->val.RmSetRoute.routePtr, e->val.RmSetRoute.isActive))
UCSI_CB_OnUserMessage(my->tag, "Ucs_Rm_SetRouteActive failed", 0);
break;
case UnicensCmd_NsRun:
- if (UCS_RET_SUCCESS != Ucs_Ns_Run(my->unicens, e->val.NsRun.node_ptr, OnUcsNsRun))
+ if (UCS_RET_SUCCESS != Ucs_Ns_Run(my->UNICENS, e->val.NsRun.node_ptr, OnUcsNsRun))
UCSI_CB_OnUserMessage(my->tag, "Ucs_Ns_Run failed", 0);
break;
default:
@@ -199,8 +199,8 @@ void UCSI_Service(UCSI_Data_t *my) {
void UCSI_Timeout(UCSI_Data_t *my)
{
assert(MAGIC == my->magic);
- if (NULL == my->unicens) return;
- Ucs_ReportTimeout(my->unicens);
+ if (NULL == my->UNICENS) return;
+ Ucs_ReportTimeout(my->UNICENS);
}
/************************************************************************/
diff --git a/ucs2-interface/ucs_vol_interf.c b/ucs2-interface/ucs_vol_interf.c
index fc2952e..f681ba4 100644
--- a/ucs2-interface/ucs_vol_interf.c
+++ b/ucs2-interface/ucs_vol_interf.c
@@ -34,7 +34,7 @@ static UCSI_channelsT ucsiChannels[] = {
{.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}
};
@@ -46,13 +46,13 @@ void UCSI_Vol_Service (UCSI_Data_t *pPriv) {
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);
+ 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));
}