summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-05-03 08:35:14 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-05-03 08:35:14 +0000
commite15f8a21a971920558a6f463586b16a0ee49ad79 (patch)
tree91d6771d0979c43e5390dc1de0ba79cd0638ba25 /firmware
parent9c1ab1f0572da9d68f45fc8cb6c361cee0b33376 (diff)
downloadrockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.zip
rockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.tar.gz
rockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.tar.bz2
rockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.tar.xz
Made source files #include the header file that they implement to make sure they are in sync. Made some local functions static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/bidi.c7
-rw-r--r--firmware/common/crc32-mi4.c2
-rw-r--r--firmware/common/crc32.c2
-rw-r--r--firmware/common/structec.c2
-rw-r--r--firmware/debug.c1
-rw-r--r--firmware/drivers/audio/as3514.c1
-rw-r--r--firmware/export/bidi.h5
-rw-r--r--firmware/mp3data.c4
-rw-r--r--firmware/replaygain.c1
-rw-r--r--firmware/target/arm/sandisk/ata-c200_e200.c2
-rw-r--r--firmware/target/arm/sandisk/power-c200_e200.c1
-rw-r--r--firmware/thread.c2
12 files changed, 20 insertions, 10 deletions
diff --git a/firmware/bidi.c b/firmware/bidi.c
index 539c64a..eb3af22 100644
--- a/firmware/bidi.c
+++ b/firmware/bidi.c
@@ -27,6 +27,7 @@
#include "rbunicode.h"
#include "arabjoin.h"
#include "scroll_engine.h"
+#include "bidi.h"
/* #define _HEB_BUFFER_LENGTH (MAX_PATH + LCD_WIDTH/2 + 3 + 2 + 2) * 2 */
#define _HEB_BLOCK_TYPE_ENG 1
@@ -40,7 +41,7 @@
#define _isnewline(c) ((c=='\n' || c=='\r') ? 1 : 0)
#define XOR(a,b) ((a||b) && !(a&&b))
-const arab_t * arab_lookup(unsigned short uchar)
+static const arab_t * arab_lookup(unsigned short uchar)
{
if (uchar >= 0x621 && uchar <= 0x63a)
return &(jointable[uchar - 0x621]);
@@ -53,8 +54,8 @@ const arab_t * arab_lookup(unsigned short uchar)
return 0;
}
-void arabjoin(unsigned short * stringprt, int length){
-
+static void arabjoin(unsigned short * stringprt, int length)
+{
bool connected = false;
unsigned short * writeprt = stringprt;
diff --git a/firmware/common/crc32-mi4.c b/firmware/common/crc32-mi4.c
index 8956364..ed33f60 100644
--- a/firmware/common/crc32-mi4.c
+++ b/firmware/common/crc32-mi4.c
@@ -37,7 +37,7 @@
/* based on implementation by Finn Yannick Jacobs */
-
+#include "crc32-mi4.h"
/* crc_tab[] -- this crcTable is being build by chksum_crc32GenTab().
* so make sure, you call it before using the other
diff --git a/firmware/common/crc32.c b/firmware/common/crc32.c
index 21fefac..f02243d 100644
--- a/firmware/common/crc32.c
+++ b/firmware/common/crc32.c
@@ -19,6 +19,8 @@
/* Code copied from firmware_flash plugin. */
+#include "crc32.h"
+
/* Tool function to calculate a CRC32 across some buffer */
/* third argument is either 0xFFFFFFFF to start or value from last piece */
unsigned crc_32(const void *src, unsigned len, unsigned crc32)
diff --git a/firmware/common/structec.c b/firmware/common/structec.c
index 1f4205c..9377420 100644
--- a/firmware/common/structec.c
+++ b/firmware/common/structec.c
@@ -109,7 +109,7 @@ void structec_convert(void *structure, const char *ecinst,
* @param ecinst endianess correction string.
* @return length of the struct in bytes.
*/
-size_t structec_size(const char *ecinst)
+static size_t structec_size(const char *ecinst)
{
size_t size = 0;
diff --git a/firmware/debug.c b/firmware/debug.c
index 6b638c1..f6d93a3 100644
--- a/firmware/debug.c
+++ b/firmware/debug.c
@@ -36,6 +36,7 @@ static char debugbuf[400];
#ifndef SIMULATOR /* allow non archos platforms to display output */
#include "kernel.h"
#include "system.h"
+#include "debug.h"
#ifdef DEBUG
#if CONFIG_CPU == SH7034 /* these are still very SH-oriented */
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index f378217..940cc36 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -23,6 +23,7 @@
#include "debug.h"
#include "system.h"
#include "audio.h"
+#include "sound.h"
#include "audiohw.h"
#include "i2s.h"
diff --git a/firmware/export/bidi.h b/firmware/export/bidi.h
index 36ff46c..516dcfc 100644
--- a/firmware/export/bidi.h
+++ b/firmware/export/bidi.h
@@ -17,5 +17,8 @@
*
****************************************************************************/
#ifndef BIDI_H
+#define BIDI_H
+
extern unsigned short *bidi_l2v(const unsigned char *str, int orientation);
-#endif
+
+#endif /* BIDI_H */
diff --git a/firmware/mp3data.c b/firmware/mp3data.c
index bfdb098..79e3340 100644
--- a/firmware/mp3data.c
+++ b/firmware/mp3data.c
@@ -307,8 +307,8 @@ static void buf_init(void)
fnf_read_index = 0;
}
-unsigned long buf_find_next_frame(int fd, long *offset, long max_offset,
- unsigned long last_header)
+static unsigned long buf_find_next_frame(int fd, long *offset, long max_offset,
+ unsigned long last_header)
{
return __find_next_frame(fd, offset, max_offset, last_header, buf_getbyte);
}
diff --git a/firmware/replaygain.c b/firmware/replaygain.c
index 05395d1..8871b1f 100644
--- a/firmware/replaygain.c
+++ b/firmware/replaygain.c
@@ -27,6 +27,7 @@
#include <system.h>
#include "id3.h"
#include "debug.h"
+#include "replaygain.h"
/* The fixed point math routines (with the exception of fp_atof) are based
* on oMathFP by Dan Carter (http://orbisstudios.com).
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c
index e4a5388..08183c5 100644
--- a/firmware/target/arm/sandisk/ata-c200_e200.c
+++ b/firmware/target/arm/sandisk/ata-c200_e200.c
@@ -787,7 +787,7 @@ static void sd_select_device(int card_no)
/* API Functions */
-void ata_led(bool onoff)
+static void ata_led(bool onoff)
{
led(onoff);
}
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index a7ec6cd..8c8214a 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -23,6 +23,7 @@
#include "i2c-pp.h"
#include "tuner.h"
#include "as3514.h"
+#include "power.h"
void power_init(void)
{
diff --git a/firmware/thread.c b/firmware/thread.c
index 9705293..0f42731 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -1657,7 +1657,7 @@ struct thread_entry *
* catch something.
*---------------------------------------------------------------------------
*/
-void check_for_obj_waiters(const char *function, struct thread_entry *thread)
+static void check_for_obj_waiters(const char *function, struct thread_entry *thread)
{
/* Only one bit in the mask should be set with a frequency on 1 which
* represents the thread's own base priority */