diff options
| author |   Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-10-23 10:21:06 +0200 |
|---|---|---|
| committer | Jonathan Aillet <jonathan.aillet@iot.bzh> | 2018-11-02 16:12:26 +0100 |
| commit | be188c31f2528cdabfffd07ef1ec87ff6c23330a (patch) | |
| tree | 9a9dded7fd8348ff2abb71ed046963a1f9a811b7 /4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c | |
| parent | cabdc828ee3eb35d780f2145fdb37081a5f6d71d (diff) | |
Use ctl defines to call afb functions
Use controller 'afb-defintions.h' defines to call application
framework functions.
Change-Id: If9599b0397a593440ce2e08f039dc279c63f7428
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c')
| -rw-r--r-- | 4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c index d2ae7d4..7baa22c 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c @@ -58,7 +58,7 @@ static CtlSectionT ctrlSections[] = ******************************************************************************/ // Every HAL export the same API & Interface Mapping from SndCard to AudioLogic is done through alsaHalSndCardT -static AFB_ApiVerbs CtlHalDynApiStaticVerbs[] = +static AFB_ApiVerbs CtlHalApiStaticVerbs[] = { /* VERB'S NAME FUNCTION TO CALL SHORT DESCRIPTION */ { .verb = "info", .callback = HalCtlsInfo, .info = "List available streams/playbacks/captures... for this api" }, @@ -82,7 +82,7 @@ static int HalCtlsInitOneApi(AFB_ApiT apiHandle) AFB_default = apiHandle; // Retrieve section config from api handle - ctrlConfig = (CtlConfigT *) afb_dynapi_get_userdata(apiHandle); + ctrlConfig = (CtlConfigT *) AFB_ApiGetUserData(apiHandle); if(! ctrlConfig) return -2; @@ -128,10 +128,10 @@ static int HalCtlsLoadOneApi(void *cbdata, AFB_ApiT apiHandle) ctrlConfig = (CtlConfigT*) cbdata; // Save closure as api's data context - afb_dynapi_set_userdata(apiHandle, ctrlConfig); + AFB_ApiSetUserData(apiHandle, ctrlConfig); // Add static controls verbs - if(HalUtlLoadVerbs(apiHandle, CtlHalDynApiStaticVerbs)) { + if(HalUtlLoadVerbs(apiHandle, CtlHalApiStaticVerbs)) { AFB_ApiError(apiHandle, "Load Section : fail to register static V2 verbs"); return 1; } @@ -141,10 +141,10 @@ static int HalCtlsLoadOneApi(void *cbdata, AFB_ApiT apiHandle) return err; // Declare an event manager for this Api - afb_dynapi_on_event(apiHandle, HalCtlsDispatchApiEvent); + AFB_ApiOnEvent(apiHandle, HalCtlsDispatchApiEvent); // Init Api function (does not receive user closure ???) - afb_dynapi_on_init(apiHandle, HalCtlsInitOneApi); + AFB_ApiOnInit(apiHandle, HalCtlsInitOneApi); return 0; } @@ -183,7 +183,7 @@ int HalCtlsCreateApi(AFB_ApiT apiHandle, char *path, struct HalMgrData *HalMgrGl currentCtlHalData->ctlHalSpecificData = calloc(1, sizeof(struct CtlHalSpecificData)); // Create one API (Pre-V3 return code ToBeChanged) - if(afb_dynapi_new_api(apiHandle, ctrlConfig->api, ctrlConfig->info, 1, HalCtlsLoadOneApi, ctrlConfig)) + if(! AFB_NewApi(apiHandle, ctrlConfig->api, ctrlConfig->info, 1, HalCtlsLoadOneApi, ctrlConfig)) return -5; return 0; |