From patchwork Wed Dec 1 07:53:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14946 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 E298FBF415 for ; Wed, 1 Dec 2021 07:54:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9D19160720; Wed, 1 Dec 2021 08:54:08 +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="CJ8CHRed"; dkim-atps=neutral Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id ED66360710 for ; Wed, 1 Dec 2021 08:54:06 +0100 (CET) Received: by mail-pj1-x1032.google.com with SMTP id v23so17312724pjr.5 for ; Tue, 30 Nov 2021 23:54:06 -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=1BXuhHBtpeQuWZSbzzWWhH2MYUJgctAU4AJvuOG+YC4=; b=CJ8CHRedDaV2d4lqnEU09wqjl9vA2hOcPNTak46H39dCUEqzmM3cdGcqfNyGydAow9 8ScIYQU/L2NIIzrkCAlwIqH3k78C8qwKfkLw491B22S0drq/UfE5PEJeY4u6+hotYmDC oFMChaVqU7saUcP+NZpd+brqkpoJNDuZaEB0Q= 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=1BXuhHBtpeQuWZSbzzWWhH2MYUJgctAU4AJvuOG+YC4=; b=oBokvXppJmvYpdJiqtfRlvkOPMP+vHjfV1fWOO/hbX6XINUP1Tweb8ZNHI7E0FB9la mAg2/D2zGai0T5renJxD6PNh8mdSVNQvkXdulLpLS4JidZmK543mzr5wrhrs48owwpI0 tQEa/dy6o375lNgUeAqcN1/ss5snqmHQsYewSlODlT42r2YIEp4Qhbmv9wZJ2+iXu9fr TDlHc0bcPSsAEnt0COMA2/aDLq2fr/nZ8DqF1W+L67+34BNz94kMufzkGb4O635hPtPz 3ox0BIPerqs3969OBcQL6cyTH7v53wiT9YQFueWbqpOAzO4nqlYneqvax4TjH8KEwIZJ SmsQ== X-Gm-Message-State: AOAM531njAJwIh6TSktQMw5IuBjqWF/CjESFRrhhJ0EOrql6rhhEnRiJ eWGdpv5Jla3j/KmPRyV5/gciMeLFoCNV8g== X-Google-Smtp-Source: ABdhPJwV4KjCDtJvfhLbROvoMCSun3nECcZgwg8yHTzI54xm/bSVMaELgU/xZ6110P5HOJj+6zBqtw== X-Received: by 2002:a17:902:b78b:b0:143:baac:2ebc with SMTP id e11-20020a170902b78b00b00143baac2ebcmr5446807pls.77.1638345244841; Tue, 30 Nov 2021 23:54:04 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:3892:a049:59ba:c772]) by smtp.gmail.com with ESMTPSA id l9sm3500848pfu.55.2021.11.30.23.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 23:54:04 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 1 Dec 2021 16:53:42 +0900 Message-Id: <20211201075348.3121186-7-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211201075348.3121186-1-hiroh@chromium.org> References: <20211201075348.3121186-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 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 Reviewed-by: Umang Jain --- include/libcamera/base/semaphore.h | 3 ++- 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 | 2 +- src/libcamera/base/thread.cpp | 1 + src/libcamera/camera_manager.cpp | 1 + src/v4l2/v4l2_camera.h | 2 +- 12 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/libcamera/base/semaphore.h b/include/libcamera/base/semaphore.h index ec05fad3..c11e8dd1 100644 --- a/include/libcamera/base/semaphore.h +++ b/include/libcamera/base/semaphore.h @@ -8,7 +8,8 @@ #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..9df45d07 100644 --- a/src/libcamera/base/signal.cpp +++ b/src/libcamera/base/signal.cpp @@ -7,7 +7,7 @@ #include -#include +#include /** * \file base/signal.h 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