summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2011-05-08 11:37:18 +0000
committerBertrik Sikken <bertrik@sikken.nl>2011-05-08 11:37:18 +0000
commit9c33dca6479d41d1745e6007bca97fe11c9b8db1 (patch)
tree54923d3c5ec138041e84acfb46e6469e23763e80 /firmware
parent897fd9282781d2f90dc4193cca908f1b17e00cb0 (diff)
downloadrockbox-9c33dca6479d41d1745e6007bca97fe11c9b8db1.tar.gz
rockbox-9c33dca6479d41d1745e6007bca97fe11c9b8db1.tar.bz2
rockbox-9c33dca6479d41d1745e6007bca97fe11c9b8db1.zip
Fix tabs in .c and .h files in firmware/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29832 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/include/strcasestr.h2
-rw-r--r--firmware/target/coldfire/mpio/hd200/button-hd200.c6
-rw-r--r--firmware/target/coldfire/mpio/hd200/lcd-hd200.c10
-rw-r--r--firmware/target/coldfire/mpio/system-mpio.c8
-rw-r--r--firmware/target/hosted/android/debug-android.c2
-rw-r--r--firmware/usbstack/usb_core.c8
6 files changed, 18 insertions, 18 deletions
diff --git a/firmware/include/strcasestr.h b/firmware/include/strcasestr.h
index a6d2f2c472..f61096906e 100644
--- a/firmware/include/strcasestr.h
+++ b/firmware/include/strcasestr.h
@@ -22,5 +22,5 @@
#ifndef __STRLCASESTR_H__
#define __STRLCASESTR_H__
-char *strcasestr(const char *, const char *);
+char *strcasestr(const char *, const char *);
#endif
diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c
index 93109ab209..27b0d50fb5 100644
--- a/firmware/target/coldfire/mpio/hd200/button-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c
@@ -93,7 +93,7 @@ int button_read_device(void)
if (data < 2300) /* valid button */
{
- if (data < 900) /* middle */
+ if (data < 900) /* middle */
{
if (data < 500)
{
@@ -123,7 +123,7 @@ int button_read_device(void)
else /* 1900 - 2300 */
btn = BUTTON_FUNC;
}
- }
+ }
}
}
@@ -134,7 +134,7 @@ int button_read_device(void)
if (data < 2050) /* valid button */
{
- if (data < 950) /* middle */
+ if (data < 950) /* middle */
{
if (data < 650)
{
diff --git a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
index ba12e072da..682ed6a311 100644
--- a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c
@@ -48,7 +48,7 @@
#define LCD_SET_PWM_FRC 0x90
#define LCD_SET_POWER_SAVE 0xa8
#define LCD_REVERSE 0xa6
-#define LCD_RESET 0xe2
+#define LCD_RESET 0xe2
/* cached settings */
static bool cached_invert = false;
@@ -130,12 +130,12 @@ void lcd_init_device(void)
and_l(~0x00000800, &GPIO_FUNCTION); /* CS3 line */
/* LCD Reset GPO34 */
- or_l(0x00000004, &GPIO1_ENABLE); /* set as output */
+ or_l(0x00000004, &GPIO1_ENABLE); /* set as output */
or_l(0x00000004, &GPIO1_FUNCTION); /* switch to secondary function - GPIO */
- and_l(~0x00000004, &GPIO1_OUT); /* RESET low */
- sleep(1); /* delay at least 1000 ns */
- or_l(0x00000004, &GPIO1_OUT); /* RESET high */
+ and_l(~0x00000004, &GPIO1_OUT); /* RESET low */
+ sleep(1); /* delay at least 1000 ns */
+ or_l(0x00000004, &GPIO1_OUT); /* RESET high */
sleep(1);
/* parameters setup taken from original firmware */
diff --git a/firmware/target/coldfire/mpio/system-mpio.c b/firmware/target/coldfire/mpio/system-mpio.c
index 0bd0e07386..ef291dbe0d 100644
--- a/firmware/target/coldfire/mpio/system-mpio.c
+++ b/firmware/target/coldfire/mpio/system-mpio.c
@@ -97,8 +97,8 @@ void cf_set_cpu_frequency(long frequency)
timers_adjust_prescale(CPUFREQ_NORMAL_MULT, true);
DCR = (0x8000 | NORMAL_REFRESH_TIMER); /* Refresh timer */
cpu_frequency = CPUFREQ_NORMAL;
- IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
- IDECONFIG2 = (1<<18)|(1<<16);
+ IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
+ IDECONFIG2 = (1<<18)|(1<<16);
and_l(~(0x07<<16), &ADCONFIG);
or_l((0x03)<<16, &ADCONFIG); /* adclk = busclk/8 */
@@ -115,8 +115,8 @@ void cf_set_cpu_frequency(long frequency)
CSCR3 = 0x00000180; /* LCD: 0 wait states */
DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */
cpu_frequency = CPUFREQ_DEFAULT;
- IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
- IDECONFIG2 = (1<<18)|(1<<16);
+ IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
+ IDECONFIG2 = (1<<18)|(1<<16);
and_l(~(0x07<<16), &ADCONFIG);
or_l((0x01)<<16, &ADCONFIG); /* adclk = busclk/2 */
diff --git a/firmware/target/hosted/android/debug-android.c b/firmware/target/hosted/android/debug-android.c
index a478168e4c..6d77ac411b 100644
--- a/firmware/target/hosted/android/debug-android.c
+++ b/firmware/target/hosted/android/debug-android.c
@@ -35,7 +35,7 @@ void debugf(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, fmt, ap);
+ __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, fmt, ap);
va_end(ap);
}
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index aa96fff17f..60a81b84a1 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -828,8 +828,8 @@ static void usb_core_control_request_handler(struct usb_ctrlrequest* req)
#ifdef HAVE_USB_CHARGING_ENABLE
timeout_cancel(&usb_no_host_timeout);
if(usb_no_host) {
- usb_no_host = false;
- usb_charging_maxcurrent_change(usb_charging_maxcurrent());
+ usb_no_host = false;
+ usb_charging_maxcurrent_change(usb_charging_maxcurrent());
}
#endif
if(usb_state == DEFAULT) {
@@ -918,9 +918,9 @@ int usb_charging_maxcurrent()
if (!initialized || usb_charging_mode == USB_CHARGING_DISABLE)
return 100;
if (usb_state == CONFIGURED)
- return usb_charging_current_requested;
+ return usb_charging_current_requested;
if (usb_charging_mode == USB_CHARGING_FORCE && usb_no_host)
- return 500;
+ return 500;
return 100;
}
#endif