diff options
Diffstat (limited to 'src/4a-hal-manager/4a-hal-manager-cb.c')
| -rw-r--r-- | src/4a-hal-manager/4a-hal-manager-cb.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/src/4a-hal-manager/4a-hal-manager-cb.c b/src/4a-hal-manager/4a-hal-manager-cb.c index a726d05..0768526 100644 --- a/src/4a-hal-manager/4a-hal-manager-cb.c +++ b/src/4a-hal-manager/4a-hal-manager-cb.c @@ -67,8 +67,6 @@ void HalMgrLoaded(afb_req_t request) { int requestJsonErr = 0, allHal = 0, verbose = 0, wrapRet = 0; - char cardIdString[32]; - afb_api_t apiHandle; struct HalMgrData *halMgrData; struct HalData *currentHalData; @@ -110,10 +108,6 @@ void HalMgrLoaded(afb_req_t request) if(allHal || currentHalData->status == HAL_STATUS_READY) { // Case if request key is 'verbose' and value is bigger than 0 if(! requestJsonErr && verbose) { - if(currentHalData->sndCardId >= 0) - snprintf(cardIdString, sizeof(cardIdString), "hw:%i", currentHalData->sndCardId); - else - snprintf(cardIdString, sizeof(cardIdString), "not-found"); dependenciesJ = HalUtlGetJsonArrayForAllDependencies(apiHandle, ¤tHalData->internalHalData->probedDevicesListHead, @@ -122,17 +116,15 @@ void HalMgrLoaded(afb_req_t request) AFB_REQ_WARNING(request, "Didn't succeed to generate all dependencies compact json array"); wrapRet = wrap_json_pack(&apiRequestedInfoJ, - "{s:s s:i s:s s:i s:s s:s s:s s:s s:s s:s s?:o}", + "{s:s s:i s:i s:s s:s s:s s:s s:s s?:o}", "api", currentHalData->apiName, "status", (int) currentHalData->status, - "sndcard", currentHalData->sndCardPath, "internal", (int) currentHalData->internal, "uid", currentHalData->uid, "info", currentHalData->info ? currentHalData->info : "", "author", currentHalData->author ? currentHalData->author : "", "version", currentHalData->version ? currentHalData->version : "", "date", currentHalData->date ? currentHalData->date : "", - "snd-dev-id", cardIdString, "dependencies", dependenciesJ); } // Case if request is empty or not handled @@ -157,9 +149,7 @@ void HalMgrLoaded(afb_req_t request) void HalMgrLoad(afb_req_t request) { - int cardId = -1; - - char *apiName, *sndCardPath, *info = NULL, *author = NULL, *version = NULL, *date = NULL; + char *apiName, *uid, *info = NULL, *author = NULL, *version = NULL, *date = NULL; afb_api_t apiHandle; struct HalMgrData *halMgrData; @@ -191,14 +181,13 @@ void HalMgrLoad(afb_req_t request) } if(wrap_json_unpack(apiReceivedMetadata, - "{s:s s:s s?:s s?:s s?:s s?:s s?:i}", + "{s:s s:s s?:s s?:s s?:s s?:s}", "api", &apiName, - "uid", &sndCardPath, + "uid", &uid, "info", &info, "author", &author, "version", &version, - "date", &date, - "snd-dev-id", &cardId)) { + "date", &date)) { afb_req_fail(request, "api_metadata", "Can't metadata of api to register"); return; } @@ -218,11 +207,11 @@ void HalMgrLoad(afb_req_t request) return; } - addedHal->sndCardPath = strdup(sndCardPath); - if(! addedHal->sndCardPath) { + addedHal->uid = strdup(uid); + if(! addedHal->uid) { afb_req_fail(request, "sndcardpath_string_allocation", - "Didn't succeed to store (allocate) 'sndCardPath' string"); + "Didn't succeed to store (allocate) 'uid' string"); HalUtlRemoveSelectedHalFromList(&halMgrData->halDataListHead, addedHal); return; } @@ -271,8 +260,6 @@ void HalMgrLoad(afb_req_t request) } } - addedHal->sndCardId = cardId; - // TBD JAI: add subscription to this api status events, if subscription fails, remove hal from list afb_req_success(request, NULL, "Api successfully registered"); |