From 2512ed1c56a7c415f5a13ac2f38f72278e3ac660 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Thu, 2 Dec 2021 21:31:54 +0000 Subject: Make inline functions in headers 'static inline' Future-proofing against newer versions of GCC/binutils which are stricter about the use of 'inline' functions in headers. Change-Id: Id620812ed340f0d790ba6c5b8b5cb1d700acfbbf --- firmware/export/i2c-async.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/i2c-async.h b/firmware/export/i2c-async.h index 2877d1875c..f31a73452b 100644 --- a/firmware/export/i2c-async.h +++ b/firmware/export/i2c-async.h @@ -247,14 +247,15 @@ extern int i2c_reg_modify1(int bus, uint8_t addr, uint8_t reg, uint8_t clr, uint8_t set, uint8_t* val); /* Variant to write a single 8-bit value to a register */ -inline int i2c_reg_write1(int bus, uint8_t addr, uint8_t reg, uint8_t val) +static inline int i2c_reg_write1(int bus, uint8_t addr, + uint8_t reg, uint8_t val) { return i2c_reg_write(bus, addr, reg, 1, &val); } /* Variant to read an 8-bit value from a register; returns the value * directly, or returns -1 on any error. */ -inline int i2c_reg_read1(int bus, uint8_t addr, uint8_t reg) +static inline int i2c_reg_read1(int bus, uint8_t addr, uint8_t reg) { uint8_t v; int i = i2c_reg_read(bus, addr, reg, 1, &v); @@ -265,8 +266,8 @@ inline int i2c_reg_read1(int bus, uint8_t addr, uint8_t reg) } /* Variant to set or clear one bit in an 8-bit register */ -inline int i2c_reg_setbit1(int bus, uint8_t addr, uint8_t reg, - int bit, int value, uint8_t* val) +static inline int i2c_reg_setbit1(int bus, uint8_t addr, uint8_t reg, + int bit, int value, uint8_t* val) { uint8_t clr = 0, set = 0; if(value) -- cgit v1.2.3