From 95d76f2da2b1535d552f60ab36a297c615960acc Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 16 May 2008 18:40:28 +0000 Subject: Cleanup some .h files in the imx31 target branch - #include guard style, headers, obsolete prototypes, etc. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17536 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/imx31/gigabeat-s/avic-imx31.h | 3 ++- firmware/target/arm/imx31/gigabeat-s/backlight-target.h | 2 +- firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h | 6 +++--- firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h | 6 +++--- firmware/target/arm/imx31/gigabeat-s/lcd-target.h | 11 ++++++++--- firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h | 4 ++++ firmware/target/arm/imx31/gigabeat-s/power-imx31.h | 5 ++++- firmware/target/arm/imx31/gigabeat-s/serial-imx31.h | 4 +--- firmware/target/arm/imx31/gigabeat-s/spi-imx31.h | 6 +++--- firmware/target/arm/imx31/gigabeat-s/usb-target.h | 2 +- 10 files changed, 30 insertions(+), 19 deletions(-) (limited to 'firmware/target/arm/imx31/gigabeat-s') diff --git a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h b/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h index a2e1b3496d..ce9f9691c9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/avic-imx31.h @@ -205,4 +205,5 @@ void avic_set_int_priority(enum IMX31_INT_LIST ints, unsigned long ni_priority); void avic_disable_int(enum IMX31_INT_LIST ints); void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype); -#endif + +#endif /* AVIC_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h index 145df0d930..7f218c89d9 100644 --- a/firmware/target/arm/imx31/gigabeat-s/backlight-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/backlight-target.h @@ -30,4 +30,4 @@ void _backlight_on(void); void _backlight_off(void); void _backlight_set_brightness(int brightness); -#endif +#endif /* BACKLIGHT_TARGET_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h b/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h index f6e07309e5..34d3e72f8e 100644 --- a/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/gpio-imx31.h @@ -16,8 +16,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#ifndef _GPIO_IMX31_H_ -#define _GPIO_IMX31_H_ +#ifndef GPIO_IMX31_H +#define GPIO_IMX31_H #include "gpio-target.h" @@ -85,4 +85,4 @@ void gpio_init(void); bool gpio_enable_event(enum gpio_module_number gpio, unsigned id); void gpio_disable_event(enum gpio_module_number gpio, unsigned id); -#endif /* _GPIO_IMX31_H_ */ +#endif /* GPIO_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h b/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h index d6de5c47e8..aec480c352 100644 --- a/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/i2c-imx31.h @@ -16,8 +16,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#ifndef _I2C_IMX31_H_ -#define _I2C_IMX31_H_ +#ifndef I2C_IMX31_H +#define I2C_IMX31_H #include @@ -73,4 +73,4 @@ int i2c_write(struct i2c_node *node, const unsigned char *data, int count); void i2c_lock_node(struct i2c_node *node); void i2c_unlock_node(struct i2c_node *node); -#endif /* _I2C_IMX31_H_ */ +#endif /* I2C_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-target.h b/firmware/target/arm/imx31/gigabeat-s/lcd-target.h index 48e304752c..af89439804 100644 --- a/firmware/target/arm/imx31/gigabeat-s/lcd-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/lcd-target.h @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id $ + * $Id$ * * Copyright (C) 2007 by Greg White * @@ -16,6 +16,11 @@ * KIND, either express or implied. * ****************************************************************************/ +#ifndef LCD_TARGET_H +#define LCD_TARGET_H -//extern void lcd_enable(bool state); -void printscreen(unsigned int colour); +#if 0 +void lcd_enable(bool state); +#endif + +#endif /* LCD_TARGET_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h b/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h index 3a33cc3cd4..55a03f9292 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/mmu-imx31.h @@ -16,6 +16,10 @@ * KIND, either express or implied. * ****************************************************************************/ +#ifndef MMU_IMX31_H +#define MMU_IMX31_H void memory_init(void); void set_page_tables(void); + +#endif /* MMU_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.h b/firmware/target/arm/imx31/gigabeat-s/power-imx31.h index f2f6ef8a73..bb0a7614d8 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/power-imx31.h @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id:$ + * $Id$ * * Copyright (C) 2008 by Nils Wallménius * @@ -16,6 +16,9 @@ * KIND, either express or implied. * ****************************************************************************/ +#ifndef POWER_IMX31_H +#define POWER_IMX31_H void set_charger_inserted(bool inserted); +#endif /* POWER_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 c4e7578921..e88c78ff9e 100644 --- a/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/serial-imx31.h @@ -16,7 +16,6 @@ * KIND, either express or implied. * ****************************************************************************/ - #ifndef SERIAL_IMX31_H #define SERIAL_IMX31_H @@ -27,5 +26,4 @@ int tx_rdy(void); void tx_writec(const char c); void dprintf(const char * str, ... ); -#endif - +#endif /* SERIAL_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h b/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h index 2e104595f6..b9818a7a1f 100644 --- a/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h +++ b/firmware/target/arm/imx31/gigabeat-s/spi-imx31.h @@ -16,8 +16,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#ifndef _SPI_IMX31_H_ -#define _SPI_IMX31_H_ +#ifndef SPI_IMX31_H +#define SPI_IMX31_H #define USE_CSPI1_MODULE (1 << 0) #define USE_CSPI2_MODULE (1 << 1) @@ -84,4 +84,4 @@ void spi_unlock(struct spi_node *node); /* Send and/or receive data on the specified node */ int spi_transfer(struct spi_node *node, struct spi_transfer *trans); -#endif /* _SPI_IMX31_H_ */ +#endif /* SPI_IMX31_H */ diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-target.h b/firmware/target/arm/imx31/gigabeat-s/usb-target.h index 7ecd9a7d49..c6e2850b9d 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/usb-target.h @@ -30,4 +30,4 @@ int usb_detect(void); bool usb_plugged(void); void usb_enable(bool on); -#endif +#endif /* USB_TARGET */ -- cgit v1.2.3