From patchwork Tue Nov 30 15:55:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14903 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 D53E0C324F for ; Tue, 30 Nov 2021 15:56:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 70A6F60710; Tue, 30 Nov 2021 16:56:24 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iGKJuh7E"; dkim-atps=neutral Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 83DEF6071A for ; Tue, 30 Nov 2021 16:56:19 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id v19so15253544plo.7 for ; Tue, 30 Nov 2021 07:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ax9Q5IE+2lzgN/6viRT9yW1Y2YQJjHoAjbGe2VAh9io=; b=iGKJuh7EUsxWv79EK/FERPm4p5aQ2CwTLxQn9hPLzjrUkxb7CFt1imWlEl1CYJ6P6g 1icLEPXuUD5t32t1M+jZfj90K3ivgjeSN6O8LzeIniZFGF1DsFD68MkO9TcZDM0rATpC j8YQu7bfeAm9HN8RQDqwO/i1hepztMshbjNjI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ax9Q5IE+2lzgN/6viRT9yW1Y2YQJjHoAjbGe2VAh9io=; b=A9zo3mcDgDvJ2URMuNNey6UKWV+E44yc3RjOEe5XhaVhQhL2tWBWSy2DyMHqo1mtHV tpwRbDgNxIHQ+NRLnwL2i2PiQPL9AlUPIIWlpUtbBUxAFn3E/KeE6bQXdfNHSqGGp2vZ fxUBTf8MuPTeUpPf9PhqwKEO33FG8EjxFOahKGrP5tBZZe6I1uk3T5OA6PUPpeTiU98T y1YTo1CxuV6u+/YLrC7PsgZU1k9EeLvjOvvJ3ZTMy3c+jWsH4uUF8xpj0Ge+hylIT4G3 0wErZoPnWdIRg0BtGu5DGwNYxt68Bo/L7BMCFiOzCLif0zuu5kjOIELIAyTpB+CMi5a0 YFrA== X-Gm-Message-State: AOAM530NXB/tQREI1ZOWt81E9vDs54LGUwldRThU16IRBfleb3ACRC66 BFPdXoMXPAFVNU7owf3foJu1xiAaL/eBYQ== X-Google-Smtp-Source: ABdhPJyIuehuy+Z8VkjzabKQAiS6Ldd+RhpDnk4sYMDhr83e2tEMr+uVlfTPnIwcT82arIQm57LAxw== X-Received: by 2002:a17:902:7616:b0:143:a8cd:ef0 with SMTP id k22-20020a170902761600b00143a8cd0ef0mr259355pll.48.1638287777810; Tue, 30 Nov 2021 07:56:17 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:c90a:5a53:b139:1336]) by smtp.gmail.com with ESMTPSA id pc10sm3510283pjb.9.2021.11.30.07.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 07:56:17 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 1 Dec 2021 00:55:54 +0900 Message-Id: <20211130155600.2203123-7-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211130155600.2203123-1-hiroh@chromium.org> References: <20211130155600.2203123-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 06/12] libcamera: Correct include headers for Mutex classes 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" Mutex classes are defined in mutex.h. This replaces thread.h include for the Mutex classes with mutex.h. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart --- include/libcamera/base/semaphore.h | 2 +- include/libcamera/base/thread.h | 1 - src/android/camera_device.cpp | 1 - src/android/camera_device.h | 2 +- src/android/camera_hal_manager.h | 2 +- src/android/camera_request.h | 2 +- src/android/camera_stream.h | 1 + src/libcamera/base/semaphore.cpp | 1 - src/libcamera/base/signal.cpp | 3 +-- src/libcamera/base/thread.cpp | 1 + src/libcamera/camera_manager.cpp | 1 + src/v4l2/v4l2_camera.h | 2 +- 12 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h index ec05fad3..271d5427 100644 --- a/include/libcamera/base/semaphore.h +++ b/include/libcamera/base/semaphore.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include namespace libcamera { diff --git a/include/libcamera/base/thread.h b/include/libcamera/base/thread.h index 44678c34..9d00f102 100644 --- a/include/libcamera/base/thread.h +++ b/include/libcamera/base/thread.h @@ -14,7 +14,6 @@ #include #include -#include #include #include diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index f2e0bdbd..d74307a2 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include diff --git a/src/android/camera_device.h b/src/android/camera_device.h index bda0b376..a945f5de 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h index cc310f90..765701b2 100644 --- a/src/android/camera_hal_manager.h +++ b/src/android/camera_hal_manager.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/src/android/camera_request.h b/src/android/camera_request.h index 88d501a8..887dbe86 100644 --- a/src/android/camera_request.h +++ b/src/android/camera_request.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h index adb5a37d..e4eb953a 100644 --- a/src/android/camera_stream.h +++ b/src/android/camera_stream.h @@ -13,6 +13,7 @@ #include +#include #include #include diff --git a/src/libcamera/base/semaphore.cpp b/src/libcamera/base/semaphore.cpp index bf730c87..4fe30293 100644 --- a/src/libcamera/base/semaphore.cpp +++ b/src/libcamera/base/semaphore.cpp @@ -6,7 +6,6 @@ */ #include -#include /** * \file base/semaphore.h diff --git a/src/libcamera/base/signal.cpp b/src/libcamera/base/signal.cpp index 9c2319c5..2fd7e01d 100644 --- a/src/libcamera/base/signal.cpp +++ b/src/libcamera/base/signal.cpp @@ -5,10 +5,9 @@ * signal.cpp - Signal & slot implementation */ +#include #include -#include - /** * \file base/signal.h * \brief Signal & slot implementation diff --git a/src/libcamera/base/thread.cpp b/src/libcamera/base/thread.cpp index b2043b7e..6bda9d14 100644 --- a/src/libcamera/base/thread.cpp +++ b/src/libcamera/base/thread.cpp @@ -17,6 +17,7 @@ #include #include #include +#include /** * \page thread Thread Support diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 77ff3bd1..70d73822 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index bf1b6de4..9307d61d 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -10,8 +10,8 @@ #include #include +#include #include -#include #include #include