diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-01-31 23:51:11 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-01-31 23:51:11 +0000 |
commit | 8e2ff63a7e1f7c493d867c8b4982feacf6f781ca (patch) | |
tree | 191c9b1337b7a5a5c94a1e43559f8504717ddb0d | |
parent | 1929e4724578a94143bab07487fb1e14ebaee9cf (diff) | |
download | rockbox-8e2ff63a7e1f7c493d867c8b4982feacf6f781ca.tar.gz rockbox-8e2ff63a7e1f7c493d867c8b4982feacf6f781ca.zip |
Various files: make function implementations consistent with their declaration in the header file or static if
they're local.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19892 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/resize.c | 2 | ||||
-rw-r--r-- | firmware/drivers/eeprom_24cxx.c | 4 | ||||
-rw-r--r-- | firmware/export/eeprom_24cxx.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/fmradio_i2c-h10.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/ata-iriver.c | 1 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/fmradio_i2c-iriver.c | 5 | ||||
-rw-r--r-- | firmware/target/sh/archos/ondio/fmradio_i2c-ondio.c | 5 |
7 files changed, 13 insertions, 10 deletions
diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c index 235e071f7b..55b8f77ca9 100644 --- a/apps/recorder/resize.c +++ b/apps/recorder/resize.c | |||
@@ -508,7 +508,7 @@ static inline bool scale_v_linear(struct rowset *rset, | |||
508 | #endif /* HAVE_UPSCALER */ | 508 | #endif /* HAVE_UPSCALER */ |
509 | 509 | ||
510 | #ifndef PLUGIN | 510 | #ifndef PLUGIN |
511 | void output_row_native(uint32_t row, void * row_in, struct scaler_context *ctx) | 511 | static void output_row_native(uint32_t row, void * row_in, struct scaler_context *ctx) |
512 | { | 512 | { |
513 | int col; | 513 | int col; |
514 | int fb_width = BM_WIDTH(ctx->bm->width,FORMAT_NATIVE,0); | 514 | int fb_width = BM_WIDTH(ctx->bm->width,FORMAT_NATIVE,0); |
diff --git a/firmware/drivers/eeprom_24cxx.c b/firmware/drivers/eeprom_24cxx.c index 4cd50d4e3a..5d26bd8eaf 100644 --- a/firmware/drivers/eeprom_24cxx.c +++ b/firmware/drivers/eeprom_24cxx.c | |||
@@ -40,7 +40,7 @@ void eeprom_24cxx_init(void) | |||
40 | memset(cached_bitfield, 0, sizeof cached_bitfield); | 40 | memset(cached_bitfield, 0, sizeof cached_bitfield); |
41 | } | 41 | } |
42 | 42 | ||
43 | int eeprom_24cxx_read_byte(unsigned int address, char *c) | 43 | static int eeprom_24cxx_read_byte(unsigned int address, char *c) |
44 | { | 44 | { |
45 | int ret; | 45 | int ret; |
46 | char byte; | 46 | char byte; |
@@ -86,7 +86,7 @@ int eeprom_24cxx_read_byte(unsigned int address, char *c) | |||
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | 88 | ||
89 | int eeprom_24cxx_write_byte(unsigned int address, char c) | 89 | static int eeprom_24cxx_write_byte(unsigned int address, char c) |
90 | { | 90 | { |
91 | int ret; | 91 | int ret; |
92 | int count = 0; | 92 | int count = 0; |
diff --git a/firmware/export/eeprom_24cxx.h b/firmware/export/eeprom_24cxx.h index 9a3d49b486..9a2efb915d 100644 --- a/firmware/export/eeprom_24cxx.h +++ b/firmware/export/eeprom_24cxx.h | |||
@@ -31,7 +31,6 @@ | |||
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | void eeprom_24cxx_init(void); | 33 | void eeprom_24cxx_init(void); |
34 | int eeprom_24cxx_read_byte(unsigned int address, char *c); | ||
35 | int eeprom_24cxx_read(unsigned char address, void *dest, int length); | 34 | int eeprom_24cxx_read(unsigned char address, void *dest, int length); |
36 | int eeprom_24cxx_write(unsigned char address, const void *src, int length); | 35 | int eeprom_24cxx_write(unsigned char address, const void *src, int length); |
37 | 36 | ||
diff --git a/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c b/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c index e976a6e054..bee1c6ebfb 100644 --- a/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c +++ b/firmware/target/arm/iriver/h10/fmradio_i2c-h10.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "cpu.h" | 23 | #include "cpu.h" |
24 | #include "logf.h" | 24 | #include "logf.h" |
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "fmradio_i2c.h" | ||
26 | 27 | ||
27 | /* cute little functions, atomic read-modify-write */ | 28 | /* cute little functions, atomic read-modify-write */ |
28 | 29 | ||
@@ -161,7 +162,7 @@ static unsigned char fmradio_i2c_inb(void) | |||
161 | return byte; | 162 | return byte; |
162 | } | 163 | } |
163 | 164 | ||
164 | int fmradio_i2c_write(int address, const unsigned char* buf, int count) | 165 | int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) |
165 | { | 166 | { |
166 | int i,x=0; | 167 | int i,x=0; |
167 | 168 | ||
@@ -188,7 +189,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) | |||
188 | return x; | 189 | return x; |
189 | } | 190 | } |
190 | 191 | ||
191 | int fmradio_i2c_read(int address, unsigned char* buf, int count) | 192 | int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) |
192 | { | 193 | { |
193 | int i,x=0; | 194 | int i,x=0; |
194 | 195 | ||
diff --git a/firmware/target/coldfire/iriver/ata-iriver.c b/firmware/target/coldfire/iriver/ata-iriver.c index b9beb809ac..d16943172c 100644 --- a/firmware/target/coldfire/iriver/ata-iriver.c +++ b/firmware/target/coldfire/iriver/ata-iriver.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "power.h" | 26 | #include "power.h" |
27 | #include "pcf50606.h" | 27 | #include "pcf50606.h" |
28 | #include "ata-target.h" | ||
28 | 29 | ||
29 | void ata_reset(void) | 30 | void ata_reset(void) |
30 | { | 31 | { |
diff --git a/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c b/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c index 16a58910ac..cd64097fc0 100644 --- a/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c +++ b/firmware/target/coldfire/iriver/fmradio_i2c-iriver.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "cpu.h" | 23 | #include "cpu.h" |
24 | #include "logf.h" | 24 | #include "logf.h" |
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "fmradio_i2c.h" | ||
26 | 27 | ||
27 | #if (CONFIG_TUNER & TEA5767) | 28 | #if (CONFIG_TUNER & TEA5767) |
28 | 29 | ||
@@ -193,7 +194,7 @@ static unsigned char fmradio_i2c_inb(void) | |||
193 | return byte; | 194 | return byte; |
194 | } | 195 | } |
195 | 196 | ||
196 | int fmradio_i2c_write(int address, const unsigned char* buf, int count) | 197 | int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) |
197 | { | 198 | { |
198 | int i,x=0; | 199 | int i,x=0; |
199 | 200 | ||
@@ -220,7 +221,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) | |||
220 | return x; | 221 | return x; |
221 | } | 222 | } |
222 | 223 | ||
223 | int fmradio_i2c_read(int address, unsigned char* buf, int count) | 224 | int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) |
224 | { | 225 | { |
225 | int i,x=0; | 226 | int i,x=0; |
226 | 227 | ||
diff --git a/firmware/target/sh/archos/ondio/fmradio_i2c-ondio.c b/firmware/target/sh/archos/ondio/fmradio_i2c-ondio.c index a101fb1fa9..35585259d2 100644 --- a/firmware/target/sh/archos/ondio/fmradio_i2c-ondio.c +++ b/firmware/target/sh/archos/ondio/fmradio_i2c-ondio.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "cpu.h" | 23 | #include "cpu.h" |
24 | #include "logf.h" | 24 | #include "logf.h" |
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "fmradio_i2c.h" | ||
26 | 27 | ||
27 | #if (CONFIG_TUNER & TEA5767) | 28 | #if (CONFIG_TUNER & TEA5767) |
28 | 29 | ||
@@ -150,7 +151,7 @@ static unsigned char fmradio_i2c_inb(void) | |||
150 | return byte; | 151 | return byte; |
151 | } | 152 | } |
152 | 153 | ||
153 | int fmradio_i2c_write(int address, const unsigned char* buf, int count) | 154 | int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) |
154 | { | 155 | { |
155 | int i,x=0; | 156 | int i,x=0; |
156 | 157 | ||
@@ -177,7 +178,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) | |||
177 | return x; | 178 | return x; |
178 | } | 179 | } |
179 | 180 | ||
180 | int fmradio_i2c_read(int address, unsigned char* buf, int count) | 181 | int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) |
181 | { | 182 | { |
182 | int i,x=0; | 183 | int i,x=0; |
183 | 184 | ||