From patchwork Wed Jul 12 08:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Heymans X-Patchwork-Id: 1806720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aheymans-xyz.20221208.gappssmtp.com header.i=@aheymans-xyz.20221208.gappssmtp.com header.a=rsa-sha256 header.s=20221208 header.b=W8U1nJNv; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R1B6t62f6z20cD for ; Wed, 12 Jul 2023 18:41:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qJVPj-0006eW-S6; Wed, 12 Jul 2023 08:41:35 +0000 Received: from mail-wr1-f52.google.com ([209.85.221.52]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qJVOC-0006Zd-LA for fwts-devel@lists.ubuntu.com; Wed, 12 Jul 2023 08:40:00 +0000 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-307d58b3efbso6611332f8f.0 for ; Wed, 12 Jul 2023 01:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aheymans-xyz.20221208.gappssmtp.com; s=20221208; t=1689151200; x=1691743200; 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=ZsLRgGMOTupM4wh5LrVJFmLER3+7HObZPN5OEBurRg8=; b=W8U1nJNvbbYORVOGmB+Mxs9/hJpS8uxMYGMzLPV4jHRo3LwiBiBZW2Kp7aXSR3ya62 gXbI57pLgeTwWbKrWW/yEMUBrsEjGvNh/xXStsRcGpYZ+nH8RGifsotdV8xSONW2i7iw 08hH33MMj4ZCRC0NcdSJeZySpzRoO9MPkvcfLX2vQCrIKuvvpWTPUjza9aITDPcmRcKe hEnwMHjSyN9XrOeXu7Ys0UKpNb6Qtfv1DU6YpSVD2k3d2WOzfdI4B/vshOPCtfxQrop+ ZxTSetRV06Ev5wbUO60Di4kUcngEofcu89WgAL9N3YIllm+ZqSEOsbypsWyCe/grs7So uNtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689151200; x=1691743200; 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=ZsLRgGMOTupM4wh5LrVJFmLER3+7HObZPN5OEBurRg8=; b=JXs3qGUx4aGmoYw6suP2vdlGLitZ8sQh0KFqBcprQ8HMAPuYHUlqsUDdevwfogGt9h qZ2N28ONDvXs0q2I9S76CgXxSsZOUx4frOEnsBZ4IHynq7pDvzIc7ggVio8KYV0rV6ty vTzOCpcr+KbpbCWcdnpiVTDv4WsKbUYZrqmVSUhcwX3R/+VtwuRPmpnS+0kBfg7LIMqy wCXaB2NuwHf+MMAdvFfK0PHlg7JMznKLoicsvbVwFlIjIv5le65QdRsG7Z9Tl/ALRfBb 1Y1LLft6SMLrrlv1WsVHLSJNoY2DOpYLff/14TaXKGUpIvNvIyaFiYcfZB2dscUFFWth wOHg== X-Gm-Message-State: ABy/qLblyFq9M/Z2OozPjIVR9teevLCD9L6pMcdxPav6f6e+EQ/vPZ53 Ct7IyBGCuTHDUsFfOOlZ8oGld+gjPF7dw8ozfBzppA== X-Google-Smtp-Source: APBJJlHJ3i8LKeUQMh3OQdog604HIpa4n6z4nUsRwfhlyZh+p6mc6fIOuFvnU0l/Vn6mQP0s3n/9Bw== X-Received: by 2002:adf:f008:0:b0:314:13e7:b8b with SMTP id j8-20020adff008000000b0031413e70b8bmr17291694wro.18.1689151200012; Wed, 12 Jul 2023 01:40:00 -0700 (PDT) Received: from localhost.localdomain (ip-078-094-000-050.um19.pools.vodafone-ip.de. [78.94.0.50]) by smtp.gmail.com with ESMTPSA id o4-20020a5d4084000000b003142c85fbcdsm4497970wrp.11.2023.07.12.01.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 01:39:59 -0700 (PDT) From: arthur@aheymans.xyz X-Google-Original-From: arthur@aheymans.com To: fwts-devel@lists.ubuntu.com Subject: [PATCH 3/3] Fix gcc -Werror=enum-int-mismatch Date: Wed, 12 Jul 2023 10:37:50 +0200 Message-ID: <20230712083804.2581833-3-arthur@aheymans.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712083804.2581833-1-arthur@aheymans.com> References: <20230712083804.2581833-1-arthur@aheymans.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 12 Jul 2023 08:41:34 +0000 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arthur Heymans Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Arthur Heymans GCC 13 added a warning about mismatches between an enumerated type and an integer type in declarations. Signed-off-by: Arthur Heymans Nacked-by: Ivan Hu --- src/lib/include/fwts_cpu.h | 2 +- src/lib/include/fwts_memorymap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/include/fwts_cpu.h b/src/lib/include/fwts_cpu.h index f5f66108..b023c5e3 100644 --- a/src/lib/include/fwts_cpu.h +++ b/src/lib/include/fwts_cpu.h @@ -63,7 +63,7 @@ int fwts_cpu_is_Intel(bool *is_intel); int fwts_cpu_is_AMD(bool *is_amd); int fwts_cpu_is_Hygon(bool *is_hygon); -int fwts_cpu_has_c1e(void); +fwts_bool fwts_cpu_has_c1e(void); fwts_cpuinfo_x86 *fwts_cpu_get_info(const int which_cpu); void fwts_cpu_free_info(fwts_cpuinfo_x86 *cpu); diff --git a/src/lib/include/fwts_memorymap.h b/src/lib/include/fwts_memorymap.h index f79113b9..b2a39705 100644 --- a/src/lib/include/fwts_memorymap.h +++ b/src/lib/include/fwts_memorymap.h @@ -38,7 +38,7 @@ typedef struct { } fwts_memory_map_entry; int fwts_memory_map_type(fwts_list *memory_map_list, const uint64_t memory); -int fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory); +fwts_bool fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory); fwts_list *fwts_memory_map_table_load(fwts_framework *fw); void fwts_memory_map_table_free(fwts_list *memory_map_list); void fwts_memory_map_table_dump(fwts_framework *fw, fwts_list *memory_map_list);