diff options
Diffstat (limited to '4a-hal')
| -rw-r--r-- | 4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c | 4 | ||||
| -rw-r--r-- | 4a-hal/4a-hal-utilities/4a-hal-utilities-data.c | 2 | ||||
| -rw-r--r-- | 4a-hal/4a-hal-utilities/4a-hal-utilities-data.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c index 924054b..cb4ea93 100644 --- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c +++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c @@ -34,7 +34,7 @@ * HAL controllers handle mixer calls functions * ******************************************************************************/ -int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *mixerResponseJ) +int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalMixerDataT *currentHalStreamsData, json_object *mixerResponseJ) { int err = (int) MIXER_NO_ERROR; unsigned int idx; @@ -63,7 +63,7 @@ int HalCtlsHandleMixerAttachResponse(AFB_ApiT apiHandle, struct CtlHalStreamsDat return (int) MIXER_ERROR_NO_STREAMS; } - currentHalStreamsData->data = (struct CtlHalStreamData *) calloc(currentHalStreamsData->count, sizeof(struct CtlHalStreamData)); + currentHalStreamsData->data = (struct CtlHalMixerData *) calloc(currentHalStreamsData->count, sizeof(struct CtlHalMixerData)); CtlHalDynApiStreamVerbs = alloca((currentHalStreamsData->count + 1) * sizeof(struct HalUtlApiVerb)); memset(CtlHalDynApiStreamVerbs, '\0', (currentHalStreamsData->count + 1) * sizeof(struct HalUtlApiVerb)); diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c index b2c4b25..e8f54a2 100644 --- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c +++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.c @@ -31,7 +31,7 @@ * Specfic Hal controller streams data handling functions * ******************************************************************************/ -uint8_t HalUtlRemoveAllCtlHalStreamsData(struct CtlHalStreamsDataT *ctlHalStreamsData) +uint8_t HalUtlRemoveAllCtlHalStreamsData(struct CtlHalMixerDataT *ctlHalStreamsData) { unsigned int cpt; diff --git a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h index a79a7f1..244546f 100644 --- a/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h +++ b/4a-hal/4a-hal-utilities/4a-hal-utilities-data.h @@ -37,14 +37,14 @@ enum HalStatus { }; // Structure to store stream data -struct CtlHalStreamData { +struct CtlHalMixerData { char *name; char *streamCardId; }; // Structure to store stream data table -struct CtlHalStreamsDataT { - struct CtlHalStreamData *data; +struct CtlHalMixerDataT { + struct CtlHalMixerData *data; unsigned int count; }; @@ -54,7 +54,7 @@ struct CtlHalSpecificData { char *mixerVerbName; json_object *halMixerJ; - struct CtlHalStreamsDataT ctlHalStreamsData; + struct CtlHalMixerDataT ctlHalStreamsData; struct CtlHalAlsaMapT *ctlHalAlsaMapT; AFB_ApiT apiHandle; |