diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-12-03 16:15:20 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2023-01-12 06:33:50 -0500 |
commit | 7e5fc4076aa82ad329aad280e938cdffbb0422e8 (patch) | |
tree | dcbafbfc823a9d7226337fd2dbcbccfb4021f372 | |
parent | 39439f69094225380af1714e52a5ff145612e70e (diff) | |
download | rockbox-7e5fc4076aa82ad329aad280e938cdffbb0422e8.tar.gz rockbox-7e5fc4076aa82ad329aad280e938cdffbb0422e8.zip |
Add INIT_ATTR to i2c_init()
It's usually only called from init() in main.c, so this is safe.
There is one more call in system-dm320.c from system_init(), but
that's also "safe". I don't know if it's okay to call i2c_init()
twice, but presumably it works...
Change-Id: I9c1cd918d162d9955f7cf03209e836cbd5e30c57
-rw-r--r-- | firmware/export/i2c-coldfire.h | 2 | ||||
-rw-r--r-- | firmware/export/i2c-rk27xx.h | 2 | ||||
-rw-r--r-- | firmware/export/i2c-s5l8700.h | 2 | ||||
-rw-r--r-- | firmware/export/i2c-s5l8702.h | 2 | ||||
-rw-r--r-- | firmware/export/i2c.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/i2c-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/i2c-imx31.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/i2c-s3c2440.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/i2c-dm320.h | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_x1000/i2c-x1000.h | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/firmware/export/i2c-coldfire.h b/firmware/export/i2c-coldfire.h index b0d21a8631..f98daf5d5f 100644 --- a/firmware/export/i2c-coldfire.h +++ b/firmware/export/i2c-coldfire.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include "cpu.h" | 31 | #include "cpu.h" |
32 | 32 | ||
33 | void i2c_init(void); | 33 | void i2c_init(void) INIT_ATTR; |
34 | int i2c_read (volatile unsigned char *iface, unsigned char addr, | 34 | int i2c_read (volatile unsigned char *iface, unsigned char addr, |
35 | unsigned char *buf, int count); | 35 | unsigned char *buf, int count); |
36 | int i2c_write(volatile unsigned char *iface, unsigned char addr, | 36 | int i2c_write(volatile unsigned char *iface, unsigned char addr, |
diff --git a/firmware/export/i2c-rk27xx.h b/firmware/export/i2c-rk27xx.h index 96baf566a7..d16d4c3dbb 100644 --- a/firmware/export/i2c-rk27xx.h +++ b/firmware/export/i2c-rk27xx.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | void i2c_init(void); | 27 | void i2c_init(void) INIT_ATTR; |
28 | int i2c_write(unsigned char slave, int address, int len, const unsigned char *data); | 28 | int i2c_write(unsigned char slave, int address, int len, const unsigned char *data); |
29 | int i2c_read(unsigned char slave, int address, int len, unsigned char *data); | 29 | int i2c_read(unsigned char slave, int address, int len, unsigned char *data); |
30 | 30 | ||
diff --git a/firmware/export/i2c-s5l8700.h b/firmware/export/i2c-s5l8700.h index e6ffcfae55..607f361384 100644 --- a/firmware/export/i2c-s5l8700.h +++ b/firmware/export/i2c-s5l8700.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | void i2c_init(void); | 27 | void i2c_init(void) INIT_ATTR; |
28 | int i2c_write(unsigned char slave, int address, int len, const unsigned char *data); | 28 | int i2c_write(unsigned char slave, int address, int len, const unsigned char *data); |
29 | int i2c_read(unsigned char slave, int address, int len, unsigned char *data); | 29 | int i2c_read(unsigned char slave, int address, int len, unsigned char *data); |
30 | 30 | ||
diff --git a/firmware/export/i2c-s5l8702.h b/firmware/export/i2c-s5l8702.h index f671e4059e..a1e7be04b4 100644 --- a/firmware/export/i2c-s5l8702.h +++ b/firmware/export/i2c-s5l8702.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | void i2c_init(void); | 27 | void i2c_init(void) INIT_ATTR; |
28 | int i2c_write(int bus, unsigned char slave, int address, int len, const unsigned char *data); | 28 | int i2c_write(int bus, unsigned char slave, int address, int len, const unsigned char *data); |
29 | int i2c_read(int bus, unsigned char slave, int address, int len, unsigned char *data); | 29 | int i2c_read(int bus, unsigned char slave, int address, int len, unsigned char *data); |
30 | 30 | ||
diff --git a/firmware/export/i2c.h b/firmware/export/i2c.h index ac9ddba055..21ec809f13 100644 --- a/firmware/export/i2c.h +++ b/firmware/export/i2c.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef I2C_H | 21 | #ifndef I2C_H |
22 | #define I2C_H | 22 | #define I2C_H |
23 | 23 | ||
24 | extern void i2c_init(void); | 24 | extern void i2c_init(void) INIT_ATTR; |
25 | extern void i2c_begin(void); | 25 | extern void i2c_begin(void); |
26 | extern void i2c_end(void); | 26 | extern void i2c_end(void); |
27 | extern int i2c_write(int device, const unsigned char* buf, int count ); | 27 | extern int i2c_write(int device, const unsigned char* buf, int count ); |
diff --git a/firmware/target/arm/imx31/i2c-imx31.c b/firmware/target/arm/imx31/i2c-imx31.c index 972c7d465b..ce5e4cc8f8 100644 --- a/firmware/target/arm/imx31/i2c-imx31.c +++ b/firmware/target/arm/imx31/i2c-imx31.c | |||
@@ -367,7 +367,7 @@ int i2c_write(struct i2c_node *node, const unsigned char *data, | |||
367 | return -1; | 367 | return -1; |
368 | } | 368 | } |
369 | 369 | ||
370 | void INIT_ATTR i2c_init(void) | 370 | void i2c_init(void) |
371 | { | 371 | { |
372 | /* Do one-time inits for each module that will be used - leave | 372 | /* Do one-time inits for each module that will be used - leave |
373 | * module disabled and unclocked until something wants it. */ | 373 | * module disabled and unclocked until something wants it. */ |
diff --git a/firmware/target/arm/imx31/i2c-imx31.h b/firmware/target/arm/imx31/i2c-imx31.h index b7305931d1..dad5a3da00 100644 --- a/firmware/target/arm/imx31/i2c-imx31.h +++ b/firmware/target/arm/imx31/i2c-imx31.h | |||
@@ -76,7 +76,7 @@ struct i2c_sync_transfer_desc | |||
76 | }; | 76 | }; |
77 | 77 | ||
78 | /* One-time init of i2c driver */ | 78 | /* One-time init of i2c driver */ |
79 | void i2c_init(void); | 79 | void i2c_init(void) INIT_ATTR; |
80 | 80 | ||
81 | /* Enable or disable the node - modules will be switched on/off accordingly. */ | 81 | /* Enable or disable the node - modules will be switched on/off accordingly. */ |
82 | void i2c_enable_node(struct i2c_node *node, bool enable); | 82 | void i2c_enable_node(struct i2c_node *node, bool enable); |
diff --git a/firmware/target/arm/s3c2440/i2c-s3c2440.h b/firmware/target/arm/s3c2440/i2c-s3c2440.h index 793ee213fd..8b739358af 100644 --- a/firmware/target/arm/s3c2440/i2c-s3c2440.h +++ b/firmware/target/arm/s3c2440/i2c-s3c2440.h | |||
@@ -41,6 +41,6 @@ | |||
41 | /* IICLC */ | 41 | /* IICLC */ |
42 | #define I2C_FLT_ENB (1 << 2) | 42 | #define I2C_FLT_ENB (1 << 2) |
43 | 43 | ||
44 | void i2c_init(void); | 44 | void i2c_init(void) INIT_ATTR; |
45 | void i2c_write(int addr, const unsigned char *data, int count); | 45 | void i2c_write(int addr, const unsigned char *data, int count); |
46 | 46 | ||
diff --git a/firmware/target/arm/tms320dm320/i2c-dm320.h b/firmware/target/arm/tms320dm320/i2c-dm320.h index 43271692eb..89a8e6f1a4 100644 --- a/firmware/target/arm/tms320dm320/i2c-dm320.h +++ b/firmware/target/arm/tms320dm320/i2c-dm320.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "system.h" | 25 | #include "system.h" |
26 | 26 | ||
27 | void i2c_init(void); | 27 | void i2c_init(void) INIT_ATTR; |
28 | int i2c_write(unsigned short address, const unsigned char *data, int count); | 28 | int i2c_write(unsigned short address, const unsigned char *data, int count); |
29 | int i2c_read(unsigned short address, unsigned char* buf, int count); | 29 | int i2c_read(unsigned short address, unsigned char* buf, int count); |
30 | 30 | ||
diff --git a/firmware/target/mips/ingenic_x1000/i2c-x1000.h b/firmware/target/mips/ingenic_x1000/i2c-x1000.h index e76624d511..9b9ba5e088 100644 --- a/firmware/target/mips/ingenic_x1000/i2c-x1000.h +++ b/firmware/target/mips/ingenic_x1000/i2c-x1000.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define I2C_FREQ_100K 100000 | 27 | #define I2C_FREQ_100K 100000 |
28 | #define I2C_FREQ_400K 400000 | 28 | #define I2C_FREQ_400K 400000 |
29 | 29 | ||
30 | extern void i2c_init(void); | 30 | extern void i2c_init(void) INIT_ATTR; |
31 | 31 | ||
32 | /* Configure the I2C controller prior to use. | 32 | /* Configure the I2C controller prior to use. |
33 | * | 33 | * |