diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-12-02 21:31:54 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-12-02 21:31:54 +0000 |
commit | 2512ed1c56a7c415f5a13ac2f38f72278e3ac660 (patch) | |
tree | e500f3c7ea491f996fe9c33aaa7ed62b9ca234b7 /firmware/export/i2c-async.h | |
parent | 4162a4618426b259c8b87c75c127f6f47b2b7ab0 (diff) | |
download | rockbox-2512ed1c56a7c415f5a13ac2f38f72278e3ac660.tar.gz rockbox-2512ed1c56a7c415f5a13ac2f38f72278e3ac660.zip |
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
Diffstat (limited to 'firmware/export/i2c-async.h')
-rw-r--r-- | firmware/export/i2c-async.h | 9 |
1 files changed, 5 insertions, 4 deletions
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, | |||
247 | uint8_t clr, uint8_t set, uint8_t* val); | 247 | uint8_t clr, uint8_t set, uint8_t* val); |
248 | 248 | ||
249 | /* Variant to write a single 8-bit value to a register */ | 249 | /* Variant to write a single 8-bit value to a register */ |
250 | inline int i2c_reg_write1(int bus, uint8_t addr, uint8_t reg, uint8_t val) | 250 | static inline int i2c_reg_write1(int bus, uint8_t addr, |
251 | uint8_t reg, uint8_t val) | ||
251 | { | 252 | { |
252 | return i2c_reg_write(bus, addr, reg, 1, &val); | 253 | return i2c_reg_write(bus, addr, reg, 1, &val); |
253 | } | 254 | } |
254 | 255 | ||
255 | /* Variant to read an 8-bit value from a register; returns the value | 256 | /* Variant to read an 8-bit value from a register; returns the value |
256 | * directly, or returns -1 on any error. */ | 257 | * directly, or returns -1 on any error. */ |
257 | inline int i2c_reg_read1(int bus, uint8_t addr, uint8_t reg) | 258 | static inline int i2c_reg_read1(int bus, uint8_t addr, uint8_t reg) |
258 | { | 259 | { |
259 | uint8_t v; | 260 | uint8_t v; |
260 | int i = i2c_reg_read(bus, addr, reg, 1, &v); | 261 | 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) | |||
265 | } | 266 | } |
266 | 267 | ||
267 | /* Variant to set or clear one bit in an 8-bit register */ | 268 | /* Variant to set or clear one bit in an 8-bit register */ |
268 | inline int i2c_reg_setbit1(int bus, uint8_t addr, uint8_t reg, | 269 | static inline int i2c_reg_setbit1(int bus, uint8_t addr, uint8_t reg, |
269 | int bit, int value, uint8_t* val) | 270 | int bit, int value, uint8_t* val) |
270 | { | 271 | { |
271 | uint8_t clr = 0, set = 0; | 272 | uint8_t clr = 0, set = 0; |
272 | if(value) | 273 | if(value) |