summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/iriver
diff options
context:
space:
mode:
authorHristo Kovachev <bger@rockbox.org>2006-08-11 09:51:04 +0000
committerHristo Kovachev <bger@rockbox.org>2006-08-11 09:51:04 +0000
commit1204136632777e84eac790811fb074552ef2e6b7 (patch)
tree0261c054c38a06a2e0f3b9cc869a774650eb3ce9 /firmware/target/arm/iriver
parent79f60d4054fdf0e97dca9817c778c74847d18ba0 (diff)
downloadrockbox-1204136632777e84eac790811fb074552ef2e6b7.tar.gz
rockbox-1204136632777e84eac790811fb074552ef2e6b7.zip
Some indent/c99 style cleanup by Barry Wardell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10524 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/iriver')
-rw-r--r--firmware/target/arm/iriver/h10/backlight-h10.c2
-rw-r--r--firmware/target/arm/iriver/h10/button-h10.c44
-rw-r--r--firmware/target/arm/iriver/h10/power-h10.c6
-rw-r--r--firmware/target/arm/iriver/h10/usb-h10.c6
4 files changed, 29 insertions, 29 deletions
diff --git a/firmware/target/arm/iriver/h10/backlight-h10.c b/firmware/target/arm/iriver/h10/backlight-h10.c
index b4221dd60a..51218e21be 100644
--- a/firmware/target/arm/iriver/h10/backlight-h10.c
+++ b/firmware/target/arm/iriver/h10/backlight-h10.c
@@ -28,7 +28,7 @@
void __backlight_on(void)
{
#if 0
- int level = set_irq_level(HIGHEST_IRQ_LEVEL);
+ int level = set_irq_level(HIGHEST_IRQ_LEVEL);
pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */
set_irq_level(level);
#endif
diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c
index 7979a52976..2a5983e97a 100644
--- a/firmware/target/arm/iriver/h10/button-h10.c
+++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -33,7 +33,7 @@
void button_init_device(void)
{
- /* No hardware initialisation required as it is done by the bootloader */
+ /* No hardware initialisation required as it is done by the bootloader */
}
bool button_hold(void)
@@ -47,8 +47,8 @@ bool button_hold(void)
int button_read_device(void)
{
int btn = BUTTON_NONE;
- unsigned char state;
- static bool hold_button = false;
+ unsigned char state;
+ static bool hold_button = false;
#if 0
/* light handling */
@@ -59,25 +59,25 @@ int button_read_device(void)
#endif
hold_button = button_hold();
- if (!hold_button)
+ if (!hold_button)
{
- /* Read normal buttons */
- state = GPIOA_INPUT_VAL & 0xf8;
- if ((state & 0x8) == 0) btn |= BUTTON_FF;
- if ((state & 0x10) == 0) btn |= BUTTON_PLAY;
- if ((state & 0x20) == 0) btn |= BUTTON_REW;
- if ((state & 0x40) == 0) btn |= BUTTON_RIGHT;
- if ((state & 0x80) == 0) btn |= BUTTON_LEFT;
-
- /* Read power button */
- if ((GPIOB_INPUT_VAL & 0x1) == 0) btn |= BUTTON_POWER;
-
- /* Read scroller */
- if ( ((GPIOC_INPUT_VAL & 0x4)==1) && ((GPIOD_INPUT_VAL & 0x10)==1) )
- {
- /* Scroller is pressed */
- }
- }
-
+ /* Read normal buttons */
+ state = GPIOA_INPUT_VAL & 0xf8;
+ if ((state & 0x8) == 0) btn |= BUTTON_FF;
+ if ((state & 0x10) == 0) btn |= BUTTON_PLAY;
+ if ((state & 0x20) == 0) btn |= BUTTON_REW;
+ if ((state & 0x40) == 0) btn |= BUTTON_RIGHT;
+ if ((state & 0x80) == 0) btn |= BUTTON_LEFT;
+
+ /* Read power button */
+ if ((GPIOB_INPUT_VAL & 0x1) == 0) btn |= BUTTON_POWER;
+
+ /* Read scroller */
+ if ( ((GPIOC_INPUT_VAL & 0x4)==1) && ((GPIOD_INPUT_VAL & 0x10)==1) )
+ {
+ /* Scroller is pressed */
+ }
+ }
+
return btn;
}
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
index 58dd25174f..71eae2105e 100644
--- a/firmware/target/arm/iriver/h10/power-h10.c
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -71,7 +71,7 @@ void power_init(void)
bool charger_inserted(void)
{
- return (GPIOL_INPUT_VAL & 0x04)?true:false; /* FIXME: This only checks if USB is connected */
+ return (GPIOL_INPUT_VAL & 0x04)?true:false; /* FIXME: This only checks if USB is connected */
}
void ide_power_enable(bool on)
@@ -90,10 +90,10 @@ bool ide_powered(void)
void power_off(void)
{
/* set_irq_level(HIGHEST_IRQ_LEVEL);*/
- #ifndef BOOTLOADER
+ #ifndef BOOTLOADER
/* We don't turn off the ipod, we put it in a deep sleep */
/* pcf50605_standby_mode(); */
while(1)
yield();
- #endif
+ #endif
}
diff --git a/firmware/target/arm/iriver/h10/usb-h10.c b/firmware/target/arm/iriver/h10/usb-h10.c
index dccdea81aa..c6d275a9be 100644
--- a/firmware/target/arm/iriver/h10/usb-h10.c
+++ b/firmware/target/arm/iriver/h10/usb-h10.c
@@ -92,10 +92,10 @@ bool usb_detect(void)
void usb_enable(bool on)
{
- (void)on;
+ (void)on;
#if 0
- /* For the ipod, we can only do one thing with USB mode - reboot
- into Apple's flash-based disk-mode. This does not return. */
+ /* For the ipod, we can only do one thing with USB mode - reboot
+ into Apple's flash-based disk-mode. This does not return. */
if (on)
{
/* The following code is copied from ipodlinux */