Module Name: src
Committed By: jmcneill
Date: Sat Oct 29 01:19:36 UTC 2022
Modified Files:
src/sys/arch/arm/xilinx: zynq_gpio.c
Log Message:
Fix MASK_DATA_SET macro
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xilinx/zynq_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xilinx/zynq_gpio.c
diff -u src/sys/arch/arm/xilinx/zynq_gpio.c:1.2 src/sys/arch/arm/xilinx/zynq_gpio.c:1.3
--- src/sys/arch/arm/xilinx/zynq_gpio.c:1.2 Thu Oct 27 22:35:31 2022
+++ src/sys/arch/arm/xilinx/zynq_gpio.c Sat Oct 29 01:19:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_gpio.c,v 1.2 2022/10/27 22:35:31 jmcneill Exp $ */
+/* $NetBSD: zynq_gpio.c,v 1.3 2022/10/29 01:19:36 jmcneill Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,v 1.2 2022/10/27 22:35:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,v 1.3 2022/10/29 01:19:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,
#define ZYNQ_GPIO_NPINS (4 * 32)
#define MASK_DATA_REG(pin) (0x000 + 0x4 * ((pin) / 16))
-#define MASK_DATA_SET(pin, val) ((((pin) % 16) << 16) | ((val) << ((pin) % 16)))
+#define MASK_DATA_SET(pin, val) \
+ ((1 << (((pin) % 16) + 16)) | ((val) << ((pin) % 16)))
#define DATA_RO_REG(pin) (0x060 + 0x4 * ((pin) / 32))
#define DATA_RO_BIT(pin) __BIT((pin) % 32)
#define DIRM_REG(pin) (0x204 + 0x40 * ((pin) / 32))
