summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-10-08Update version of app-controller submodule.Jonathan Aillet1-0/+0
Changes of app-controller: (e45d063 - Romain Forlot) Execute ConfigExec only if section is existing (2d1c3d2 - Romain Forlot) Always set the api member even if NULL. (9622138 - Romain Forlot) Ability to add a plugin after the initial load Change-Id: Ic7ad650e6d30af71f8ed3760634e2b14c6507f1d Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update version of afb-helpers submodule.Jonathan Aillet1-0/+0
Changes of afb-helpers: (5811a53 - Jonathan Aillet) At search, use the prefix parameter as a prefix (2c29f15 - Loïc Collignon) Remove deprecated use of cmake/Qt macro (5bec8c5 - Loïc Collignon) Rename method to avoid conflict with Qt's one (43ec971 - Sebastien Douheret) Fix warnings due to json-c evolution (9a1f7ea - jobol) wrap-json: new helper functions for comparison (c7cd527 - Sebastien Douheret) Removed anonymous function in ScanDir and fixed warnings (98c64ea - José Bollo) wrap-json: Add clone facility (5ae2a7a - Sebastien Douheret) Disabled debug code (only used for testing). Change-Id: Ifea25d4f54b28a374e3add98a516ddf09b73bfa1 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update version of app-controller submodule.Loïc Collignon2-6/+2
Changes of app-controller: (0f3063b - Romain Forlot) Be able to dispatch required api at the wanted time (1ff524b - Romain Forlot) Change LUA package path at LUA interpreter load (738ae54 - Romain Forlot) Don't load two times a plugin even for LUA (c04f029 - Sebastien Douheret) Fixed hidden bound variable (apiHandle) (cfe3919 - Sebastien Douheret) Fixed null value when push Lua arguments (69c0585 - José Bollo) Adjust to compile with incoming bindings v3 (d7e260c - José Bollo) Remove declaration to not existing functions (8ac6625 - Romain Forlot) Add 2 lua utilities function (d3504bb - Jonathan Aillet) Update README.md for new metadata keys. Change-Id: Iee42482b7a6834977497c27fe634cee9a5f96e0c Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
2018-10-08Correct audio configurations for Rcar boardsJonathan Aillet2-14/+24
Correct audio configurations for the following Rcar boards : - M3 - M3/Kingfisher Change-Id: Ie68be0385fb978b44dea4ce2afd4e9fdc0c8c45c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Disable community hals by defaultJonathan Aillet8-17/+23
Disable community hals by default. Also move some hals from reference configurations directory to community configurations directory. Add prefixes to all hal for mixer attach. Change-Id: Ib1f74c313dbc4596457f9535d3e593a7019b55fa Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Fix spelling in README.mdJonathan Aillet1-12/+12
Change-Id: I009b19e5448eefaa63e96e1c0984cb4ed4f4eaa0 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Improve hal list response from hal-managerJonathan Aillet2-45/+38
Improve 'loaded' verb response from hal-manager by only sending back the hal with the 'READY' status. Also add two boolean options to this verb call : - 'verbose' option to get all information of the hal. - 'all' option to get all hal and not just the 'READY' ones. Change-Id: I23d3d8ab75b429b2938249d10adbb67073eff259 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Remove boolean libraryJonathan Aillet13-18/+5
As it was almost never used in code, remove boolean library. Change-Id: I9264ffd5600a7d9526f4f4cfa8209a0cd0e5bb77 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Free json objects that should have been freedJonathan Aillet4-86/+123
Free json objects that should have been freed after use. Change-Id: Ifb3dab9672d0c039292ae05f23ade008fe82ade8 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct handling of incomming json messagesJonathan Aillet3-6/+13
Correct handling of incomming json messages. An error occured when a received json object was an array containing only one item. Change-Id: I2c6f27f0fd87e11c356b8d4e6bd02d472bc3d60b Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Authorize launching 4a-hal with no config fileJonathan Aillet1-3/+3
Now, even if no json audio configuration files are found at binding launch, it won't fails to initialize and will be reachable nethertheless. Change-Id: If7dd0798ef4b262eda98c5dbcc7dd6d9b1b108b5 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct the request return when calling a streamJonathan Aillet1-8/+8
Correct the request return when someone tries to execute an action on a stream. Now, it is successfull if the mixer says so even if no response object was returned. Change-Id: Iee965db3e826ed9040c4b2bf50eaf9090584c1bc Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Delay event parsing to be the lastJonathan Aillet1-13/+18
Delay event parsing to be the last. This is to avoid receiving events before everything is parsed. Do some minor layout changes. Change-Id: I0fd3f8d387c27471657c58ca8c4ea5828c002e23 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Optimize alsacore event handlerJonathan Aillet1-18/+14
Optimize alsacore event handler by avoiding generating a string to detect an alsacore event. Change-Id: I7498e99741b2b7095076016143ec8be6520ee122 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update Kingfisher json configuration filesJonathan Aillet1-1/+1
Update Kingfisher json configuration files to avoid confilcts with regular m3 json configuration file. Change-Id: I8b9425065dc273fc8e66a1f4c5822c93168b183c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Authorize empty response from mixerJonathan Aillet1-4/+4
Authorize empty response from mixer because a hal could configure no streams/captures/playbacks. Change-Id: I59b703aca72e8a70e10d41b28a95c3a022797a89 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Call onload section to before halmap sectionJonathan Aillet1-3/+3
Call onload section to before halmap section. This will be usefull if we want to execute action before the first alsa calls. Change-Id: Ia1b6428d322fb94538fee7b69b4886ab419a597c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct typo in README.mdJonathan Aillet1-5/+5
Correct some typo in README. Change-Id: If6a2cd3a710a775dc86f33c1a9241e21814264b0 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-084a-hal-cfg-reference: add HAL definition for M3 on KingfisherStephane Desneux1-0/+199
When M3 board is plugged on Kingfisher board, the internal M3 card is not reachable with the same device name, due to changes in the DTB. The added file hal-4a-rcar-m3kf.json is thus a copy of hal-4a-rcar-m3.json where '/dev/snd/by-path/platform-sound' has been replaced by '/dev/snd/by-path/platform-sound@1' (<- '@1' at the end) Change-Id: I44c07ee83b3d884fb52a28f6ed1418765a0a0816 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-10-08Correct a failed request warning messageJonathan Aillet1-1/+1
Correct a failed request warning message. Change-Id: Iefdf1cb29af55dc1f4ea098ede032c33fb3b4138 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update README.mdJonathan Aillet1-14/+32
Add some indications about hal selection and known issues. Change-Id: Ib09eac904029a1faf15bb8239e9188f8b39c17c1 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08config.cmake: adjust paths (CONTROL_*_PATH)Stephane Desneux1-3/+3
At runtime, the controller should search paths inside ${CMAKE_INSTALL_PREFIX}/${PROJECt_NAME}, typically: /usr/libexec/agl/4a-hal/ Change-Id: I8165a1c389dcb7e24d0e336918f0698295de1c23 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-10-08Add Hal (audio json configration files)Jonathan Aillet7-2/+986
Add some audio json configration files inspired from hal available in '4a-hal-reference' and '4a-hal-community'. Each one of these files are meant to be be a reproduction of old hal using the new 4a-hal implementation. List of hal added : - Rcar M3 - Intel Minnowboard - 2ch generic usb - Intel - Jabra solemate - Ensoniq Change-Id: I6bac5ed1e6d4ab72975427a9a2343851f874df79 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update USB json configuration filesJonathan Aillet4-11/+206
Update USB json configuration files and README. Change-Id: Ib217da9189fd928e0842bf8da85a362c1423080e Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Change verb prefix separator accroding to mixerJonathan Aillet1-1/+1
Change verb prefix separator charactor accroding to mixer. Change-Id: Ifbeb715490371ffdf835599b47076d8c17447571 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct typo in READMEJonathan Aillet1-3/+5
Correct some typo in README. Change-Id: I4427a2c09866bab975334b1577ff83d6b8439947 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Auithorize sending empty json to verbsJonathan Aillet2-13/+11
Auithorize sending empty json to hal-manager 'loaded 'verb and to hal 'info' verb. Change-Id: Id664b0335ad80f88392dd24cd910016deaad25e3 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Move onload section parsing lastJonathan Aillet1-1/+1
To avoid onload action to be launch before the configuration sets in other sections, parse onload section last. Change-Id: Icdc77239a9784e559bd9df130d3dc63c7ba5801b Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Revert "Move controller config exec before onload action"Jonathan Aillet1-8/+4
This reverts commit 19080e452e5ae909f64e09a4edfe9c57fbac43a4. Change-Id: I82c8f0a867a20995443f0cd600d5118ee9e3128d Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Return the result of call to mixerJonathan Aillet1-7/+20
Return the response field of mixer reponse to the caller of stream/capture/playback verbs. Force the verbose key in sent object. Change-Id: I5b87da0042c86c6b7dc8853af66cddd2f6819532 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct some compilation warningsJonathan Aillet4-6/+6
Correct some compilation warnings that appeared in some gcc versions. Change-Id: I846c573f3128f7d5d5da8b7d2eb1b63dc61af1ab Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct a cast errorJonathan Aillet1-1/+1
Correct a cast error that was causing a segfault in some unknown condition. Change-Id: I96c89c04d4f6bd5177446c56b4c50cbab30b4830 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Print some errors in info verbsJonathan Aillet3-11/+18
Print errors info when an error happen during call to mixer 'info' verb. Change-Id: Ic3b0b6312743af3ba41a7868d1347ce6b0fcc8cd Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Test 'asprintf' returnJonathan Aillet1-1/+4
Test 'asprintf' return to avoid compilation warning when building with yocto. Change-Id: I322890a149aff86c30afc7a654540d82dc0a8957 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update README.md accordingly to recent changesJonathan Aillet1-22/+56
Update README.md accordingly to recent changes. Change-Id: I88920073b63911fa709bb2331a81b1a06a9d8049 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Updates json controller configuration filesJonathan Aillet1-5/+4
Change stream uid to simplify search. Remove the prefix as it won't be used (for now). Change-Id: Ieafc53f51458648860334ac3a4fb641446d8639f Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Use structure defined in controller to load verbsJonathan Aillet4-13/+10
Use structure defined in controller to load verbs into an api using 'HalUtlLoadVerbs' function. Change-Id: I57aabf9ce2c580fc98b7ea8438cd01083e032ac2 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Rename files handling call/response of mixerJonathan Aillet5-5/+8
Rename files handling call/response of mixer. Change-Id: I070f109e2f0249b74548ae7dc7b84793926cb261 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Update 4a-hal to work with new 4a-softmixerJonathan Aillet7-214/+483
Update 4a-hal to work with new 4a-softmixer version : - Update audio configuration files to match the configuration format expected by the mixer. - Parse mixer attach response to get information about 'streams', 'playbacks', and 'captures'. store them in new field of controller hal data structure. - Create verb for each returned stream, but only one playback/capture verb even if threre are multiple playbacks/captures returned by the mixer attch verb. - Return 'streams', 'playbacks', and 'captures' when info verb is called. - If info verb is called with a json request, the request is transfered to the mixer. Change-Id: I65593281c34aa91ad87afbf8bebff755cc5cc6d0 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Correct a syntax mistake in function declarationJonathan Aillet1-1/+1
Correct a syntax mistake in 'HalCtlsNormalizeJsonValues' function declaration. Change-Id: If8f32c9f55a7c8b1075a5b493d467e66d4b2c1f6 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Change mixer data structures namesJonathan Aillet3-7/+7
Change mixer data structures names bacause we won't only stores streams data anymore. Change-Id: Id7e4482b6a69696d156c6a8bfc8f8d231dba9d2c Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Change name of 'list' verb to 'info'Jonathan Aillet3-3/+3
Change name of 'list' verb to 'info'. Change-Id: I9062344b67cc2c19bce9a34d4ac7abfc1baa9428 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Move controller config exec before onload actionJonathan Aillet1-4/+8
Before, the onload action specified in the audio configuration file (see controller documention) was exectued before the sections configuration execution call. So, the onload action was launched before the hal was ready. Now, onload action is launched last. Change-Id: I05d46622b938ae5a818bd404779a2263ed334397 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Remove test cfg files and add community cfg fileJonathan Aillet6-216/+62
Now, the configuration files should be into these 2 directories : - 4a-hal-cfg-community/ - 4a-hal-cfg-reference/ A configuration file has been added for 'CSL CM106 8ch USB' audio device in community directory. The test configuration files has been removed. The README.md has been updated accordingly to these modifications. Change-Id: I03d197a534b2a36bacea8e09d3098b5b92c8d3b7 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Add search for a concurent hal at mixer attachJonathan Aillet1-3/+19
At hal mixer attach, add search for an already ready hal using the same alsa audio device id. If this concurent hal exists, return an error. Change-Id: Ia17738fe87c7bc82fa1867ecd031dd07ffa73714 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Add a function to search for hal using its dev-idJonathan Aillet2-0/+20
Add a function that allows to search for an already ready hal using its device id. This function will be useful at mixer attach of hal to check if the alsa device id is not already attach by another hal. Change-Id: I2f46dca19a98310064ed1af772425bd9186e0a75 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Return an error when hal attach to mixer fails.Jonathan Aillet1-1/+3
Return an error when hal is not successfully attach to mixer. Change-Id: Ibfacf405153e87d8005feba17f963b2f49caad7a Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Change paramters in functions handling hal dataJonathan Aillet4-28/+30
Change paramters in functions handling hal data structure. Now, the only thing you need to add/search for/remove something in hal data structure list is the address of the first element of the list instead of the address of the whole hal manager data structure. Change-Id: Iafa7428735c3aa418a6ef6564f9acde8f44e7dfe Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Add device id when hal metadata are askedJonathan Aillet1-7/+18
Add device id to response when hal metadata are asked (with verb 'loaded'). Also handle this metadata when an external hal is registered (verb 'loaded'). Change-Id: I25fafce13c8a215ed5991cfee2a399d8d6631c47 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
2018-10-08Use a local strucuture to store hal manager dataJonathan Aillet2-7/+18
Use a local strucuture to store hal manager global data. Also declare a function that allows to get the first hal data structure in the list managed by hal manager. Change-Id: I4b36030435bca506b5ba3a08dfbca039eb02e43e Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>