userspace/include/fpga_io.h: bugfix in #define

pps_gen.c had a missing semicolon because of this bug. Fix the macro to behave properly withing if/else. And fix the user, adding the missing semicolon. We all know that these two functions should be static inline, and the fpga base pointer should be void *, but that's for later. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace/include/fpga_io.h: bugfix in #define
pps_gen.c had a missing semicolon because of this bug. Fix the macro to behave properly withing if/else. And fix the user, adding the missing semicolon. We all know that these two functions should be static inline, and the fpga base pointer should be void *, but that's for later. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
95e8ba67 · Alessandro Rubini · ef3ed69f · 95e8ba67 · 95e8ba67
Commit 95e8ba67 authored Nov 21, 2014 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

fpga_io.h userspace/include/fpga_io.h +4 -2

pps_gen.c userspace/libwr/pps_gen.c +1 -1

No files found.
--- a/userspace/include/fpga_io.h
+++ b/userspace/include/fpga_io.h
@@ -37,7 +37,9 @@ extern volatile uint8_t        *_fpga_base_virt; /* libwr/fpga_io.c */
 #define FPGA_BASE_ADDR          _fpga_base_virt
-#define _fpga_writel(reg, val){ *(volatile uint32_t *)(FPGA_BASE_ADDR + (reg)) = (val); }
+#define _fpga_writel(reg, val) \
-#define _fpga_readl(reg) (*(volatile uint32_t *)(FPGA_BASE_ADDR + (reg)))
+	(*(volatile uint32_t *)(FPGA_BASE_ADDR + (reg)) = (val))
+#define _fpga_readl(reg) \
+	(*(volatile uint32_t *)(FPGA_BASE_ADDR + (reg)))
 #endif
--- a/userspace/libwr/pps_gen.c
+++ b/userspace/libwr/pps_gen.c
@@ -79,7 +79,7 @@ int shw_pps_gen_enable_output(int enable)
 {
 	uint32_t escr = ppsg_read(ESCR);
 	if (enable)
-		ppsg_write(ESCR, escr | PPSG_ESCR_PPS_VALID)
+		ppsg_write(ESCR, escr | PPSG_ESCR_PPS_VALID);
 	else
 		ppsg_write(ESCR, escr & ~PPSG_ESCR_PPS_VALID);