aboutsummaryrefslogtreecommitdiffstats
path: root/Alsa-afb
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:54:30 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-23 10:54:30 +0200
commitd0dae04c2ae6e4219e0ebac205dd05fa7e9427cf (patch)
tree80c6fc84f56afedc4fb02a097ae3e464bd792828 /Alsa-afb
parent606ccd2405a55eab4c909160c951c083bccd825d (diff)
Format: remove blank space at EOL
Change-Id: I786ac8d5be68bdf09d5bb6c883959d6e1963c1fe Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'Alsa-afb')
-rw-r--r--Alsa-afb/Alsa-AddCtl.c4
-rw-r--r--Alsa-afb/Alsa-ApiHat.h14
-rw-r--r--Alsa-afb/Alsa-RegEvt.c12
-rw-r--r--Alsa-afb/Alsa-SetGet.c8
-rw-r--r--Alsa-afb/Alsa-Ucm.c6
-rw-r--r--Alsa-afb/CMakeLists.txt4
6 files changed, 24 insertions, 24 deletions
diff --git a/Alsa-afb/Alsa-AddCtl.c b/Alsa-afb/Alsa-AddCtl.c
index f7ef92e..44de782 100644
--- a/Alsa-afb/Alsa-AddCtl.c
+++ b/Alsa-afb/Alsa-AddCtl.c
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* References:
* https://kernel.readthedocs.io/en/sphinx-samples/writing-an-alsa-driver.html#control-names
* https://01.org/linuxgraphics/gfx-docs/drm/sound/designs/control-names.html
@@ -287,7 +287,7 @@ UpdateDefaultVal:
goto DoNotUpdate;
}
- // write a default null TLV (if usefull should be implemented for every ctl type)
+ // write a default null TLV (if usefull should be implemented for every ctl type)
if (elemTlv) {
err = snd_ctl_elem_tlv_write(ctlDev, elemId, elemTlv);
if (err < 0) {
diff --git a/Alsa-afb/Alsa-ApiHat.h b/Alsa-afb/Alsa-ApiHat.h
index b05cfbe..bd70740 100644
--- a/Alsa-afb/Alsa-ApiHat.h
+++ b/Alsa-afb/Alsa-ApiHat.h
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
#ifndef ALSALIBMAPPING_H
#define ALSALIBMAPPING_H
@@ -57,12 +57,12 @@ PUBLIC void alsaSetCtls(struct afb_req request);
// AlsaUseCase exports
-PUBLIC void alsaUseCaseQuery(struct afb_req request);
-PUBLIC void alsaUseCaseSet(struct afb_req request);
-PUBLIC void alsaUseCaseGet(struct afb_req request);
-PUBLIC void alsaUseCaseClose(struct afb_req request);
-PUBLIC void alsaUseCaseReset(struct afb_req request);
-PUBLIC void alsaAddCustomCtls(struct afb_req request);
+PUBLIC void alsaUseCaseQuery(struct afb_req request);
+PUBLIC void alsaUseCaseSet(struct afb_req request);
+PUBLIC void alsaUseCaseGet(struct afb_req request);
+PUBLIC void alsaUseCaseClose(struct afb_req request);
+PUBLIC void alsaUseCaseReset(struct afb_req request);
+PUBLIC void alsaAddCustomCtls(struct afb_req request);
// AlsaRegEvt
PUBLIC void alsaEvtSubcribe (struct afb_req request);
diff --git a/Alsa-afb/Alsa-RegEvt.c b/Alsa-afb/Alsa-RegEvt.c
index 080b6cc..41db207 100644
--- a/Alsa-afb/Alsa-RegEvt.c
+++ b/Alsa-afb/Alsa-RegEvt.c
@@ -92,7 +92,7 @@ STATIC int sndCtlEventCB(sd_event_source* src, int fd, uint32_t revents, void* u
if ((revents & EPOLLIN) != 0) {
- // initialise event structure on stack
+ // initialise event structure on stack
snd_ctl_event_alloca(&eventId);
snd_ctl_elem_id_alloca(&elemId);
@@ -222,11 +222,11 @@ PUBLIC void alsaEvtSubcribe(afb_req request) {
goto OnErrorExit;
}
- // everything looks OK let's move forward
+ // everything looks OK let's move forward
idx = idxFree;
}
- // subscribe to binder event
+ // subscribe to binder event
err = afb_req_subscribe(request, evtHandle->afbevt);
if (err != 0) {
afb_req_fail_f(request, "register-eventname", "Cannot subscribe binder event name=%s [invalid channel]", queryValues.devid);
@@ -277,7 +277,7 @@ STATIC json_object *alsaProbeCardId(afb_req request) {
shortname = snd_ctl_card_info_get_name(cardinfo);
longname = snd_ctl_card_info_get_longname(cardinfo);
- // check if short|long name match
+ // check if short|long name match
if (!strcmp(sndname, ctlName)) break;
if (!strcmp(sndname, shortname)) break;
if (!strcmp(sndname, longname)) break;
@@ -288,7 +288,7 @@ STATIC json_object *alsaProbeCardId(afb_req request) {
goto OnErrorExit;
}
- // proxy ctlevent as a binder event
+ // proxy ctlevent as a binder event
responseJ = json_object_new_object();
json_object_object_add(responseJ, "index", json_object_new_int(index));
json_object_object_add(responseJ, "devid", json_object_new_string(devid));
@@ -361,7 +361,7 @@ PUBLIC void alsaRegisterHal(afb_req request) {
goto OnErrorExit;
}
- // alsaGetCardId should be check to register only valid card
+ // alsaGetCardId should be check to register only valid card
responseJ = alsaProbeCardId(request);
if (responseJ) {
json_object *tmpJ;
diff --git a/Alsa-afb/Alsa-SetGet.c b/Alsa-afb/Alsa-SetGet.c
index 04f2929..7450944 100644
--- a/Alsa-afb/Alsa-SetGet.c
+++ b/Alsa-afb/Alsa-SetGet.c
@@ -36,7 +36,7 @@ PUBLIC void NumidsListParse(ActionSetGetT action, queryValuesT *queryValues, ctl
ctlRequest[idx].used = 0;
ctlRequest[idx].valuesJ = NULL;
- // when only one NUMID is provided it might not be encapsulated in a JSON array
+ // when only one NUMID is provided it might not be encapsulated in a JSON array
if (json_type_array == json_object_get_type(queryValues->numidsJ)) ctlRequest[idx].jToken = json_object_array_get_idx(queryValues->numidsJ, idx);
else ctlRequest[idx].jToken = queryValues->numidsJ;
@@ -438,7 +438,7 @@ PUBLIC int alsaSetSingleCtl(snd_ctl_t *ctlDev, snd_ctl_elem_id_t *elemId, ctlReq
snd_ctl_elem_info_t *elemInfo;
int count, length, err, valueIsArray = 0;
- // let's make sure we are processing the right control
+ // let's make sure we are processing the right control
if (ctlRequest->numId != snd_ctl_elem_id_get_numid(elemId)) goto OnErrorExit;
// set info event ID and get value
@@ -720,7 +720,7 @@ STATIC void alsaSetGetCtls(ActionSetGetT action, afb_req request) {
int jdx;
if (queryValues.count == 0 && action == ACTION_GET) {
- selected = 1; // check is this numid is selected within query
+ selected = 1; // check is this numid is selected within query
jdx = ctlIndex; // map all existing ctl as requested
} else {
int numid = snd_ctl_elem_list_get_numid(ctlList, ctlIndex);
@@ -737,7 +737,7 @@ STATIC void alsaSetGetCtls(ActionSetGetT action, afb_req request) {
}
}
- // control is selected open ctlid and get value
+ // control is selected open ctlid and get value
if (selected) {
snd_ctl_elem_id_t *elemId;
snd_ctl_elem_id_alloca(&elemId);
diff --git a/Alsa-afb/Alsa-Ucm.c b/Alsa-afb/Alsa-Ucm.c
index 016fe10..0bfffc9 100644
--- a/Alsa-afb/Alsa-Ucm.c
+++ b/Alsa-afb/Alsa-Ucm.c
@@ -19,8 +19,8 @@
https://www.alsa-project.org/main/index.php/DAPM
http://alsa-lib.sourcearchive.com/documentation/1.0.24.1-2/group__Use_ga4332c6bb50481bbdaf21be11551fb930.html
https://android.googlesource.com/platform/hardware/qcom/audio/+/jb-mr1-dev/libalsa-intf/alsa_ucm.h
-
- Sample alsaucm commands using /usr/share/alsa/ucm/PandaBoard
+
+ Sample alsaucm commands using /usr/share/alsa/ucm/PandaBoard
- alsaucm -c PandaBoard list _verbs
- alsaucm -c PandaBoard list _devices/HiFi
- alsaucm -c PandaBoard list _modifiers/HiFi #need to uncomment modifiers section
@@ -49,7 +49,7 @@ typedef struct {
static ucmHandleT ucmHandles[MAX_SND_CARD];
-// Cache opened UCM handles
+// Cache opened UCM handles
STATIC int alsaUseCaseOpen(struct afb_req request, queryValuesT *queryValues, int allowNewMgr) {
snd_ctl_t *ctlDev;
diff --git a/Alsa-afb/CMakeLists.txt b/Alsa-afb/CMakeLists.txt
index fab49ae..a608a80 100644
--- a/Alsa-afb/CMakeLists.txt
+++ b/Alsa-afb/CMakeLists.txt
@@ -31,8 +31,8 @@ PROJECT_TARGET_ADD(alsa-lowlevel)
)
# Library dependencies (include updates automatically)
- TARGET_LINK_LIBRARIES(${TARGET_NAME}
- audio-common
+ TARGET_LINK_LIBRARIES(${TARGET_NAME}
+ audio-common
${link_libraries}
)