From 8d0126f355f6b95683a0e314868b4f1331b4578b Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Fri, 18 Jul 2008 23:28:54 +0000 Subject: 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 --- firmware/target/arm/imx31/gigabeat-s/adc-imx31.c | 1 + firmware/target/arm/imx31/gigabeat-s/i2s-imx31.c | 2 ++ firmware/target/arm/imx31/gigabeat-s/power-imx31.c | 1 + firmware/target/arm/imx31/gigabeat-s/serial-imx31.h | 1 + firmware/target/arm/imx31/gigabeat-s/usb-imx31.c | 1 + firmware/target/arm/imx31/gigabeat-s/usb-target.h | 2 +- firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c | 1 + firmware/target/arm/s3c2440/gigabeat-fx/adc-meg-fx.c | 1 + firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c | 1 + firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c | 14 +++++++------- firmware/target/arm/s3c2440/gigabeat-fx/sc606-meg-fx.c | 1 + firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c | 1 + firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h | 2 +- firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c | 1 + 14 files changed, 21 insertions(+), 9 deletions(-) (limited to 'firmware') 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 @@ #include "config.h" #include "system.h" #include "mc13783.h" +#include "adc.h" #include "adc-target.h" #include "kernel.h" 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 @@ * ****************************************************************************/ +#include "i2s.h" + void i2s_reset(void) { } 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 @@ #include "config.h" #include "system.h" #include "power.h" +#include "power-imx31.h" #include "backlight.h" #include "backlight-target.h" #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 @@ #include int tx_rdy(void); +int rx_rdy(void); void tx_writec(const char c); void dprintf(const char * str, ... ); 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 @@ #include "usb.h" #include "usb_core.h" #include "usb_drv.h" +#include "usb-target.h" #include "clkctl-imx31.h" #include "mc13783.h" 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 @@ #endif void usb_connect_event(void); -bool usb_init_device(void); +void usb_init_device(void); int usb_detect(void); /* Read the immediate state of the cable from the PMIC */ bool 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 @@ #include "system.h" #include "kernel.h" #include "sound.h" +#include "wmcodec.h" #include "i2c-imx31.h" /* 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 @@ ****************************************************************************/ #include "cpu.h" #include "system.h" +#include "adc.h" #include "adc-target.h" #include "kernel.h" 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 @@ #include "power.h" #include "panic.h" #include "pcf50606.h" +#include "ata.h" #include "ata-target.h" #include "backlight-target.h" 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) return lcd_on; } -unsigned int LCDBANK(unsigned int address) +static unsigned int LCDBANK(unsigned int address) { return ((address >> 22) & 0xff); } -unsigned int LCDBASEU(unsigned int address) +static unsigned int LCDBASEU(unsigned int address) { return (address & ((1 << 22)-1)) >> 1; } -unsigned int LCDBASEL(unsigned int address) +static unsigned int LCDBASEL(unsigned int address) { address += 320*240*2; return (address & ((1 << 22)-1)) >> 1; } -inline void delay_cycles(volatile int delay) +static inline void delay_cycles(volatile int delay) { while(delay>0) delay--; } @@ -138,7 +138,7 @@ static void LCD_SPI_send(const unsigned char *array, int count) } } -void LCD_SPI_setreg(unsigned char reg, unsigned char value) +static void LCD_SPI_setreg(unsigned char reg, unsigned char value) { unsigned char regval[] = { @@ -160,7 +160,7 @@ static void LCD_SPI_SS(bool select) GPBDAT&=~0x100; } -void LCD_SPI_start(void) +static void LCD_SPI_start(void) { s3c_regset(&CLKCON, 0x40000); /* enable SPI clock */ LCD_SPI_SS(false); @@ -171,7 +171,7 @@ void LCD_SPI_start(void) LCD_SPI_SS(true); } -void LCD_SPI_stop(void) +static void LCD_SPI_stop(void) { LCD_SPI_SS(false); 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 @@ #include "logf.h" #include "debug.h" #include "string.h" +#include "sc606-meg-fx.h" #define SLAVE_ADDRESS 0xCC 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 @@ #include "kernel.h" #include "ata.h" #include "usb.h" +#include "usb-target.h" #define USB_RST_ASSERT GPBDAT &= ~(1 << 4) #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 @@ #ifndef USB_TARGET_H #define USB_TARGET_H -bool usb_init_device(void); +void usb_init_device(void); void usb_enable(bool on); #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 @@ #include "kernel.h" #include "sound.h" #include "i2c-meg-fx.h" +#include "wmcodec.h" void audiohw_init(void) { -- cgit v1.2.3