nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tabs in .c and .h files in firmware/ 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29832 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2011-05-08 11:37:18 +00:00
parent 897fd92827
commit 9c33dca647
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/include/strcasestr.h
View File

@ -22,5 +22,5 @@
#ifndef __STRLCASESTR_H__
#define __STRLCASESTR_H__
char *strcasestr(const char *, const char *);
char *strcasestr(const char *, const char *);
#endif

6
firmware/target/coldfire/mpio/hd200/button-hd200.c
View File

@ -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)
{

10
firmware/target/coldfire/mpio/hd200/lcd-hd200.c
View File

@ -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 */

8
firmware/target/coldfire/mpio/system-mpio.c
View File

@ -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 */

2
firmware/target/hosted/android/debug-android.c
View File

@ -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);
}

8
firmware/usbstack/usb_core.c
View File

@ -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