From patchwork Wed Apr 13 06:26:57 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: 8818381 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2A48AC0553 for ; Wed, 13 Apr 2016 06:27:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F147720256 for ; Wed, 13 Apr 2016 06:27:29 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 8265220225 for ; Wed, 13 Apr 2016 06:27:28 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 42D252652E2; Wed, 13 Apr 2016 08:27:27 +0200 (CEST) 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 alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 66995265134; Wed, 13 Apr 2016 08:27:18 +0200 (CEST) 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 335BE265141; Wed, 13 Apr 2016 08:27:17 +0200 (CEST) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by alsa0.perex.cz (Postfix) with ESMTP id C11B32650DB for ; Wed, 13 Apr 2016 08:27:11 +0200 (CEST) Received: by mail-pa0-f43.google.com with SMTP id bx7so27789278pad.3 for ; Tue, 12 Apr 2016 23:27:11 -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=kvdMbrpX512LNZS1pvhKHuL4iCkSBoPe9/yBCtpihUs=; b=kape1qIM+K5cmu1ydKLicGkXOxTtzrFQLhxnHlAhoUuEFxXb1EJ6di6rJCq3XW79/a 2sH9i7W4qRBEPeyDDRekbBomA5NGdskIU4ERxFRdXuYUwKoNKqHWpkYOWRxSCxEnkgLu OJHje0x6NAVoYpyeskzghF0QltGmd4UNRk7IE= 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=kvdMbrpX512LNZS1pvhKHuL4iCkSBoPe9/yBCtpihUs=; b=g297ZSqMVQ+hLUWXNPyeSNJBy5d4jPkMEz1UeJcMsr/RyRq6adIBmRVI0ICQJkXoPr SAvb6esyftr/ICemB+lDYhcT9E7pgVGczjMgOWWw6jpRdoQx6tJbb+gAEWC3Tne/Vj2h bAtLaaGQKXuRXkBydR+EB2rOrKoWRtZrqN+b+rWp5trRwANIOq8JBhq00AyWW+ftkq7C te7GWtsZdDz2K5tTz1sKByTJwr5F7kWs9uyMgdXDc9IEJtvFOMMVeHKLbCNaVpXlDXom eNX1dQPrMAoYzgC16K7wl7AVLw0YnpPwi4CIBDzXfmb1tSt9yRaubxxI3/AsE8FC0XId wSnw== X-Gm-Message-State: AOPr4FUILObHsSphluz4GuclMApcIU5U7seQAChqHohjrIOR5Q1dnJN19DH1vxG8jiPRiw== X-Received: by 10.66.101.35 with SMTP id fd3mr10479441pab.7.1460528830333; Tue, 12 Apr 2016 23:27:10 -0700 (PDT) Received: from hychao-z620.tpe.corp.google.com ([172.30.210.187]) by smtp.gmail.com with ESMTPSA id s197sm48027015pfs.62.2016.04.12.23.27.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Apr 2016 23:27:09 -0700 (PDT) From: Hsin-Yu Chao To: alsa-devel@alsa-project.org Date: Wed, 13 Apr 2016 14:26:57 +0800 Message-Id: <1460528817-25598-1-git-send-email-hychao@chromium.org> X-Mailer: git-send-email 2.1.2 Cc: Hsin-Yu Chao Subject: [alsa-devel] [PATCH v4] 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. The TLV file to set to kcontrol will be checked first by file size not larger than 16 MB, and then examine if the length field reports correct number of bytes in the TLV file. Signed-off-by: Hsin-Yu Chao --- src/ucm/main.c | 93 +++++++++++++++++++++++++++++++++++++++++++++-------- src/ucm/parser.c | 10 ++++++ src/ucm/ucm_local.h | 1 + 3 files changed, 91 insertions(+), 13 deletions(-) diff --git a/src/ucm/main.c b/src/ucm/main.c index 7e44603..cf9e825 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -161,6 +161,56 @@ 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 (fstat(fd, &st) == -1) { + err = -errno; + goto __fail; + } + sz = st.st_size; + if (sz > 16 * 1024 * 1024 || sz < 8) { + uc_error("File size should be less than 16 MB"); + err = -EINVAL; + 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 = -EIO; + 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"); + err = -EINVAL; + 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 +276,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 +292,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 +330,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 +364,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;