{"id":16784,"url":"https://patchwork.libcamera.org/api/1.1/patches/16784/?format=json","web_url":"https://patchwork.libcamera.org/patch/16784/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220726124549.1646-13-naush@raspberrypi.com>","date":"2022-07-26T12:45:44","name":"[libcamera-devel,12/17] ipa: raspberrypi: Remove extern \"C\" declarations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1362bdef28ee385600af86f683fbadd7277a2e61","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16784/mbox/","series":[{"id":3325,"url":"https://patchwork.libcamera.org/api/1.1/series/3325/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3325","date":"2022-07-26T12:45:32","name":"Raspberry Pi IPA code refactor","version":1,"mbox":"https://patchwork.libcamera.org/series/3325/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16784/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16784/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BC964C3276\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jul 2022 12:46:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 803E26331A;\n\tTue, 26 Jul 2022 14:46:13 +0200 (CEST)","from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com\n\t[IPv6:2a00:1450:4864:20::32f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 921C063328\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jul 2022 14:46:09 +0200 (CEST)","by mail-wm1-x32f.google.com with SMTP id id17so8680450wmb.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jul 2022 05:46:09 -0700 (PDT)","from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\ty17-20020adfd091000000b0021e87ec980bsm5948460wrh.84.2022.07.26.05.46.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 26 Jul 2022 05:46:08 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658839573;\n\tbh=DZaxv2T17gLdbYtEhtz8H/QG4ShyhpAO0hAj8ka2Qao=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=zPwFM3dT6bZGQpFYVy+dEO8LAQbABY5lcnoABernrYUCWvADcJhz0yoh46McAJTH4\n\tJ5vqqnBoHA4D5/uTGaaauKTPemrpszo6PH3c8fiEIGye2k0R7tpghJGx+rrO3sHNZ4\n\tsdSW0kmFZIAjz0peucoaN5mx6vdu6s2pSfquH5qMkZWtc5sJ1Tdt+l2z3lCrcLoIeH\n\taEVD2k9+EHinc2WeSIOVkmL3upZ3S3J8Uxh7XOZIRh3SSNj+Ch5s66J8vEMzI219mE\n\tvZAs+emOZkgXfyfRLWWN/zxt0w3lpltDThMYROl+E3xBp2P0E5zSfC2Sdkn/uVDrWD\n\tubSgJ8mcUfEMw==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=NY7JyaOac2q2MSMD7Q38yiXfBA4PvnnhUAE6F35MFJg=;\n\tb=EIpbsE4KXQSnZiyqDNGz6N6N3xl7VKoU9hBDti7+nJGGklG9BhFXTWidhCGEumMDQj\n\tN9SPX/o435tQBWQxJyl6sfiFi1c2lR1PRdQXkTMX9s9P4rQJgQqhS/6fLBeUJVA9wUPF\n\tJsXKzcxzVE403gQ9QglkFyJ3J2ObVdXOzO0Z462RgkgBssJwHdV+YbN0in5kiUc/1wvL\n\tYRYhJjKiwTcsAhp21RnS9xUEvJaQhSnJDV5QQz9s+RuLPyq5SUQHPejstIzKyPQOwsU8\n\t3ZhU7SuRZVKefDyHjXw4KVkwS+TuTm32jMxYskDG8K5iTOp3LgTtNjklgFpxb7XLnV/N\n\ti97A=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"EIpbsE4K\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=NY7JyaOac2q2MSMD7Q38yiXfBA4PvnnhUAE6F35MFJg=;\n\tb=U6OvrxJKOQYVrJ4tCioYjl9xcpWcdmczQAPLPxO8q4NasubtbkAivSi9YaW1T65Fsr\n\tpY2Ae/J+hO/zTIaJhZBn8Rdb2US24We5/nwPwxmCH07LAPFwTMCbnQlkuCgjfB0QDq9o\n\tXiTvUpJpx9ll2RREgjvuKTqPJMv5Qde0qUXDUdfL7PjnbEntEW+4H/0BNBJ6sLFziWEP\n\t7GW8iMqRHPAE+WK7pDvWGmPtQXzrtmYAFHw5prM9DfMWDZPSw0XfyH52X1N52xVk8Npw\n\ts45ShaFT4712ikgkbZEvVEq4D3RvJqzahNhRhCySJOIKDncOvu3mHhiT46EPBckxE10a\n\tTQpQ==","X-Gm-Message-State":"AJIora/XzNLm9/HvqL4jWRn4ppi4b6HQkFWNILj9ucHYSxCq78PJsOAZ\n\tPqK1YoMS0WmL7IElWoQdvJ4KFhDSz45b8Q==","X-Google-Smtp-Source":"AGRyM1ufCLW/T25ULWifsSTRBgmnTFQdDiAr7bXIxqxfAz2W0eP6AefkUi6LtR5mCz9C1H98cl3prQ==","X-Received":"by 2002:a05:600c:1d22:b0:3a3:69f5:b242 with SMTP id\n\tl34-20020a05600c1d2200b003a369f5b242mr5005663wms.202.1658839568610; \n\tTue, 26 Jul 2022 05:46:08 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Jul 2022 13:45:44 +0100","Message-Id":"<20220726124549.1646-13-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20220726124549.1646-1-naush@raspberrypi.com>","References":"<20220726124549.1646-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 12/17] ipa: raspberrypi: Remove extern \"C\"\n\tdeclarations","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Naushir Patuck <naush@raspberrypi.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Since the controller header files are now C++ specific, remove the extern \"C\"\ndeclarations.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/raspberrypi/controller/agc_status.h         | 8 --------\n src/ipa/raspberrypi/controller/alsc_status.h        | 8 --------\n src/ipa/raspberrypi/controller/awb_status.h         | 8 --------\n src/ipa/raspberrypi/controller/black_level_status.h | 8 --------\n src/ipa/raspberrypi/controller/camera_mode.h        | 8 --------\n src/ipa/raspberrypi/controller/ccm_status.h         | 8 --------\n src/ipa/raspberrypi/controller/contrast_status.h    | 8 --------\n src/ipa/raspberrypi/controller/denoise_status.h     | 8 --------\n src/ipa/raspberrypi/controller/dpc_status.h         | 8 --------\n src/ipa/raspberrypi/controller/focus_status.h       | 8 --------\n src/ipa/raspberrypi/controller/geq_status.h         | 8 --------\n src/ipa/raspberrypi/controller/lux_status.h         | 8 --------\n src/ipa/raspberrypi/controller/noise_status.h       | 8 --------\n src/ipa/raspberrypi/controller/sharpen_status.h     | 8 --------\n 14 files changed, 112 deletions(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/agc_status.h b/src/ipa/raspberrypi/controller/agc_status.h\nindex 9d184a158411..c7b7c1b2d938 100644\n--- a/src/ipa/raspberrypi/controller/agc_status.h\n+++ b/src/ipa/raspberrypi/controller/agc_status.h\n@@ -13,10 +13,6 @@\n  * \"agc.status\" metadata.\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n /*\n  * Note: total_exposure_value will be reported as zero until the algorithm has\n  * seen statistics and calculated meaningful values. The contents should be\n@@ -39,7 +35,3 @@ struct AgcStatus {\n \tdouble digitalGain;\n \tint locked;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/alsc_status.h b/src/ipa/raspberrypi/controller/alsc_status.h\nindex e074f9359faa..d7122f5190ce 100644\n--- a/src/ipa/raspberrypi/controller/alsc_status.h\n+++ b/src/ipa/raspberrypi/controller/alsc_status.h\n@@ -11,10 +11,6 @@\n  * \"alsc.status\" metadata.\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n #define ALSC_CELLS_X 16\n #define ALSC_CELLS_Y 12\n \n@@ -23,7 +19,3 @@ struct AlscStatus {\n \tdouble g[ALSC_CELLS_Y][ALSC_CELLS_X];\n \tdouble b[ALSC_CELLS_Y][ALSC_CELLS_X];\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/awb_status.h b/src/ipa/raspberrypi/controller/awb_status.h\nindex 2f6e88ef6e7f..353906f8aefd 100644\n--- a/src/ipa/raspberrypi/controller/awb_status.h\n+++ b/src/ipa/raspberrypi/controller/awb_status.h\n@@ -11,10 +11,6 @@\n  * under the tag \"awb.status\".\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct AwbStatus {\n \tchar mode[32];\n \tdouble temperatureK;\n@@ -22,7 +18,3 @@ struct AwbStatus {\n \tdouble gainG;\n \tdouble gainB;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/black_level_status.h b/src/ipa/raspberrypi/controller/black_level_status.h\nindex 8b0523834dcf..8d2c497aef3a 100644\n--- a/src/ipa/raspberrypi/controller/black_level_status.h\n+++ b/src/ipa/raspberrypi/controller/black_level_status.h\n@@ -8,16 +8,8 @@\n \n /* The \"black level\" algorithm stores the black levels to use. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct BlackLevelStatus {\n \tuint16_t blackLevelR; /* out of 16 bits */\n \tuint16_t blackLevelG;\n \tuint16_t blackLevelB;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/camera_mode.h b/src/ipa/raspberrypi/controller/camera_mode.h\nindex 47a0fea424ca..6e1597d23a28 100644\n--- a/src/ipa/raspberrypi/controller/camera_mode.h\n+++ b/src/ipa/raspberrypi/controller/camera_mode.h\n@@ -16,10 +16,6 @@\n  * including binning, scaling, cropping etc.\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n #define CAMERA_MODE_NAME_LEN 32\n \n struct CameraMode {\n@@ -46,7 +42,3 @@ struct CameraMode {\n \t/* sensitivity of this mode */\n \tdouble sensitivity;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/ccm_status.h b/src/ipa/raspberrypi/controller/ccm_status.h\nindex 4cdd8bed0311..44471d0ef901 100644\n--- a/src/ipa/raspberrypi/controller/ccm_status.h\n+++ b/src/ipa/raspberrypi/controller/ccm_status.h\n@@ -8,15 +8,7 @@\n \n /* The \"ccm\" algorithm generates an appropriate colour matrix. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct CcmStatus {\n \tdouble matrix[9];\n \tdouble saturation;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/contrast_status.h b/src/ipa/raspberrypi/controller/contrast_status.h\nindex 5eb084f78e71..88152575288f 100644\n--- a/src/ipa/raspberrypi/controller/contrast_status.h\n+++ b/src/ipa/raspberrypi/controller/contrast_status.h\n@@ -11,10 +11,6 @@\n  * of contrast stretching based on the AGC histogram.\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n #define CONTRAST_NUM_POINTS 33\n \n struct ContrastPoint {\n@@ -27,7 +23,3 @@ struct ContrastStatus {\n \tdouble brightness;\n \tdouble contrast;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/denoise_status.h b/src/ipa/raspberrypi/controller/denoise_status.h\nindex c2d9c7301b19..e97368aaab54 100644\n--- a/src/ipa/raspberrypi/controller/denoise_status.h\n+++ b/src/ipa/raspberrypi/controller/denoise_status.h\n@@ -8,17 +8,9 @@\n \n /* This stores the parameters required for Denoise. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct DenoiseStatus {\n \tdouble noiseConstant;\n \tdouble noiseSlope;\n \tdouble strength;\n \tunsigned int mode;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/dpc_status.h b/src/ipa/raspberrypi/controller/dpc_status.h\nindex c99ad8c500a6..685ffc7b91b5 100644\n--- a/src/ipa/raspberrypi/controller/dpc_status.h\n+++ b/src/ipa/raspberrypi/controller/dpc_status.h\n@@ -8,14 +8,6 @@\n \n /* The \"DPC\" algorithm sets defective pixel correction strength. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct DpcStatus {\n \tint strength; /* 0 = \"off\", 1 = \"normal\", 2 = \"strong\" */\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/focus_status.h b/src/ipa/raspberrypi/controller/focus_status.h\nindex c75795dc0621..f0dbe4e2c4a2 100644\n--- a/src/ipa/raspberrypi/controller/focus_status.h\n+++ b/src/ipa/raspberrypi/controller/focus_status.h\n@@ -14,15 +14,7 @@\n  * measurements, it's not driving any kind of auto-focus algorithm!\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct FocusStatus {\n \tunsigned int num;\n \tuint32_t focusMeasures[FOCUS_REGIONS];\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/geq_status.h b/src/ipa/raspberrypi/controller/geq_status.h\nindex 0ebb7ce71d5b..791f34ca2e52 100644\n--- a/src/ipa/raspberrypi/controller/geq_status.h\n+++ b/src/ipa/raspberrypi/controller/geq_status.h\n@@ -8,15 +8,7 @@\n \n /* The \"GEQ\" algorithm calculates the green equalisation thresholds */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct GeqStatus {\n \tuint16_t offset;\n \tdouble slope;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/lux_status.h b/src/ipa/raspberrypi/controller/lux_status.h\nindex c1134bec3694..cd5ed473c10d 100644\n--- a/src/ipa/raspberrypi/controller/lux_status.h\n+++ b/src/ipa/raspberrypi/controller/lux_status.h\n@@ -17,15 +17,7 @@\n  * (presumably meaningless) value in the image metadata.\n  */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct LuxStatus {\n \tdouble lux;\n \tdouble aperture;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/noise_status.h b/src/ipa/raspberrypi/controller/noise_status.h\nindex 689beed394a7..843260f013ae 100644\n--- a/src/ipa/raspberrypi/controller/noise_status.h\n+++ b/src/ipa/raspberrypi/controller/noise_status.h\n@@ -8,15 +8,7 @@\n \n /* The \"noise\" algorithm stores an estimate of the noise profile for this image. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct NoiseStatus {\n \tdouble noiseConstant;\n \tdouble noiseSlope;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\ndiff --git a/src/ipa/raspberrypi/controller/sharpen_status.h b/src/ipa/raspberrypi/controller/sharpen_status.h\nindex 5ea21ab23f91..c66eaa73af3b 100644\n--- a/src/ipa/raspberrypi/controller/sharpen_status.h\n+++ b/src/ipa/raspberrypi/controller/sharpen_status.h\n@@ -8,10 +8,6 @@\n \n /* The \"sharpen\" algorithm stores the strength to use. */\n \n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n struct SharpenStatus {\n \t/* controls the smallest level of detail (or noise!) that sharpening will pick up */\n \tdouble threshold;\n@@ -22,7 +18,3 @@ struct SharpenStatus {\n \t/* The sharpening strength requested by the user or application. */\n \tdouble userStrength;\n };\n-\n-#ifdef __cplusplus\n-}\n-#endif\n","prefixes":["libcamera-devel","12/17"]}