From patchwork Fri Jul 24 23:19:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 8994 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com 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 7BC7CBD86F for ; Fri, 24 Jul 2020 23:19:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 116F860939; Sat, 25 Jul 2020 01:19:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="H5MnhD3o"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CCE1D60496 for ; Sat, 25 Jul 2020 01:19:19 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 51962538 for ; Sat, 25 Jul 2020 01:19:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1595632759; bh=TKd4BCQpVqK33IeminMp/uHBN9kC7Pqozk0NKG93Hl8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=H5MnhD3oIrhDxVhhhuCH8kbEg5woxsR35nlMzmutEY1ex1Ys9wI+9nJzsmsOO6Zav w1Vkh+OzTn7s1SVNVeYdv+/xfPgOjx4u2uukljM94+wwP1Q3wJSdtxaOPAc/PFxl4B avVQZ02HTChi9Bhviy3H277UAktLWGbkYKEsyALY= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 25 Jul 2020 02:19:09 +0300 Message-Id: <20200724231909.29464-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200724230841.27838-1-laurent.pinchart@ideasonboard.com> References: <20200724230841.27838-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/2] libcamera: file: Use Flags<> class for map flags 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Use the newly introduced Flags<> class to store a bitfield of File::MapFlag in a type-safe way. Signed-off-by: Laurent Pinchart --- include/libcamera/internal/file.h | 9 +++++++-- src/libcamera/file.cpp | 11 ++++++++--- src/libcamera/ipa_module.cpp | 2 +- test/file.cpp | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h index 9b6d011f5e9d..d6baacaaa551 100644 --- a/include/libcamera/internal/file.h +++ b/include/libcamera/internal/file.h @@ -11,6 +11,7 @@ #include #include +#include #include namespace libcamera { @@ -18,11 +19,13 @@ namespace libcamera { class File { public: - enum MapFlag { + enum class MapFlag { MapNoOption = 0, MapPrivate = (1 << 0), }; + using MapFlags = Flags; + enum OpenMode { NotOpen = 0, ReadOnly = (1 << 0), @@ -56,7 +59,7 @@ public: ssize_t write(const Span &data); Span map(off_t offset = 0, ssize_t size = -1, - MapFlag flags = MapNoOption); + MapFlags flags = MapFlag::MapNoOption); bool unmap(uint8_t *addr); static bool exists(const std::string &name); @@ -72,6 +75,8 @@ private: std::map maps_; }; +LIBCAMERA_FLAGS_ENABLE_OPERATORS(File::MapFlag) + } /* namespace libcamera */ #endif /* __LIBCAMERA_INTERNAL_FILE_H__ */ diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index 04b0cb61a1bf..de944deb8667 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -52,6 +52,11 @@ LOG_DEFINE_CATEGORY(File); * the file constents */ +/** + * \typedef File::MapFlags + * \brief An OR combination of File::MapFlag values + */ + /** * \enum File::OpenMode * \brief Mode in which a file is opened @@ -371,7 +376,7 @@ ssize_t File::write(const Span &data) * * \return The mapped memory on success, or an empty span otherwise */ -Span File::map(off_t offset, ssize_t size, enum File::MapFlag flags) +Span File::map(off_t offset, ssize_t size, File::MapFlags flags) { if (!isOpen()) { error_ = -EBADF; @@ -388,14 +393,14 @@ Span File::map(off_t offset, ssize_t size, enum File::MapFlag flags) size -= offset; } - int mmapFlags = flags & MapPrivate ? MAP_PRIVATE : MAP_SHARED; + int mmapFlags = flags & MapFlag::MapPrivate ? MAP_PRIVATE : MAP_SHARED; int prot = 0; if (mode_ & ReadOnly) prot |= PROT_READ; if (mode_ & WriteOnly) prot |= PROT_WRITE; - if (flags & MapPrivate) + if (flags & MapFlag::MapPrivate) prot |= PROT_WRITE; void *map = mmap(NULL, size, prot, mmapFlags, fd_, offset); diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index de512a7f3a0d..c1eaf0bbb792 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -323,7 +323,7 @@ int IPAModule::loadIPAModuleInfo() return 0; } - data = sign.map(0, -1, File::MapPrivate); + data = sign.map(0, -1, File::MapFlag::MapPrivate); signature_.resize(data.size()); memcpy(signature_.data(), data.data(), data.size()); diff --git a/test/file.cpp b/test/file.cpp index f458f355ccad..9ea83d5b2cc4 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -313,7 +313,7 @@ protected: file.setFileName(fileName_); file.open(File::ReadWrite); - data = file.map(0, -1, File::MapPrivate); + data = file.map(0, -1, File::MapFlag::MapPrivate); if (data.empty()) { cerr << "Private mapping failed" << endl; return TestFail;