From 1a7fb2487e7d9321be1a9086f6c477614745e3df Mon Sep 17 00:00:00 2001 From: optixx Date: Tue, 22 Sep 2009 23:55:44 +0200 Subject: [PATCH] add status command to shell --- avr/usbload/command.c | 15 +- avr/usbload/command.h | 2 +- avr/usbload/shell.c | 5 + quickdev16.tmproj | 464 +++++++++++++++++++++++++++++++++++++----- 4 files changed, 431 insertions(+), 55 deletions(-) diff --git a/avr/usbload/command.c b/avr/usbload/command.c index 817ec97..0b109c5 100644 --- a/avr/usbload/command.c +++ b/avr/usbload/command.c @@ -117,9 +117,6 @@ void boot_startup_rom(uint16_t init_delay) _delay_ms(init_delay); } - - - void banner(){ uint8_t i; for (i=0;i<40;i++) @@ -136,3 +133,15 @@ void banner(){ info_P(PSTR("System Hw: %s Sw: %s\n"),HW_VERSION,SW_VERSION); } + +void transaction_status(){ + info_P(PSTR("\nAddr 0x%06lx\n"),usb_trans.req_addr); + info_P(PSTR("Bank 0x%02x\n"),usb_trans.req_bank); + info_P(PSTR("Banksize 0x%06lx\n"),usb_trans.req_bank_size); + info_P(PSTR("Bankcount 0x%02x\n"),usb_trans.req_bank_cnt); + info_P(PSTR("Status 0x%02x\n"),usb_trans.req_state); + info_P(PSTR("Percent %02i\n"),usb_trans.req_percent); + info_P(PSTR("TX buffer %02i\n"),usb_trans.tx_remaining); + info_P(PSTR("RX buffer %02i\n"),usb_trans.rx_remaining); + info_P(PSTR("Syncerr %02i\n"),usb_trans.sync_errors); +} \ No newline at end of file diff --git a/avr/usbload/command.h b/avr/usbload/command.h index e8e0bda..e985c98 100644 --- a/avr/usbload/command.h +++ b/avr/usbload/command.h @@ -28,7 +28,7 @@ void set_rom_mode(); void usb_connect(); void boot_startup_rom(uint16_t init_delay); void banner(); - +void transaction_status(); #endif diff --git a/avr/usbload/shell.c b/avr/usbload/shell.c index 2e9d7b8..8bd860f 100644 --- a/avr/usbload/shell.c +++ b/avr/usbload/shell.c @@ -41,6 +41,7 @@ #include "shared_memory.h" + uint8_t command_buf[RECEIVE_BUF_LEN]; uint8_t recv_buf[RECEIVE_BUF_LEN]; @@ -194,6 +195,7 @@ enum cmds { CMD_DUMP, CMD_SHMRESTORE, CMD_LOADER, CMD_RECONNECT, + CMD_STATUS, CMD_HELP }; @@ -213,6 +215,7 @@ uint8_t cmdlist[][CMD_HELP] PROGMEM = { {"SHMRESTORE"}, {"LOADER"}, {"RECONNECT"}, + {"STATUS"}, {"HELP"}, }; @@ -316,6 +319,8 @@ void shell_run(void) boot_startup_rom(500); }else if (strcmp_P((char*)t, (PGM_P)cmdlist[CMD_RECONNECT]) == 0) { usb_connect(); + }else if (strcmp_P((char*)t, (PGM_P)cmdlist[CMD_STATUS]) == 0) { + transaction_status(); }else if (strcmp_P((char*)t, (PGM_P)cmdlist[CMD_HELP]) == 0) { shell_help(); } diff --git a/quickdev16.tmproj b/quickdev16.tmproj index c409dac..28b8263 100644 --- a/quickdev16.tmproj +++ b/quickdev16.tmproj @@ -21,6 +21,48 @@ 271 metaData + avr/usbload/command.c + + caret + + column + 0 + line + 141 + + firstVisibleColumn + 0 + firstVisibleLine + 94 + + avr/usbload/command.h + + caret + + column + 26 + line + 30 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + avr/usbload/config.h + + caret + + column + 5 + line + 45 + + firstVisibleColumn + 0 + firstVisibleLine + 10 + avr/usbload/crc.c caret @@ -40,61 +82,131 @@ caret column - 0 + 5 line 26 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom + + avr/usbload/debug.h + + caret column 0 line - 25 - - selectTo - - column 0 - line - 26 + firstVisibleColumn + 0 + firstVisibleLine + 2 avr/usbload/dump.c caret column - 12 + 15 line - 67 + 28 + + firstVisibleColumn + 0 + firstVisibleLine + 36 + + avr/usbload/dump.h + + caret + + column + 0 + line + 3 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + avr/usbload/irq.c + + caret + + column + 10 + line + 53 columnSelection firstVisibleColumn 0 firstVisibleLine - 35 + 25 selectFrom column 5 line - 67 + 53 selectTo column - 16 + 22 line - 67 + 53 + avr/usbload/irq.h + + caret + + column + 19 + line + 26 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 5 + line + 26 + + selectTo + + column + 22 + line + 26 + + + avr/usbload/loader.c + + caret + + column + 80 + line + 18 + + firstVisibleColumn + 0 + firstVisibleLine + 734 + avr/usbload/main.c caret @@ -102,28 +214,68 @@ column 0 line - 28 + 74 + + firstVisibleColumn + 0 + firstVisibleLine + 46 + + avr/usbload/pwm.c + + caret + + column + 25 + line + 32 + + firstVisibleColumn + 0 + firstVisibleLine + 20 + + avr/usbload/pwm.h + + caret + + column + 20 + line + 33 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom + + avr/usbload/requests.h + + caret column - 0 + 20 line - 22 + 56 - selectTo + firstVisibleColumn + 0 + firstVisibleLine + 9 + + avr/usbload/rle.c + + caret column - 0 + 40 line - 28 + 99 + firstVisibleColumn + 0 + firstVisibleLine + 55 avr/usbload/rle.h @@ -155,40 +307,70 @@ 0 + avr/usbload/shared_memory.c + + caret + + column + 0 + line + 70 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 61 + selectFrom + + column + 0 + line + 64 + + selectTo + + column + 0 + line + 70 + + avr/usbload/shared_memory.h caret column - 45 + 52 line - 24 + 50 firstVisibleColumn 0 firstVisibleLine - 0 + 29 avr/usbload/shell.c caret column - 41 + 0 line - 177 + 43 firstVisibleColumn 0 firstVisibleLine - 154 + 30 avr/usbload/shell.h caret column - 0 + 22 line 23 @@ -211,7 +393,7 @@ firstVisibleColumn 0 firstVisibleLine - 206 + 215 selectFrom column @@ -227,6 +409,34 @@ 287 + avr/usbload/timer.c + + caret + + column + 6 + line + 80 + + firstVisibleColumn + 0 + firstVisibleLine + 47 + + avr/usbload/timer.h + + caret + + column + 0 + line + 29 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + avr/usbload/uart.c caret @@ -241,6 +451,36 @@ firstVisibleLine 26 + avr/usbload/usb_bulk.c + + caret + + column + 0 + line + 43 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 16 + selectFrom + + column + 0 + line + 42 + + selectTo + + column + 0 + line + 43 + + avr/usbload/usb_bulk.h caret @@ -255,49 +495,61 @@ firstVisibleLine 0 + avr/usbload/usbconfig.h + + caret + + column + 42 + line + 129 + + firstVisibleColumn + 0 + firstVisibleLine + 88 + avr/usbload/util.c caret column - 1 + 0 line - 25 + 116 firstVisibleColumn 0 firstVisibleLine - 0 + 84 avr/usbload/util.h caret column - 0 + 1 line - 0 + 29 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom + + scripts/check_rle.py + + caret column - 3 + 14 line - 18 - - selectTo - - column - 0 - line - 0 + 9 + firstVisibleColumn + 0 + firstVisibleLine + 0 snes/banktest/LoadGraphics.asm @@ -327,17 +579,96 @@ firstVisibleLine 211 + tools/ucon64/src/backup/quickdev16.c + + caret + + column + 30 + line + 71 + + firstVisibleColumn + 0 + firstVisibleLine + 181 + + tools/ucon64/src/backup/smsgg-pro.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ucon64/src/console/snes.c + + caret + + column + 0 + line + 2695 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 3814 + selectFrom + + column + 1 + line + 2887 + + selectTo + + column + 0 + line + 2695 + + openDocuments avr/usbload/sram.c avr/usbload/main.c + avr/usbload/usb_bulk.c + avr/usbload/usbconfig.h + avr/usbload/requests.h + avr/usbload/debug.h avr/usbload/shell.c + tools/ucon64/src/backup/smsgg-pro.h + tools/ucon64/src/console/snes.c + tools/ucon64/src/backup/quickdev16.c + avr/usbload/config.h + avr/usbload/timer.c + avr/usbload/rle.c + avr/usbload/pwm.c + avr/usbload/loader.c + scripts/check_rle.py + avr/usbload/pwm.h + avr/usbload/shared_memory.c + avr/usbload/command.c + avr/usbload/command.h + avr/usbload/irq.c + avr/usbload/irq.h avr/usbload/crc.c avr/usbload/dump.c avr/usbload/debug.c + avr/usbload/dump.h avr/usbload/uart.c avr/usbload/util.c + avr/usbload/timer.h avr/usbload/util.h avr/usbload/usb_bulk.h avr/usbload/rle.h @@ -378,6 +709,37 @@ subItems + tools + + isExpanded + + subItems + + ucon64 + + isExpanded + + subItems + + src + + isExpanded + + subItems + + console + + isExpanded + + subItems + + + + + + + +