Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1m9Uhw-0001iT-Qs for mharc-grub-devel@gnu.org; Fri, 30 Jul 2021 11:45:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Uhw-0001gQ-2F for grub-devel@gnu.org; Fri, 30 Jul 2021 11:45:56 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:39332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Uhu-0002lU-0W for grub-devel@gnu.org; Fri, 30 Jul 2021 11:45:55 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16UFXudB128746; Fri, 30 Jul 2021 11:45:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=SXE/tmy015RlAn1oaNckIWpudhQd/TKicwUCd6qGO14=; b=iVWXAX5ba4msI0vJJ7Fn9CCqKnN/Ld6gkMxKhBCMOpMHlQzId/+kkUINl1QASJ1GNTaI 8iWcanzBT0UYE0zRqs5dNkGFIi/6T3wVtt7hVBoULEmT1wtW4JXL+NzYlsfWzP2CV/xH RKELgX1DljcJxG90me9VUVQpsDFbgO1UdkN186+bn0PfxoQKchnc6CY1iQ2w4lOkEeNn ev5+1OQ0DGoaO4ND7wYKpb6mXv+k11+pnHYtgIRPntl1wvbig0P/N9Vu0JTeCdIJuut8 SD04Dpp4ShvCQTTEx4qkht21GUl/75dNVORpObvGvSLZEJsbRIJK0DQ9/68MgY1yjUMa ew== Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com with ESMTP id 3a4m0tgju6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 11:45:52 -0400 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16UFggJr010808; Fri, 30 Jul 2021 15:45:51 GMT Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by ppma04dal.us.ibm.com with ESMTP id 3a235suhgf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 15:45:51 +0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16UFjimP30802248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Jul 2021 15:45:44 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 87B4E2805A; Fri, 30 Jul 2021 15:45:44 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 77E8F28064; Fri, 30 Jul 2021 15:45:44 +0000 (GMT) Received: from sbct-2.. (unknown [9.47.158.152]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 30 Jul 2021 15:45:44 +0000 (GMT) From: Stefan Berger To: grub-devel@gnu.org Cc: dkiper@net-space.pl, Stefan Berger Subject: [PATCH v3 1/4] ieee1275: Move #defines into common ieee1275.h header Date: Fri, 30 Jul 2021 11:45:37 -0400 Message-Id: <20210730154540.3085221-2-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210730154540.3085221-1-stefanb@linux.vnet.ibm.com> References: <20210730154540.3085221-1-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: HYriW9L5laDHWTrxqWs7X8I7rdnDXzFV X-Proofpoint-ORIG-GUID: HYriW9L5laDHWTrxqWs7X8I7rdnDXzFV X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-30_08:2021-07-30, 2021-07-30 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 impostorscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 mlxscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2107300103 Received-SPF: none client-ip=148.163.156.1; envelope-from=stefanb@linux.vnet.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2021 15:45:56 -0000 From: Stefan Berger Move some #defines from ieee1275.c into the common ieee1275.h header file. Adjust the case used in IHANDLE_INVALID to use proper ihandle_t. Signed-off-by: Stefan Berger --- grub-core/kern/ieee1275/ieee1275.c | 29 ++++++++++++----------------- include/grub/ieee1275/ieee1275.h | 3 +++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/grub-core/kern/ieee1275/ieee1275.c b/grub-core/kern/ieee1275/ieee1275.c index 86f81a3c4..8fe92274d 100644 --- a/grub-core/kern/ieee1275/ieee1275.c +++ b/grub-core/kern/ieee1275/ieee1275.c @@ -21,11 +21,6 @@ #include #include -#define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_cell_t) -1) -#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_cell_t) 0) -#define IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1) - - int grub_ieee1275_finddevice (const char *name, grub_ieee1275_phandle_t *phandlep) @@ -44,8 +39,7 @@ grub_ieee1275_finddevice (const char *name, grub_ieee1275_phandle_t *phandlep) if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; *phandlep = args.phandle; - if (args.phandle == IEEE1275_PHANDLE_INVALID) - return -1; + if (args.phandle == GRUB_IEEE1275_PHANDLE_INVALID) return -1; return 0; } @@ -75,7 +69,7 @@ grub_ieee1275_get_property (grub_ieee1275_phandle_t phandle, return -1; if (actual) *actual = (grub_ssize_t) args.size; - if (args.size == IEEE1275_CELL_INVALID) + if (args.size == GRUB_IEEE1275_CELL_INVALID) return -1; return 0; } @@ -146,7 +140,7 @@ grub_ieee1275_get_property_length (grub_ieee1275_phandle_t phandle, if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; *length = args.length; - if (args.length == IEEE1275_CELL_INVALID) + if (args.length == GRUB_IEEE1275_CELL_INVALID) return -1; return 0; } @@ -169,7 +163,7 @@ grub_ieee1275_instance_to_package (grub_ieee1275_ihandle_t ihandle, if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; *phandlep = args.phandle; - if (args.phandle == IEEE1275_PHANDLE_INVALID) + if (args.phandle == GRUB_IEEE1275_PHANDLE_INVALID) return -1; return 0; } @@ -198,7 +192,7 @@ grub_ieee1275_package_to_path (grub_ieee1275_phandle_t phandle, return -1; if (actual) *actual = args.actual; - if (args.actual == IEEE1275_CELL_INVALID) + if (args.actual == GRUB_IEEE1275_CELL_INVALID) return -1; return 0; } @@ -227,7 +221,7 @@ grub_ieee1275_instance_to_path (grub_ieee1275_ihandle_t ihandle, return -1; if (actual) *actual = args.actual; - if (args.actual == IEEE1275_CELL_INVALID) + if (args.actual == GRUB_IEEE1275_CELL_INVALID) return -1; return 0; } @@ -355,7 +349,7 @@ grub_ieee1275_child (grub_ieee1275_phandle_t node, INIT_IEEE1275_COMMON (&args.common, "child", 1, 1); args.node = node; - args.result = IEEE1275_PHANDLE_INVALID; + args.result = GRUB_IEEE1275_PHANDLE_INVALID; if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; @@ -379,7 +373,7 @@ grub_ieee1275_parent (grub_ieee1275_phandle_t node, INIT_IEEE1275_COMMON (&args.common, "parent", 1, 1); args.node = node; - args.result = IEEE1275_PHANDLE_INVALID; + args.result = GRUB_IEEE1275_PHANDLE_INVALID; if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; @@ -459,7 +453,7 @@ grub_ieee1275_open (const char *path, grub_ieee1275_ihandle_t *result) if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; *result = args.result; - if (args.result == IEEE1275_IHANDLE_INVALID) + if (args.result == GRUB_IEEE1275_IHANDLE_INVALID) return -1; return 0; } @@ -591,7 +585,7 @@ grub_ieee1275_claim (grub_addr_t addr, grub_size_t size, unsigned int align, return -1; if (result) *result = args.base; - if (args.base == IEEE1275_CELL_INVALID) + if (args.base == GRUB_IEEE1275_CELL_INVALID) return -1; return 0; } @@ -641,7 +635,8 @@ grub_ieee1275_set_property (grub_ieee1275_phandle_t phandle, if (IEEE1275_CALL_ENTRY_FN (&args) == -1) return -1; *actual = args.actual; - if ((args.actual == IEEE1275_CELL_INVALID) || (args.actual != args.size)) + if ((args.actual == GRUB_IEEE1275_CELL_INVALID) || + (args.actual != args.size)) return -1; return 0; } diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h index 73e2f4644..b963ee830 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -24,6 +24,8 @@ #include #include +#define GRUB_IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1) + struct grub_ieee1275_mem_region { unsigned int start; @@ -58,6 +60,7 @@ typedef grub_uint32_t grub_ieee1275_ihandle_t; typedef grub_uint32_t grub_ieee1275_phandle_t; #define GRUB_IEEE1275_PHANDLE_INVALID ((grub_ieee1275_phandle_t) -1) +#define GRUB_IEEE1275_IHANDLE_INVALID ((grub_ieee1275_ihandle_t) 0) struct grub_ieee1275_devalias { -- 2.25.1