diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-05-16 18:40:28 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-05-16 18:40:28 +0000 |
commit | 95d76f2da2b1535d552f60ab36a297c615960acc (patch) | |
tree | 79741712069d027ff36633fd830fdf543ceeda4c | |
parent | 3c102ffd4d945ff332993546a920245bb2ce7333 (diff) | |
download | rockbox-95d76f2da2b1535d552f60ab36a297c615960acc.tar.gz rockbox-95d76f2da2b1535d552f60ab36a297c615960acc.zip |
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
11 files changed, 33 insertions, 20 deletions
diff --git a/firmware/target/arm/imx31/debug-target.h b/firmware/target/arm/imx31/debug-target.h index 5928e0c64b..eaa986f1c2 100644 --- a/firmware/target/arm/imx31/debug-target.h +++ b/firmware/target/arm/imx31/debug-target.h | |||
@@ -16,9 +16,11 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef DEBUG_TARGET_H | ||
20 | #define DEBUG_TARGET_H | ||
19 | 21 | ||
20 | #define DEBUG_CANCEL BUTTON_BACK | 22 | #define DEBUG_CANCEL BUTTON_BACK |
21 | bool __dbg_hw_info(void); | 23 | bool __dbg_hw_info(void); |
22 | bool __dbg_ports(void); | 24 | bool __dbg_ports(void); |
23 | 25 | ||
24 | 26 | #endif /* DEBUG_TARGET_H */ | |
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, | |||
205 | unsigned long ni_priority); | 205 | unsigned long ni_priority); |
206 | void avic_disable_int(enum IMX31_INT_LIST ints); | 206 | void avic_disable_int(enum IMX31_INT_LIST ints); |
207 | void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype); | 207 | void avic_set_int_type(enum IMX31_INT_LIST ints, enum INT_TYPE intstype); |
208 | #endif | 208 | |
209 | #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); | |||
30 | void _backlight_off(void); | 30 | void _backlight_off(void); |
31 | void _backlight_set_brightness(int brightness); | 31 | void _backlight_set_brightness(int brightness); |
32 | 32 | ||
33 | #endif | 33 | #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 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef _GPIO_IMX31_H_ | 19 | #ifndef GPIO_IMX31_H |
20 | #define _GPIO_IMX31_H_ | 20 | #define GPIO_IMX31_H |
21 | 21 | ||
22 | #include "gpio-target.h" | 22 | #include "gpio-target.h" |
23 | 23 | ||
@@ -85,4 +85,4 @@ void gpio_init(void); | |||
85 | bool gpio_enable_event(enum gpio_module_number gpio, unsigned id); | 85 | bool gpio_enable_event(enum gpio_module_number gpio, unsigned id); |
86 | void gpio_disable_event(enum gpio_module_number gpio, unsigned id); | 86 | void gpio_disable_event(enum gpio_module_number gpio, unsigned id); |
87 | 87 | ||
88 | #endif /* _GPIO_IMX31_H_ */ | 88 | #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 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef _I2C_IMX31_H_ | 19 | #ifndef I2C_IMX31_H |
20 | #define _I2C_IMX31_H_ | 20 | #define I2C_IMX31_H |
21 | 21 | ||
22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
23 | 23 | ||
@@ -73,4 +73,4 @@ int i2c_write(struct i2c_node *node, const unsigned char *data, int count); | |||
73 | void i2c_lock_node(struct i2c_node *node); | 73 | void i2c_lock_node(struct i2c_node *node); |
74 | void i2c_unlock_node(struct i2c_node *node); | 74 | void i2c_unlock_node(struct i2c_node *node); |
75 | 75 | ||
76 | #endif /* _I2C_IMX31_H_ */ | 76 | #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 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id $ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2007 by Greg White | 10 | * Copyright (C) 2007 by Greg White |
11 | * | 11 | * |
@@ -16,6 +16,11 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef LCD_TARGET_H | ||
20 | #define LCD_TARGET_H | ||
19 | 21 | ||
20 | //extern void lcd_enable(bool state); | 22 | #if 0 |
21 | void printscreen(unsigned int colour); | 23 | void lcd_enable(bool state); |
24 | #endif | ||
25 | |||
26 | #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 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef MMU_IMX31_H | ||
20 | #define MMU_IMX31_H | ||
19 | 21 | ||
20 | void memory_init(void); | 22 | void memory_init(void); |
21 | void set_page_tables(void); | 23 | void set_page_tables(void); |
24 | |||
25 | #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 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id:$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 by Nils Wallménius | 10 | * Copyright (C) 2008 by Nils Wallménius |
11 | * | 11 | * |
@@ -16,6 +16,9 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef POWER_IMX31_H | ||
20 | #define POWER_IMX31_H | ||
19 | 21 | ||
20 | void set_charger_inserted(bool inserted); | 22 | void set_charger_inserted(bool inserted); |
21 | 23 | ||
24 | #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 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | |||
20 | #ifndef SERIAL_IMX31_H | 19 | #ifndef SERIAL_IMX31_H |
21 | #define SERIAL_IMX31_H | 20 | #define SERIAL_IMX31_H |
22 | 21 | ||
@@ -27,5 +26,4 @@ int tx_rdy(void); | |||
27 | void tx_writec(const char c); | 26 | void tx_writec(const char c); |
28 | void dprintf(const char * str, ... ); | 27 | void dprintf(const char * str, ... ); |
29 | 28 | ||
30 | #endif | 29 | #endif /* SERIAL_IMX31_H */ |
31 | |||
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 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef _SPI_IMX31_H_ | 19 | #ifndef SPI_IMX31_H |
20 | #define _SPI_IMX31_H_ | 20 | #define SPI_IMX31_H |
21 | 21 | ||
22 | #define USE_CSPI1_MODULE (1 << 0) | 22 | #define USE_CSPI1_MODULE (1 << 0) |
23 | #define USE_CSPI2_MODULE (1 << 1) | 23 | #define USE_CSPI2_MODULE (1 << 1) |
@@ -84,4 +84,4 @@ void spi_unlock(struct spi_node *node); | |||
84 | /* Send and/or receive data on the specified node */ | 84 | /* Send and/or receive data on the specified node */ |
85 | int spi_transfer(struct spi_node *node, struct spi_transfer *trans); | 85 | int spi_transfer(struct spi_node *node, struct spi_transfer *trans); |
86 | 86 | ||
87 | #endif /* _SPI_IMX31_H_ */ | 87 | #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); | |||
30 | bool usb_plugged(void); | 30 | bool usb_plugged(void); |
31 | void usb_enable(bool on); | 31 | void usb_enable(bool on); |
32 | 32 | ||
33 | #endif | 33 | #endif /* USB_TARGET */ |