From patchwork Wed May 3 12:20:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18587 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 61E5CC0DA4 for ; Wed, 3 May 2023 12:20:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 59559633BE; Wed, 3 May 2023 14:20:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1683116441; bh=SkuNolI9P2nCWUfWWA5jMlqkXgH+/QYppr/4bgET7hQ=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=oFa5y9at+4UbEGEvk1VrQ6GoABo345f2x1JoctiuS7Q4iR0a1tN8HvF/lswc5z7dQ aXyVc88TlfP2ADogBthURnvpPLjdjJnC/VJoB7+4QlxVFSMrpSb4lWczg1+fBpVOL8 h9o51CFaRhQi2+yqlJww0CTMbIV7A1j1xksrzt9Kr3s7Paq+Aq9y82U05CmP3hDRR/ CrBNQ9P9QWahx3sUIBNUulCFNq+EMK/0GYJ2H2eejEIGVtdylQ1bZYT4jb+lqJVovB 7Q0rZ+f4gpeVJspE7UIPE7MJMHQkPeCb0h+3QyYNPB9676iJ+L4u6H+Fr8olSbl02v nMY4ECbycK6UQ== Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 02313633A8 for ; Wed, 3 May 2023 14:20:39 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Bd1/nSPA"; dkim-atps=neutral Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f1738d0d4cso31404845e9.1 for ; Wed, 03 May 2023 05:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1683116438; x=1685708438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AAwiLoEgkTyPRPryFHEiudlGVKZQEgFJz2H6YvPFE5s=; b=Bd1/nSPA7BrTzAnYQ75o3bih3Y1D9xqs5VKmRqd5AFjS79uMl1VgtdSD/Ma4+OjQ0G jWXNfoE2GWNxQrsOwH1BHaZV6lN2FKFBGkr+SybUpeBar069iagqqzdxa454zgI5kIzM uSnkAAdWieVIf662AYsFtoMxB1N8BwbyX7S45/qKzX6HdG8q7pmCbyVimENK2WYrAt6t dnbZax15hh8sRnJw7UVAT15TCFD8c8i1xMZEoQxMzJaVi06comJwsc7ULsnYlUgF14uO rGtD4JC7rPvrc1LwznC1dVNkrL6pwlmZ7g1B+AP80ceROwZinbQqOavvOVN++JlLfkom Kfiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683116438; x=1685708438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AAwiLoEgkTyPRPryFHEiudlGVKZQEgFJz2H6YvPFE5s=; b=C63Wy2s83tP0OHkSJhbrDc/r39QcbtX5tShMTpVwEbuKpJp8BEmdOhUYbyarkkwie+ Y3x9QL5ACUT9DGJzkTSrtxLafb+HnlFxX8guJRdVNfWT87oMJ/jUZ7iX8x6stUFOgJnM NtJuN038/Kbfds709kxiVEGAFoHEKzK0PEH0aRavzYQftVnLLyfeQE6LKSzVsj0wc/y3 4rnBFOdu5X98KeifvlrN31rL7GyUrUyYSBf9Pv81I+MgA5HUPk8h2dfACJGqY+MIn3BX EOCXvWwVYMPhYeYKLQfIlmnWMNLNZZ2tWl5R5lK623tVt5chMkdZ23QDfHgxrmlrBbx3 QZCA== X-Gm-Message-State: AC+VfDzuyJmRWx0M8pUTKli17h8u5NRqIvTPseA5XTDTuLAizFp9WTwu GOqij2JV0Hov08btbpwzLb1AFL6wp/NWFfUm5p2Reg== X-Google-Smtp-Source: ACHHUZ6s8cC4kyDAs29ioGsmLvmPJntVFCkfwJNYXtkwYGBadIWcWfZBr92Rjgg4ec9j64r0SaUdNQ== X-Received: by 2002:a7b:c047:0:b0:3f1:7a44:317c with SMTP id u7-20020a7bc047000000b003f17a44317cmr15154183wmc.24.1683116438440; Wed, 03 May 2023 05:20:38 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id f23-20020a7bcd17000000b003ee443bf0c7sm1736785wmj.16.2023.05.03.05.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 05:20:38 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 3 May 2023 13:20:24 +0100 Message-Id: <20230503122035.32026-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503122035.32026-1-naush@raspberrypi.com> References: <20230503122035.32026-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 02/13] libcamera: ipa: Remove character restriction on the IPA name X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Remove the restriction on using the '/' character in the IPA name string. This allows more flexibility in IPA directory structures where different IPA modules might live in subdirectories under the usual src/ipa// top level directory. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/libcamera/ipa_module.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index c152153c180f..3ca7074b3b58 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -225,9 +225,9 @@ Span elfLoadSymbol(Span elf, const char *symbol) * \brief The name of the IPA module * * The name may be used to build file system paths to IPA-specific resources. - * It shall only contain printable characters, and may not contain '/', '*', - * '?' or '\'. For IPA modules included in libcamera, it shall match the - * directory of the IPA module in the source tree. + * It shall only contain printable characters, and may not contain '*', '?' or + * '\'. For IPA modules included in libcamera, it shall match the directory of + * the IPA module in the source tree. * * \todo Allow user to choose to isolate open source IPAs */ @@ -304,9 +304,8 @@ int IPAModule::loadIPAModuleInfo() std::string ipaName = info_.name; auto iter = std::find_if_not(ipaName.begin(), ipaName.end(), [](unsigned char c) -> bool { - return isprint(c) && c != '/' && - c != '?' && c != '*' && - c != '\\'; + return isprint(c) && c != '?' && + c != '*' && c != '\\'; }); if (iter != ipaName.end()) { LOG(IPAModule, Error)