From patchwork Wed Mar 23 09:16:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yu Chao X-Patchwork-Id: 8648081 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8C9339F36E for ; Wed, 23 Mar 2016 09:20:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A18B203A5 for ; Wed, 23 Mar 2016 09:20:34 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 154AF2038A for ; Wed, 23 Mar 2016 09:20:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E3E9E265D81; Wed, 23 Mar 2016 10:20:31 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 382AB265821; Wed, 23 Mar 2016 10:18:35 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 946212657F8; Wed, 23 Mar 2016 10:18:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by alsa0.perex.cz (Postfix) with ESMTP id E7DFC265ADC for ; Wed, 23 Mar 2016 10:16:54 +0100 (CET) Received: by mail-pf0-f170.google.com with SMTP id 4so18073309pfd.0 for ; Wed, 23 Mar 2016 02:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=SiCeKijvXqZM2Dd9/WNK4PvlcTVBJAXjgfV+tKyYMcg=; b=bkPW6ewxOsYFqK0+i64o0wKi5Gf7FE95Re11QYB0nFUyS8OoIzly1mkD+nc/rE4iNa ZBaKrMb0l1D1LbLVR8wseESFFMcF1rvNXlRc8kIWjtcK6phLFMP/TaKOOU5CzAEhPn9T 18Sj7IXQSfrR28JhUJQplc95qilUccXtjjmiE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SiCeKijvXqZM2Dd9/WNK4PvlcTVBJAXjgfV+tKyYMcg=; b=LyO6AInCg9umqwxekCe8tERsNGoNVJe6pnyxabA+DfnoD5OoTXH7z4FztBvAssAhXN uBjD6EldXh6/IjjLTb9OiZuO/C+O87bTWUdQ61PcY24sdtin2Q7ufsGxJhOaOt4nyMOB FpTB6jaZqI3/cHU4QNqRCb4Ve3d8ZeyR4p3PcI3S3tAEdtr9rVc+6pSK70NL4X6/p4Jk PjVzboGEpKa00t/Lxq+sBwEObZLjHBxs0J+jZSPJdVvs57UklHKGZqDBZ4uTrvCxXYSM AowRfRYRyVI6ezrSMJiqf9b230/xoFBK2RwpyZETG2ZBaleEpVwdlijceSI+7f+CYmDi HqCw== X-Gm-Message-State: AD7BkJJYEXkN+JhcxTeaIjFis4K4JiXQUFAhySZzS2JHFV6NCkuP8reoCAwxO2wwOwu0gg== X-Received: by 10.98.34.28 with SMTP id i28mr2485189pfi.160.1458724607779; Wed, 23 Mar 2016 02:16:47 -0700 (PDT) Received: from hychao-z620.tpe.corp.google.com ([172.30.210.187]) by smtp.gmail.com with ESMTPSA id v14sm2842933pas.10.2016.03.23.02.16.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Mar 2016 02:16:47 -0700 (PDT) From: Hsin-Yu Chao To: alsa-devel@alsa-project.org Date: Wed, 23 Mar 2016 17:16:42 +0800 Message-Id: <1458724602-5618-1-git-send-email-hychao@chromium.org> X-Mailer: git-send-email 2.1.2 Cc: vinod.koul@intel.com, dgreid@chromium.org, Hsin-Yu Chao Subject: [alsa-devel] [PATCH v2] ucm: add cset-tlv X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This patch enables UCM to set a file in TLV format to kcontrol by: cset-tlv "name='' " This new 'cset-tlv' command will be used to write audio DSP to specific alsa control, where the driver expectes a file in TLV format. Signed-off-by: Hsin-Yu Chao --- src/ucm/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++-------- src/ucm/parser.c | 10 ++++++ src/ucm/ucm_local.h | 1 + 3 files changed, 89 insertions(+), 13 deletions(-) diff --git a/src/ucm/main.c b/src/ucm/main.c index 7e44603..c6bbf27 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -161,6 +161,54 @@ static int open_ctl(snd_use_case_mgr_t *uc_mgr, return 0; } +static int read_tlv_file(char **res, + const char *filepath) +{ + int err = 0; + int fd; + struct stat st; + size_t sz; + ssize_t sz_read; + unsigned int *tlv; + + fd = open(filepath, O_RDONLY); + if (fd < 0) { + err = -errno; + return err; + } + if (stat(filepath, &st) == -1) { + err = -errno; + goto __fail; + } + sz = st.st_size; + if (sz > 1024 * 1024 || sz < 8) { + uc_error("unsupported file size"); + goto __fail; + } + *res = malloc(sz); + if (res == NULL) { + err = -ENOMEM; + goto __fail; + } + sz_read = read(fd, *res, sz); + if (sz_read < 0 || (size_t)sz_read != sz) { + err = -errno; + free(*res); + *res = NULL; + } + /* Check if the tlv file specifies valid size. */ + tlv = (unsigned int *)(*res); + if (tlv[1] + 2 * sizeof(unsigned int) != sz) { + uc_error("Invalid tlv size"); + free(*res); + *res = NULL; + } + + __fail: + close(fd); + return err; +} + static int binary_file_parse(snd_ctl_elem_value_t *dst, snd_ctl_elem_info_t *info, const char *filepath) @@ -226,6 +274,7 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) snd_ctl_elem_id_t *id; snd_ctl_elem_value_t *value; snd_ctl_elem_info_t *info; + char *res = NULL; snd_ctl_elem_id_malloc(&id); snd_ctl_elem_value_malloc(&value); @@ -241,23 +290,36 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) err = -EINVAL; goto __fail; } - snd_ctl_elem_value_set_id(value, id); snd_ctl_elem_info_set_id(info, id); - err = snd_ctl_elem_read(ctl, value); - if (err < 0) - goto __fail; err = snd_ctl_elem_info(ctl, info); if (err < 0) goto __fail; - if (type == SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE) - err = binary_file_parse(value, info, pos); - else - err = snd_ctl_ascii_value_parse(ctl, value, info, pos); - if (err < 0) - goto __fail; - err = snd_ctl_elem_write(ctl, value); - if (err < 0) - goto __fail; + if (type == SEQUENCE_ELEMENT_TYPE_CSET_TLV) { + if (!snd_ctl_elem_info_is_tlv_writable(info)) { + err = -EINVAL; + goto __fail; + } + err = read_tlv_file(&res, pos); + if (err < 0) + goto __fail; + err = snd_ctl_elem_tlv_write(ctl, id, (unsigned int *)res); + if (err < 0) + goto __fail; + } else { + snd_ctl_elem_value_set_id(value, id); + err = snd_ctl_elem_read(ctl, value); + if (err < 0) + goto __fail; + if (type == SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE) + err = binary_file_parse(value, info, pos); + else + err = snd_ctl_ascii_value_parse(ctl, value, info, pos); + if (err < 0) + goto __fail; + err = snd_ctl_elem_write(ctl, value); + if (err < 0) + goto __fail; + } err = 0; __fail: if (id != NULL) @@ -266,6 +328,8 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) free(value); if (info != NULL) free(info); + if (res != NULL) + free(res); return err; } @@ -298,6 +362,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, break; case SEQUENCE_ELEMENT_TYPE_CSET: case SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE: + case SEQUENCE_ELEMENT_TYPE_CSET_TLV: if (cdev == NULL) { char *playback_ctl = NULL; char *capture_ctl = NULL; diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 9e1cb41..d781e1b 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -316,6 +316,16 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, continue; } + if (strcmp(cmd, "cset-tlv") == 0) { + curr->type = SEQUENCE_ELEMENT_TYPE_CSET_TLV; + err = parse_string(n, &curr->data.cset); + if (err < 0) { + uc_error("error: cset-tlv requires a string!"); + return err; + } + continue; + } + if (strcmp(cmd, "usleep") == 0) { curr->type = SEQUENCE_ELEMENT_TYPE_SLEEP; err = snd_config_get_integer(n, &curr->data.sleep); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 3a5d2c2..b89de2a 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -48,6 +48,7 @@ #define SEQUENCE_ELEMENT_TYPE_SLEEP 3 #define SEQUENCE_ELEMENT_TYPE_EXEC 4 #define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE 5 +#define SEQUENCE_ELEMENT_TYPE_CSET_TLV 6 struct ucm_value { struct list_head list;