diff options
-rw-r--r-- | firmware/include/strcasestr.h | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd200/button-hd200.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd200/lcd-hd200.c | 10 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/system-mpio.c | 8 | ||||
-rw-r--r-- | firmware/target/hosted/android/debug-android.c | 2 | ||||
-rw-r--r-- | firmware/usbstack/usb_core.c | 8 |
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 @@ | |||
22 | 22 | ||
23 | #ifndef __STRLCASESTR_H__ | 23 | #ifndef __STRLCASESTR_H__ |
24 | #define __STRLCASESTR_H__ | 24 | #define __STRLCASESTR_H__ |
25 | char *strcasestr(const char *, const char *); | 25 | char *strcasestr(const char *, const char *); |
26 | #endif | 26 | #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) | |||
93 | 93 | ||
94 | if (data < 2300) /* valid button */ | 94 | if (data < 2300) /* valid button */ |
95 | { | 95 | { |
96 | if (data < 900) /* middle */ | 96 | if (data < 900) /* middle */ |
97 | { | 97 | { |
98 | if (data < 500) | 98 | if (data < 500) |
99 | { | 99 | { |
@@ -123,7 +123,7 @@ int button_read_device(void) | |||
123 | else /* 1900 - 2300 */ | 123 | else /* 1900 - 2300 */ |
124 | btn = BUTTON_FUNC; | 124 | btn = BUTTON_FUNC; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
@@ -134,7 +134,7 @@ int button_read_device(void) | |||
134 | 134 | ||
135 | if (data < 2050) /* valid button */ | 135 | if (data < 2050) /* valid button */ |
136 | { | 136 | { |
137 | if (data < 950) /* middle */ | 137 | if (data < 950) /* middle */ |
138 | { | 138 | { |
139 | if (data < 650) | 139 | if (data < 650) |
140 | { | 140 | { |
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 @@ | |||
48 | #define LCD_SET_PWM_FRC 0x90 | 48 | #define LCD_SET_PWM_FRC 0x90 |
49 | #define LCD_SET_POWER_SAVE 0xa8 | 49 | #define LCD_SET_POWER_SAVE 0xa8 |
50 | #define LCD_REVERSE 0xa6 | 50 | #define LCD_REVERSE 0xa6 |
51 | #define LCD_RESET 0xe2 | 51 | #define LCD_RESET 0xe2 |
52 | 52 | ||
53 | /* cached settings */ | 53 | /* cached settings */ |
54 | static bool cached_invert = false; | 54 | static bool cached_invert = false; |
@@ -130,12 +130,12 @@ void lcd_init_device(void) | |||
130 | and_l(~0x00000800, &GPIO_FUNCTION); /* CS3 line */ | 130 | and_l(~0x00000800, &GPIO_FUNCTION); /* CS3 line */ |
131 | 131 | ||
132 | /* LCD Reset GPO34 */ | 132 | /* LCD Reset GPO34 */ |
133 | or_l(0x00000004, &GPIO1_ENABLE); /* set as output */ | 133 | or_l(0x00000004, &GPIO1_ENABLE); /* set as output */ |
134 | or_l(0x00000004, &GPIO1_FUNCTION); /* switch to secondary function - GPIO */ | 134 | or_l(0x00000004, &GPIO1_FUNCTION); /* switch to secondary function - GPIO */ |
135 | 135 | ||
136 | and_l(~0x00000004, &GPIO1_OUT); /* RESET low */ | 136 | and_l(~0x00000004, &GPIO1_OUT); /* RESET low */ |
137 | sleep(1); /* delay at least 1000 ns */ | 137 | sleep(1); /* delay at least 1000 ns */ |
138 | or_l(0x00000004, &GPIO1_OUT); /* RESET high */ | 138 | or_l(0x00000004, &GPIO1_OUT); /* RESET high */ |
139 | sleep(1); | 139 | sleep(1); |
140 | 140 | ||
141 | /* parameters setup taken from original firmware */ | 141 | /* 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) | |||
97 | timers_adjust_prescale(CPUFREQ_NORMAL_MULT, true); | 97 | timers_adjust_prescale(CPUFREQ_NORMAL_MULT, true); |
98 | DCR = (0x8000 | NORMAL_REFRESH_TIMER); /* Refresh timer */ | 98 | DCR = (0x8000 | NORMAL_REFRESH_TIMER); /* Refresh timer */ |
99 | cpu_frequency = CPUFREQ_NORMAL; | 99 | cpu_frequency = CPUFREQ_NORMAL; |
100 | IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); | 100 | IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); |
101 | IDECONFIG2 = (1<<18)|(1<<16); | 101 | IDECONFIG2 = (1<<18)|(1<<16); |
102 | 102 | ||
103 | and_l(~(0x07<<16), &ADCONFIG); | 103 | and_l(~(0x07<<16), &ADCONFIG); |
104 | or_l((0x03)<<16, &ADCONFIG); /* adclk = busclk/8 */ | 104 | or_l((0x03)<<16, &ADCONFIG); /* adclk = busclk/8 */ |
@@ -115,8 +115,8 @@ void cf_set_cpu_frequency(long frequency) | |||
115 | CSCR3 = 0x00000180; /* LCD: 0 wait states */ | 115 | CSCR3 = 0x00000180; /* LCD: 0 wait states */ |
116 | DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ | 116 | DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ |
117 | cpu_frequency = CPUFREQ_DEFAULT; | 117 | cpu_frequency = CPUFREQ_DEFAULT; |
118 | IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); | 118 | IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); |
119 | IDECONFIG2 = (1<<18)|(1<<16); | 119 | IDECONFIG2 = (1<<18)|(1<<16); |
120 | 120 | ||
121 | and_l(~(0x07<<16), &ADCONFIG); | 121 | and_l(~(0x07<<16), &ADCONFIG); |
122 | or_l((0x01)<<16, &ADCONFIG); /* adclk = busclk/2 */ | 122 | 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, ...) | |||
35 | { | 35 | { |
36 | va_list ap; | 36 | va_list ap; |
37 | va_start(ap, fmt); | 37 | va_start(ap, fmt); |
38 | __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, fmt, ap); | 38 | __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, fmt, ap); |
39 | va_end(ap); | 39 | va_end(ap); |
40 | } | 40 | } |
41 | 41 | ||
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) | |||
828 | #ifdef HAVE_USB_CHARGING_ENABLE | 828 | #ifdef HAVE_USB_CHARGING_ENABLE |
829 | timeout_cancel(&usb_no_host_timeout); | 829 | timeout_cancel(&usb_no_host_timeout); |
830 | if(usb_no_host) { | 830 | if(usb_no_host) { |
831 | usb_no_host = false; | 831 | usb_no_host = false; |
832 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); | 832 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); |
833 | } | 833 | } |
834 | #endif | 834 | #endif |
835 | if(usb_state == DEFAULT) { | 835 | if(usb_state == DEFAULT) { |
@@ -918,9 +918,9 @@ int usb_charging_maxcurrent() | |||
918 | if (!initialized || usb_charging_mode == USB_CHARGING_DISABLE) | 918 | if (!initialized || usb_charging_mode == USB_CHARGING_DISABLE) |
919 | return 100; | 919 | return 100; |
920 | if (usb_state == CONFIGURED) | 920 | if (usb_state == CONFIGURED) |
921 | return usb_charging_current_requested; | 921 | return usb_charging_current_requested; |
922 | if (usb_charging_mode == USB_CHARGING_FORCE && usb_no_host) | 922 | if (usb_charging_mode == USB_CHARGING_FORCE && usb_no_host) |
923 | return 500; | 923 | return 500; |
924 | return 100; | 924 | return 100; |
925 | } | 925 | } |
926 | #endif | 926 | #endif |