diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 19a62251b9..1c1a8170d7 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -341,38 +341,53 @@ void dbg_rtc(void) | |||
341 | } | 341 | } |
342 | #endif | 342 | #endif |
343 | 343 | ||
344 | #ifdef HAVE_LCD_CHARCELLS | ||
345 | #define NUMROWS 1 | ||
346 | #else | ||
347 | #define NUMROWS 4 | ||
348 | #endif | ||
344 | /* Read MAS registers and display them */ | 349 | /* Read MAS registers and display them */ |
345 | void dbg_mas(void) | 350 | void dbg_mas(void) |
346 | { | 351 | { |
347 | char buf[32]; | 352 | char buf[32]; |
348 | unsigned int addr = 0, r, i; | 353 | unsigned int addr = 0, r, i; |
349 | int button; | ||
350 | 354 | ||
351 | lcd_clear_display(); | 355 | lcd_clear_display(); |
352 | lcd_puts(0, 0, "MAS register read:"); | 356 | lcd_puts(0, 0, "MAS register read:"); |
353 | 357 | ||
354 | while(1) | 358 | while(1) |
355 | { | 359 | { |
356 | for (r = 0; r < 4; r++) { | 360 | for (r = 0; r < NUMROWS; r++) { |
357 | i = mas_readreg(addr + r); | 361 | i = mas_readreg(addr + r); |
358 | snprintf(buf, 30, "0x%02x: %08x", addr + r, i); | 362 | snprintf(buf, 30, "%02x %08x", addr + r, i); |
359 | lcd_puts(1, r+1, buf); | 363 | lcd_puts(0, r+1, buf); |
360 | } | 364 | } |
361 | 365 | ||
362 | lcd_update(); | 366 | lcd_update(); |
363 | sleep(HZ/16); | 367 | sleep(HZ/16); |
364 | 368 | ||
365 | button = button_get(false); | 369 | switch(button_get(false)) |
366 | |||
367 | switch(button) | ||
368 | { | 370 | { |
371 | #ifdef HAVE_RECORDER_KEYPAD | ||
369 | case BUTTON_DOWN: | 372 | case BUTTON_DOWN: |
370 | addr += 4; | 373 | #else |
374 | case BUTTON_RIGHT: | ||
375 | #endif | ||
376 | addr += NUMROWS; | ||
371 | break; | 377 | break; |
378 | #ifdef HAVE_RECORDER_KEYPAD | ||
372 | case BUTTON_UP: | 379 | case BUTTON_UP: |
373 | if (addr) { addr -= 4; } | 380 | #else |
381 | case BUTTON_LEFT: | ||
382 | #endif | ||
383 | if(addr) | ||
384 | addr -= NUMROWS; | ||
374 | break; | 385 | break; |
386 | #ifdef HAVE_RECORDER_KEYPAD | ||
375 | case BUTTON_LEFT: | 387 | case BUTTON_LEFT: |
388 | #else | ||
389 | case BUTTON_DOWN: | ||
390 | #endif | ||
376 | return; | 391 | return; |
377 | } | 392 | } |
378 | } | 393 | } |
@@ -383,7 +398,6 @@ void dbg_mas_codec(void) | |||
383 | { | 398 | { |
384 | char buf[32]; | 399 | char buf[32]; |
385 | unsigned int addr = 0, r, i; | 400 | unsigned int addr = 0, r, i; |
386 | int button; | ||
387 | 401 | ||
388 | lcd_clear_display(); | 402 | lcd_clear_display(); |
389 | lcd_puts(0, 0, "MAS codec reg read:"); | 403 | lcd_puts(0, 0, "MAS codec reg read:"); |
@@ -399,9 +413,7 @@ void dbg_mas_codec(void) | |||
399 | lcd_update(); | 413 | lcd_update(); |
400 | sleep(HZ/16); | 414 | sleep(HZ/16); |
401 | 415 | ||
402 | button = button_get(false); | 416 | switch(button_get(false)) |
403 | |||
404 | switch(button) | ||
405 | { | 417 | { |
406 | case BUTTON_DOWN: | 418 | case BUTTON_DOWN: |
407 | addr += 4; | 419 | addr += 4; |