summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-07-18 23:28:54 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-07-18 23:28:54 +0000
commit8d0126f355f6b95683a0e314868b4f1331b4578b (patch)
tree36cfce35792ebc2c6771d49d14717548ae102474
parent929d5e9399eabead217e69dc7ca009ad4f0f4e6d (diff)
downloadrockbox-8d0126f355f6b95683a0e314868b4f1331b4578b.tar.gz
rockbox-8d0126f355f6b95683a0e314868b4f1331b4578b.zip
Fix missing #includes and make local functions static for gigabeat
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18091 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/adc-imx31.c1
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/power-imx31.c1
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/serial-imx31.h1
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-imx31.c1
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/usb-target.h2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c14
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c1
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h2
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c1
14 files changed, 21 insertions, 9 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c b/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c
index 7e46d9d69d..85ef15b9b4 100644
--- a/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c
@@ -21,6 +21,7 @@
21#include "config.h" 21#include "config.h"
22#include "system.h" 22#include "system.h"
23#include "mc13783.h" 23#include "mc13783.h"
24#include "adc.h"
24#include "adc-target.h" 25#include "adc-target.h"
25#include "kernel.h" 26#include "kernel.h"
26 27
diff --git a/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c b/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c
index dbb3d6ce74..d1c917a209 100644
--- a/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c
@@ -19,6 +19,8 @@
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22#include "i2s.h"
23
22void i2s_reset(void) 24void i2s_reset(void)
23{ 25{
24} 26}
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
index 129cc333d3..9d9cc6bcb6 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
@@ -21,6 +21,7 @@
21#include "config.h" 21#include "config.h"
22#include "system.h" 22#include "system.h"
23#include "power.h" 23#include "power.h"
24#include "power-imx31.h"
24#include "backlight.h" 25#include "backlight.h"
25#include "backlight-target.h" 26#include "backlight-target.h"
26#include "avic-imx31.h" 27#include "avic-imx31.h"
diff --git a/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h b/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h
index 923d3a0a0d..1ee3b4e81c 100644
--- a/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h
+++ b/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h
@@ -25,6 +25,7 @@
25#include <stdio.h> 25#include <stdio.h>
26 26
27int tx_rdy(void); 27int tx_rdy(void);
28int rx_rdy(void);
28void tx_writec(const char c); 29void tx_writec(const char c);
29void dprintf(const char * str, ... ); 30void dprintf(const char * str, ... );
30 31
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
index 437bbd1639..cdc41cd43b 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-imx31.c
@@ -26,6 +26,7 @@
26#include "usb.h" 26#include "usb.h"
27#include "usb_core.h" 27#include "usb_core.h"
28#include "usb_drv.h" 28#include "usb_drv.h"
29#include "usb-target.h"
29#include "clkctl-imx31.h" 30#include "clkctl-imx31.h"
30#include "mc13783.h" 31#include "mc13783.h"
31 32
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-target.h b/firmware/target/arm/imx31/gigabeat-s/usb-target.h
index a84ec52fe2..1f96a9a7eb 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-target.h
@@ -26,7 +26,7 @@
26#endif 26#endif
27 27
28void usb_connect_event(void); 28void usb_connect_event(void);
29bool usb_init_device(void); 29void usb_init_device(void);
30int usb_detect(void); 30int usb_detect(void);
31/* Read the immediate state of the cable from the PMIC */ 31/* Read the immediate state of the cable from the PMIC */
32bool usb_plugged(void); 32bool usb_plugged(void);
diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
index d4e220d77f..7a877e1415 100644
--- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
@@ -24,6 +24,7 @@
24#include "system.h" 24#include "system.h"
25#include "kernel.h" 25#include "kernel.h"
26#include "sound.h" 26#include "sound.h"
27#include "wmcodec.h"
27#include "i2c-imx31.h" 28#include "i2c-imx31.h"
28 29
29/* NOTE: Some port-specific bits will have to be moved away (node and GPIO 30/* NOTE: Some port-specific bits will have to be moved away (node and GPIO
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
index 806ebc0190..d821de4a30 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c
@@ -20,6 +20,7 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21#include "cpu.h" 21#include "cpu.h"
22#include "system.h" 22#include "system.h"
23#include "adc.h"
23#include "adc-target.h" 24#include "adc-target.h"
24#include "kernel.h" 25#include "kernel.h"
25 26
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
index 98363f04d4..2f7d57fa57 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
@@ -26,6 +26,7 @@
26#include "power.h" 26#include "power.h"
27#include "panic.h" 27#include "panic.h"
28#include "pcf50606.h" 28#include "pcf50606.h"
29#include "ata.h"
29#include "ata-target.h" 30#include "ata-target.h"
30#include "backlight-target.h" 31#include "backlight-target.h"
31 32
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 69bf922571..9fb2a90c42 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -47,23 +47,23 @@ bool lcd_enabled(void)
47 return lcd_on; 47 return lcd_on;
48} 48}
49 49
50unsigned int LCDBANK(unsigned int address) 50static unsigned int LCDBANK(unsigned int address)
51{ 51{
52 return ((address >> 22) & 0xff); 52 return ((address >> 22) & 0xff);
53} 53}
54 54
55unsigned int LCDBASEU(unsigned int address) 55static unsigned int LCDBASEU(unsigned int address)
56{ 56{
57 return (address & ((1 << 22)-1)) >> 1; 57 return (address & ((1 << 22)-1)) >> 1;
58} 58}
59 59
60unsigned int LCDBASEL(unsigned int address) 60static unsigned int LCDBASEL(unsigned int address)
61{ 61{
62 address += 320*240*2; 62 address += 320*240*2;
63 return (address & ((1 << 22)-1)) >> 1; 63 return (address & ((1 << 22)-1)) >> 1;
64} 64}
65 65
66inline void delay_cycles(volatile int delay) 66static inline void delay_cycles(volatile int delay)
67{ 67{
68 while(delay>0) delay--; 68 while(delay>0) delay--;
69} 69}
@@ -138,7 +138,7 @@ static void LCD_SPI_send(const unsigned char *array, int count)
138 } 138 }
139} 139}
140 140
141void LCD_SPI_setreg(unsigned char reg, unsigned char value) 141static void LCD_SPI_setreg(unsigned char reg, unsigned char value)
142{ 142{
143 unsigned char regval[] = 143 unsigned char regval[] =
144 { 144 {
@@ -160,7 +160,7 @@ static void LCD_SPI_SS(bool select)
160 GPBDAT&=~0x100; 160 GPBDAT&=~0x100;
161} 161}
162 162
163void LCD_SPI_start(void) 163static void LCD_SPI_start(void)
164{ 164{
165 s3c_regset(&CLKCON, 0x40000); /* enable SPI clock */ 165 s3c_regset(&CLKCON, 0x40000); /* enable SPI clock */
166 LCD_SPI_SS(false); 166 LCD_SPI_SS(false);
@@ -171,7 +171,7 @@ void LCD_SPI_start(void)
171 LCD_SPI_SS(true); 171 LCD_SPI_SS(true);
172} 172}
173 173
174void LCD_SPI_stop(void) 174static void LCD_SPI_stop(void)
175{ 175{
176 LCD_SPI_SS(false); 176 LCD_SPI_SS(false);
177 177
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
index 59d5e56fc2..07e679b9f5 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c
@@ -26,6 +26,7 @@
26#include "logf.h" 26#include "logf.h"
27#include "debug.h" 27#include "debug.h"
28#include "string.h" 28#include "string.h"
29#include "sc606-meg-fx.h"
29 30
30#define SLAVE_ADDRESS 0xCC 31#define SLAVE_ADDRESS 0xCC
31 32
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
index fd75529c92..2cd545272d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c
@@ -24,6 +24,7 @@
24#include "kernel.h" 24#include "kernel.h"
25#include "ata.h" 25#include "ata.h"
26#include "usb.h" 26#include "usb.h"
27#include "usb-target.h"
27 28
28#define USB_RST_ASSERT GPBDAT &= ~(1 << 4) 29#define USB_RST_ASSERT GPBDAT &= ~(1 << 4)
29#define USB_RST_DEASSERT GPBDAT |= (1 << 4) 30#define USB_RST_DEASSERT GPBDAT |= (1 << 4)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
index abac5cf8ce..637d63b955 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h
@@ -21,7 +21,7 @@
21#ifndef USB_TARGET_H 21#ifndef USB_TARGET_H
22#define USB_TARGET_H 22#define USB_TARGET_H
23 23
24bool usb_init_device(void); 24void usb_init_device(void);
25void usb_enable(bool on); 25void usb_enable(bool on);
26 26
27#endif 27#endif
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
index ea65e17261..957d58b344 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c
@@ -29,6 +29,7 @@
29#include "kernel.h" 29#include "kernel.h"
30#include "sound.h" 30#include "sound.h"
31#include "i2c-meg-fx.h" 31#include "i2c-meg-fx.h"
32#include "wmcodec.h"
32 33
33void audiohw_init(void) 34void audiohw_init(void)
34{ 35{