From 8e2ff63a7e1f7c493d867c8b4982feacf6f781ca Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 31 Jan 2009 23:51:11 +0000 Subject: 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 --- apps/recorder/resize.c | 2 +- firmware/drivers/eeprom_24cxx.c | 4 ++-- firmware/export/eeprom_24cxx.h | 1 - firmware/target/arm/iriver/h10/fmradio_i2c-h10.c | 5 +++-- firmware/target/coldfire/iriver/ata-iriver.c | 1 + firmware/target/coldfire/iriver/fmradio_i2c-iriver.c | 5 +++-- 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, #endif /* HAVE_UPSCALER */ #ifndef PLUGIN -void output_row_native(uint32_t row, void * row_in, struct scaler_context *ctx) +static void output_row_native(uint32_t row, void * row_in, struct scaler_context *ctx) { int col; 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) memset(cached_bitfield, 0, sizeof cached_bitfield); } -int eeprom_24cxx_read_byte(unsigned int address, char *c) +static int eeprom_24cxx_read_byte(unsigned int address, char *c) { int ret; char byte; @@ -86,7 +86,7 @@ int eeprom_24cxx_read_byte(unsigned int address, char *c) return 0; } -int eeprom_24cxx_write_byte(unsigned int address, char c) +static int eeprom_24cxx_write_byte(unsigned int address, char c) { int ret; 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 @@ #endif void eeprom_24cxx_init(void); -int eeprom_24cxx_read_byte(unsigned int address, char *c); int eeprom_24cxx_read(unsigned char address, void *dest, int length); int eeprom_24cxx_write(unsigned char address, const void *src, int length); 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 @@ #include "cpu.h" #include "logf.h" #include "system.h" +#include "fmradio_i2c.h" /* cute little functions, atomic read-modify-write */ @@ -161,7 +162,7 @@ static unsigned char fmradio_i2c_inb(void) return byte; } -int fmradio_i2c_write(int address, const unsigned char* buf, int count) +int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) { int i,x=0; @@ -188,7 +189,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) return x; } -int fmradio_i2c_read(int address, unsigned char* buf, int count) +int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) { int i,x=0; 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 @@ #include "system.h" #include "power.h" #include "pcf50606.h" +#include "ata-target.h" void ata_reset(void) { 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 @@ #include "cpu.h" #include "logf.h" #include "system.h" +#include "fmradio_i2c.h" #if (CONFIG_TUNER & TEA5767) @@ -193,7 +194,7 @@ static unsigned char fmradio_i2c_inb(void) return byte; } -int fmradio_i2c_write(int address, const unsigned char* buf, int count) +int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) { int i,x=0; @@ -220,7 +221,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) return x; } -int fmradio_i2c_read(int address, unsigned char* buf, int count) +int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) { int i,x=0; 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 @@ #include "cpu.h" #include "logf.h" #include "system.h" +#include "fmradio_i2c.h" #if (CONFIG_TUNER & TEA5767) @@ -150,7 +151,7 @@ static unsigned char fmradio_i2c_inb(void) return byte; } -int fmradio_i2c_write(int address, const unsigned char* buf, int count) +int fmradio_i2c_write(unsigned char address, const unsigned char* buf, int count) { int i,x=0; @@ -177,7 +178,7 @@ int fmradio_i2c_write(int address, const unsigned char* buf, int count) return x; } -int fmradio_i2c_read(int address, unsigned char* buf, int count) +int fmradio_i2c_read(unsigned char address, unsigned char* buf, int count) { int i,x=0; -- cgit v1.2.3