summaryrefslogtreecommitdiff
path: root/bootloader/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'bootloader/common.c')
-rw-r--r--bootloader/common.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/bootloader/common.c b/bootloader/common.c
index 03c1bf9964..295ebdc51b 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -145,7 +145,7 @@ int load_raw_firmware(unsigned char* buf, char* firmware, int buffer_size)
145 } 145 }
146 146
147 len = filesize(fd); 147 len = filesize(fd);
148 148
149 if (len > buffer_size) 149 if (len > buffer_size)
150 return EFILE_TOO_BIG; 150 return EFILE_TOO_BIG;
151 151
@@ -180,11 +180,11 @@ void display_logf(void) /* Doesn't return! */
180 int touch, prev_y=0; 180 int touch, prev_y=0;
181#endif 181#endif
182 char buffer[COLUMNS+1]; 182 char buffer[COLUMNS+1];
183 183
184 while(1) 184 while(1)
185 { 185 {
186 index = logfindex + user_index; 186 index = logfindex + user_index;
187 187
188 lcd_clear_display(); 188 lcd_clear_display();
189 for(i = LINES-1; i>=0; i--) 189 for(i = LINES-1; i>=0; i--)
190 { 190 {
@@ -195,19 +195,19 @@ void display_logf(void) /* Doesn't return! */
195 else 195 else
196 break; /* done */ 196 break; /* done */
197 } 197 }
198 198
199 memcpy(buffer, logfbuffer[index], COLUMNS); 199 memcpy(buffer, logfbuffer[index], COLUMNS);
200 200
201 if (logfbuffer[index][MAX_LOGF_ENTRY] == LOGF_TERMINATE_CONTINUE_LINE) 201 if (logfbuffer[index][MAX_LOGF_ENTRY] == LOGF_TERMINATE_CONTINUE_LINE)
202 buffer[MAX_LOGF_ENTRY-1] = '>'; 202 buffer[MAX_LOGF_ENTRY-1] = '>';
203 else if (logfbuffer[index][MAX_LOGF_ENTRY] == LOGF_TERMINATE_MULTI_LINE) 203 else if (logfbuffer[index][MAX_LOGF_ENTRY] == LOGF_TERMINATE_MULTI_LINE)
204 buffer[MAX_LOGF_ENTRY-1] = '\0'; 204 buffer[MAX_LOGF_ENTRY-1] = '\0';
205 205
206 buffer[COLUMNS] = '\0'; 206 buffer[COLUMNS] = '\0';
207 207
208 lcd_puts(0, i, buffer); 208 lcd_puts(0, i, buffer);
209 } 209 }
210 210
211 button = button_get(false); 211 button = button_get(false);
212 if(button == SYS_USB_CONNECTED) 212 if(button == SYS_USB_CONNECTED)
213 usb_acknowledge(SYS_USB_CONNECTED_ACK); 213 usb_acknowledge(SYS_USB_CONNECTED_ACK);
@@ -223,16 +223,16 @@ void display_logf(void) /* Doesn't return! */
223 else if(button & BUTTON_TOUCHSCREEN) 223 else if(button & BUTTON_TOUCHSCREEN)
224 { 224 {
225 touch = button_get_data(); 225 touch = button_get_data();
226 226
227 if(button & BUTTON_REL) 227 if(button & BUTTON_REL)
228 prev_y = 0; 228 prev_y = 0;
229 229
230 if(prev_y != 0) 230 if(prev_y != 0)
231 user_index += (prev_y - (touch & 0xFFFF)) / SYSFONT_HEIGHT; 231 user_index += (prev_y - (touch & 0xFFFF)) / SYSFONT_HEIGHT;
232 prev_y = touch & 0xFFFF; 232 prev_y = touch & 0xFFFF;
233 } 233 }
234#endif 234#endif
235 235
236 lcd_update(); 236 lcd_update();
237 sleep(HZ/16); 237 sleep(HZ/16);
238 } 238 }