diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/debug.c | 179 | ||||
| -rw-r--r-- | firmware/debug.h | 3 | ||||
| -rw-r--r-- | firmware/panic.c | 2 | ||||
| -rw-r--r-- | firmware/usb.c | 3 |
4 files changed, 4 insertions, 183 deletions
diff --git a/firmware/debug.c b/firmware/debug.c index a7923ac237..83eb149706 100644 --- a/firmware/debug.c +++ b/firmware/debug.c @@ -29,12 +29,7 @@ static char debugbuf[200]; #ifndef SIMULATOR /* allow non archos platforms to display output */ #include "kernel.h" -#include "button.h" #include "system.h" -#include "lcd.h" -#include "adc.h" -#include "mas.h" -#include "power.h" void debug_init(void) { @@ -214,180 +209,6 @@ void debugf(char *fmt, ...) #endif } -/*---------------------------------------------------*/ -/* SPECIAL DEBUG STUFF */ -/*---------------------------------------------------*/ -extern int ata_device; -extern int ata_io_address; - -#ifdef ARCHOS_RECORDER -/* Test code!!! */ -void dbg_ports(void) -{ - unsigned short porta; - unsigned short portb; - unsigned char portc; - char buf[32]; - int button; - int battery_voltage; - int batt_int, batt_frac; - bool charge_status = false; - bool ide_status = true; - - lcd_clear_display(); - - while(1) - { - porta = PADR; - portb = PBDR; - portc = PCDR; - - snprintf(buf, 32, "PADR: %04x", porta); - lcd_puts(0, 0, buf); - snprintf(buf, 32, "PBDR: %04x", portb); - lcd_puts(0, 1, buf); - - snprintf(buf, 32, "AN0: %03x AN4: %03x", adc_read(0), adc_read(4)); - lcd_puts(0, 2, buf); - snprintf(buf, 32, "AN1: %03x AN5: %03x", adc_read(1), adc_read(5)); - lcd_puts(0, 3, buf); - snprintf(buf, 32, "AN2: %03x AN6: %03x", adc_read(2), adc_read(6)); - lcd_puts(0, 4, buf); - snprintf(buf, 32, "AN3: %03x AN7: %03x", adc_read(3), adc_read(7)); - lcd_puts(0, 5, buf); - - battery_voltage = (adc_read(6) * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; - - snprintf(buf, 32, "Batt: %d.%02dV %d%% ", batt_int, batt_frac, - battery_level()); - lcd_puts(0, 6, buf); - - snprintf(buf, 32, "ATA: %s, 0x%x", - ata_device?"slave":"master", ata_io_address); - lcd_puts(0, 7, buf); - - lcd_update(); - sleep(HZ/10); - - button = button_get(false); - - switch(button) - { - case BUTTON_ON: - charge_status = charge_status?false:true; - charger_enable(charge_status); - break; - - case BUTTON_UP: - ide_status = ide_status?false:true; - ide_power_enable(ide_status); - break; - - case BUTTON_OFF: - charger_enable(false); - ide_power_enable(true); - return; - } - } -} -#else -void dbg_ports(void) -{ - unsigned short porta; - unsigned short portb; - unsigned char portc; - char buf[32]; - unsigned long crc_count; - int button; - int battery_voltage; - int batt_int, batt_frac; - int currval = 0; - - lcd_clear_display(); - - while(1) - { - porta = PADR; - portb = PBDR; - portc = PCDR; - - switch(currval) - { - case 0: - snprintf(buf, 32, "PADR: %04x ", porta); - break; - case 1: - snprintf(buf, 32, "PBDR: %04x ", portb); - break; - case 2: - snprintf(buf, 32, "AN0: %03x ", adc_read(0)); - break; - case 3: - snprintf(buf, 32, "AN1: %03x ", adc_read(1)); - break; - case 4: - snprintf(buf, 32, "AN2: %03x ", adc_read(2)); - break; - case 5: - snprintf(buf, 32, "AN3: %03x ", adc_read(3)); - break; - case 6: - snprintf(buf, 32, "AN4: %03x ", adc_read(4)); - break; - case 7: - snprintf(buf, 32, "AN5: %03x ", adc_read(5)); - break; - case 8: - snprintf(buf, 32, "AN6: %03x ", adc_read(6)); - break; - case 9: - snprintf(buf, 32, "AN7: %03x ", adc_read(7)); - break; - case 10: - snprintf(buf, 32, "%s, 0x%x ", - ata_device?"slv":"mst", ata_io_address); - break; - case 11: - mas_readmem(MAS_BANK_D0, 0x303, &crc_count, 1); - - snprintf(buf, 32, "CRC: %d ", crc_count); - break; - } - lcd_puts(0, 0, buf); - - battery_voltage = (adc_read(6) * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; - - snprintf(buf, 32, "Batt: %d.%02dV", batt_int, batt_frac); - lcd_puts(0, 1, buf); - - sleep(HZ/5); - - button = button_get(false); - - switch(button) - { - case BUTTON_STOP: - return; - - case BUTTON_LEFT: - currval--; - if(currval < 0) - currval = 11; - break; - - case BUTTON_RIGHT: - currval++; - if(currval > 11) - currval = 0; - break; - } - } -} -#endif #else /* SIMULATOR code coming up */ diff --git a/firmware/debug.h b/firmware/debug.h index 2f984ee55e..876b8511a6 100644 --- a/firmware/debug.h +++ b/firmware/debug.h @@ -21,9 +21,6 @@ extern void debug_init(void); extern void debugf(char* fmt,...); -#ifndef SIMULATOR -extern void dbg_ports(void); -#endif #ifdef __GNUC__ diff --git a/firmware/panic.c b/firmware/panic.c index f34ac07f4f..95519ce621 100644 --- a/firmware/panic.c +++ b/firmware/panic.c @@ -23,7 +23,7 @@ #include "lcd.h" #include "debug.h" -char panic_buf[128]; +static char panic_buf[128]; /* * "Dude. This is pretty fucked-up, right here." diff --git a/firmware/usb.c b/firmware/usb.c index 1e45cd34b8..3732d83df6 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -32,6 +32,9 @@ #include "button.h" #include "sprintf.h" +#ifdef ARCHOS_RECORDER +extern void dbg_ports(void); +#endif #define USB_REALLY_BRAVE |