From a341e10efc41486cb08e1968cc7b7fece066cf25 Mon Sep 17 00:00:00 2001 From: optixx Date: Tue, 22 Sep 2009 23:43:27 +0200 Subject: [PATCH] refactor usb transaction varts and flags --- avr/usbload/command.c | 5 +- avr/usbload/command.h | 3 + avr/usbload/main.c | 125 +++++++++++++++++++++-------------------- avr/usbload/requests.h | 17 ++++++ avr/usbload/usb_bulk.c | 34 +++++------ 5 files changed, 100 insertions(+), 84 deletions(-) diff --git a/avr/usbload/command.c b/avr/usbload/command.c index 4719e66..817ec97 100644 --- a/avr/usbload/command.c +++ b/avr/usbload/command.c @@ -32,7 +32,8 @@ #include "rle.h" #include "loader.h" -extern uint32_t req_bank_size; +extern usb_transaction_t usb_trans; + extern const char _rom[] PROGMEM; void usb_connect() @@ -76,7 +77,7 @@ void send_irq() void set_rom_mode() { - if (req_bank_size == 0x8000) { + if (usb_trans.req_bank_size == 0x8000) { snes_lorom(); info_P(PSTR("Set SNES lowrom \n")); } else { diff --git a/avr/usbload/command.h b/avr/usbload/command.h index 4a0b62b..e8e0bda 100644 --- a/avr/usbload/command.h +++ b/avr/usbload/command.h @@ -28,4 +28,7 @@ void set_rom_mode(); void usb_connect(); void boot_startup_rom(uint16_t init_delay); void banner(); + + + #endif diff --git a/avr/usbload/main.c b/avr/usbload/main.c index feddf47..5a9d0a0 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "usbdrv.h" #include "oddebug.h" @@ -55,11 +56,9 @@ extern FILE uart_stdout; uint8_t debug_level = (DEBUG | DEBUG_USB | DEBUG_CRC | DEBUG_SHM ); -uint8_t tx_buffer[32]; -uint8_t data_buffer[4]; +/* uint32_t req_addr = 0; uint32_t req_addr_end = 0; -uint32_t req_size; uint8_t req_bank; uint32_t req_bank_size; uint16_t req_bank_cnt; @@ -69,12 +68,15 @@ uint8_t req_state = REQ_STATUS_IDLE; uint8_t rx_remaining = 0; uint8_t tx_remaining = 0; uint16_t sync_errors = 0; -uint32_t addr; -uint16_t crc = 0; +uint8_t tx_buffer[32]; +uint8_t rx_buffer[8]; +*/ +usb_transaction_t usb_trans; + usbMsgLen_t usbFunctionSetup(uchar data[8]) { @@ -84,24 +86,24 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) if (rq->bRequest == USB_BULK_UPLOAD_INIT) { - req_bank = 0; - rx_remaining = 0; + usb_trans.req_bank = 0; + usb_trans.rx_remaining = 0; debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_INIT: %i %i\n"), rq->wValue.word, rq->wIndex.word); - req_bank_size = (uint32_t) (1L << rq->wValue.word); - req_bank_cnt = rq->wIndex.word; - req_addr_end = (uint32_t) req_bank_size *req_bank_cnt; - req_percent = 0; - req_percent_last = 0; - sync_errors = 0; + usb_trans.req_bank_size = (uint32_t) (1L << rq->wValue.word); + usb_trans.req_bank_cnt = rq->wIndex.word; + usb_trans.req_addr_end = (uint32_t) usb_trans.req_bank_size * usb_trans.req_bank_cnt; + usb_trans.req_percent = 0; + usb_trans.req_percent_last = 0; + usb_trans.sync_errors = 0; debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_INIT: bank_size=0x%08lx bank_cnt=0x%x end_addr=0x%08lx\n"), - req_bank_size, req_bank_cnt, req_addr_end); + usb_trans.req_bank_size, usb_trans.req_bank_cnt, usb_trans.req_addr_end); shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_START, 0); - shared_memory_write(SHARED_MEM_TX_CMD_BANK_COUNT, req_bank_cnt); + shared_memory_write(SHARED_MEM_TX_CMD_BANK_COUNT, usb_trans.req_bank_cnt); #if DO_TIMER - if (req_addr == 0x000000) { + if (usb_trans.req_addr == 0x000000) { timer_start(); } #endif @@ -110,32 +112,32 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) */ } else if (rq->bRequest == USB_BULK_UPLOAD_ADDR) { - req_state = REQ_STATUS_BULK_UPLOAD; - req_addr = rq->wValue.word; - req_addr = req_addr << 16; - req_addr = req_addr | rq->wIndex.word; - rx_remaining = rq->wLength.word; + usb_trans.req_state = REQ_STATUS_BULK_UPLOAD; + usb_trans.req_addr = rq->wValue.word; + usb_trans.req_addr = usb_trans.req_addr << 16; + usb_trans.req_addr = usb_trans.req_addr | rq->wIndex.word; + usb_trans.rx_remaining = rq->wLength.word; - if (req_addr && req_addr % req_bank_size == 0) { + if (usb_trans.req_addr && usb_trans.req_addr % usb_trans.req_bank_size == 0) { #if DO_TIMER #ifdef FLT_DEBUG debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_ADDR: req_bank=0x%02x addr=0x%08lx time=%.4f\n"), - req_bank, req_addr, timer_stop()); + usb_trans.req_bank, usb_trans.req_addr, timer_stop()); #else debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_ADDR: req_bank=0x%02x addr=0x%08lx time=%i\n"), - req_bank, req_addr, timer_stop_int()); + usb_trans.req_bank, usb_trans.req_addr, timer_stop_int()); #endif timer_start(); #endif - req_bank++; + usb_trans.req_bank++; } else { - sram_bulk_write_start(req_addr); + sram_bulk_write_start(usb_trans.req_addr); } ret_len = USB_MAX_TRANS; @@ -143,37 +145,37 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_BULK_UPLOAD_NEXT) { - req_state = REQ_STATUS_BULK_UPLOAD; - req_addr = rq->wValue.word; - req_addr = req_addr << 16; - req_addr = req_addr | rq->wIndex.word; - rx_remaining = rq->wLength.word; + usb_trans.req_state = REQ_STATUS_BULK_UPLOAD; + usb_trans.req_addr = rq->wValue.word; + usb_trans.req_addr = usb_trans.req_addr << 16; + usb_trans.req_addr = usb_trans.req_addr | rq->wIndex.word; + usb_trans.rx_remaining = rq->wLength.word; #if DO_SHM - req_percent = (uint32_t)( 100 * req_addr ) / req_addr_end; - if (req_percent!=req_percent_last){ - shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_PROGESS, req_percent); + usb_trans.req_percent = (uint32_t)( 100 * usb_trans.req_addr ) / usb_trans.req_addr_end; + if (usb_trans.req_percent!=usb_trans.req_percent_last){ + shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_PROGESS, usb_trans.req_percent); } - req_percent_last = req_percent; - shared_memory_scratchpad_region_save_helper(req_addr); + usb_trans.req_percent_last = usb_trans.req_percent; + shared_memory_scratchpad_region_save_helper(usb_trans.req_addr); #endif - if (req_addr && (req_addr % req_bank_size) == 0) { + if (usb_trans.req_addr && (usb_trans.req_addr % usb_trans.req_bank_size) == 0) { #if DO_TIMER #ifdef FLT_DEBUG debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_NEXT: req_bank=0x%02x addr=0x%08lx time=%.4f\n"), - req_bank, req_addr, timer_stop()); + usb_trans.req_bank, usb_trans.req_addr, timer_stop()); #else debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_NEXT: req_bank=0x%02x addr=0x%08lx time=%i\n"), - req_bank, req_addr, timer_stop_int()); + usb_trans.req_bank, usb_trans.req_addr, timer_stop_int()); #endif timer_start(); #endif - req_bank++; + usb_trans.req_bank++; #if DO_SHM - shared_memory_write(SHARED_MEM_TX_CMD_BANK_CURRENT, req_bank); + shared_memory_write(SHARED_MEM_TX_CMD_BANK_CURRENT, usb_trans.req_bank); #endif } ret_len = USB_MAX_TRANS; @@ -181,13 +183,13 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_BULK_UPLOAD_END) { - if (req_state != REQ_STATUS_BULK_UPLOAD) { + if (usb_trans.req_state != REQ_STATUS_BULK_UPLOAD) { debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_END: ERROR state is not REQ_STATUS_BULK_UPLOAD\n")); return 0; } debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_END:\n")); - req_state = REQ_STATUS_IDLE; + usb_trans.req_state = REQ_STATUS_IDLE; sram_bulk_write_end(); #if DO_SHM shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_END, 0); @@ -198,26 +200,25 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_CRC) { - req_addr = rq->wValue.word; - req_addr = req_addr << 16; - req_addr = req_addr | rq->wIndex.word; - debug_P(DEBUG_USB, PSTR("USB_CRC: addr=0x%08lx \n"), req_addr); - crc_check_bulk_memory(0x000000, req_addr, req_bank_size); + usb_trans.req_addr = rq->wValue.word; + usb_trans.req_addr = usb_trans.req_addr << 16; + usb_trans.req_addr = usb_trans.req_addr | rq->wIndex.word; + debug_P(DEBUG_USB, PSTR("USB_CRC: addr=0x%08lx \n"), usb_trans.req_addr); + crc_check_bulk_memory(0x000000, usb_trans.req_addr, usb_trans.req_bank_size); ret_len = 0; /* * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_MODE_SNES) { - req_state = REQ_STATUS_SNES; + usb_trans.req_state = REQ_STATUS_SNES; debug_P(DEBUG_USB, PSTR("USB_MODE_SNES:\n")); ret_len = 0; - pwm_stop(); /* * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_MODE_AVR) { - req_state = REQ_STATUS_AVR; + usb_trans.req_state = REQ_STATUS_AVR; debug_P(DEBUG_USB, PSTR("USB_MODE_AVR:\n")); ret_len = 0; /* @@ -232,7 +233,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) */ } - usbMsgPtr = data_buffer; + usbMsgPtr = usb_trans.rx_buffer; return ret_len; } @@ -243,12 +244,14 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) void globals_init(){ - req_addr = 0; - req_addr_end = 0; - req_state = REQ_STATUS_IDLE; - rx_remaining = 0; - tx_remaining = 0; - sync_errors = 0; + memset(&usb_trans,0,sizeof(usb_transaction_t)); + + usb_trans.req_addr = 0; + usb_trans.req_addr_end = 0; + usb_trans.req_state = REQ_STATUS_IDLE; + usb_trans.rx_remaining = 0; + usb_trans.tx_remaining = 0; + usb_trans.sync_errors = 0; } int main(void) @@ -280,7 +283,7 @@ int main(void) snes_wr_disable(); sei(); info_P(PSTR("USB poll\n")); - while (req_state != REQ_STATUS_SNES) { + while (usb_trans.req_state != REQ_STATUS_SNES) { usbPoll(); shell_run(); } @@ -297,7 +300,7 @@ int main(void) #if DO_CRC_CHECK info_P(PSTR("-->CRC Check\n")); - crc_check_bulk_memory(0x000000, req_bank_size * req_bank_cnt, req_bank_size); + crc_check_bulk_memory(0x000000, usb_trans.req_bank_size * usb_trans.req_bank_cnt, usb_trans.req_bank_size); #endif info_P(PSTR("-->Switch TO SNES\n")); @@ -309,7 +312,7 @@ int main(void) irq_stop(); send_reset(); info_P(PSTR("Poll USB\n")); - while ((req_state != REQ_STATUS_AVR)) { + while ((usb_trans.req_state != REQ_STATUS_AVR)) { usbPoll(); shell_run(); } diff --git a/avr/usbload/requests.h b/avr/usbload/requests.h index fe954ec..ae20e19 100644 --- a/avr/usbload/requests.h +++ b/avr/usbload/requests.h @@ -39,4 +39,21 @@ #define USB_MODE_AVR 11 #define USB_AVR_RESET 12 +typedef struct usb_transaction_t { + uint32_t req_addr; + uint32_t req_addr_end; + uint8_t req_bank; + uint32_t req_bank_size; + uint16_t req_bank_cnt; + uint8_t req_percent; + uint8_t req_percent_last; + uint8_t req_state; + uint8_t rx_remaining; + uint8_t tx_remaining ; + uint16_t sync_errors; + uint8_t tx_buffer[32]; + uint8_t rx_buffer[8]; + +} usb_transaction_t; + #endif /* __REQUESTS_H_INCLUDED__ */ diff --git a/avr/usbload/usb_bulk.c b/avr/usbload/usb_bulk.c index ec01668..afbad42 100644 --- a/avr/usbload/usb_bulk.c +++ b/avr/usbload/usb_bulk.c @@ -39,32 +39,24 @@ #include "crc.h" #include "usb_bulk.h" -extern uint8_t read_buffer[TRANSFER_BUFFER_SIZE]; -extern uint32_t req_addr; -extern uint32_t req_size; -extern uint8_t req_bank; -extern uint32_t req_bank_size; -extern uint8_t req_state; -extern uint8_t rx_remaining; -extern uint8_t tx_remaining; -extern uint8_t tx_buffer[32]; -extern uint16_t crc; + +extern usb_transaction_t usb_trans; uint8_t usbFunctionWrite(uint8_t * data, uint8_t len) { uint8_t *ptr; uint8_t i; - if (len > rx_remaining) { + if (len > usb_trans.rx_remaining) { info_P(PSTR("ERROR:usbFunctionWrite more data than expected remain: %i len: %i\n"), - rx_remaining, len); - len = rx_remaining; + usb_trans.rx_remaining, len); + len = usb_trans.rx_remaining; } - if (req_state == REQ_STATUS_BULK_UPLOAD) { + if (usb_trans.req_state == REQ_STATUS_BULK_UPLOAD) { - rx_remaining -= len; + usb_trans.rx_remaining -= len; debug_P(DEBUG_USB_TRANS, PSTR("usbFunctionWrite REQ_STATUS_BULK_UPLOAD addr: 0x%08lx len: %i rx_remaining=%i\n"), - req_addr, len, rx_remaining); + usb_trans.req_addr, len, usb_trans.rx_remaining); ptr = data; i = len; while(i--){ @@ -78,13 +70,13 @@ uint8_t usbFunctionWrite(uint8_t * data, uint8_t len) uint8_t usbFunctionRead(uint8_t * data, uint8_t len) { uint8_t i; - if (len > tx_remaining) - len = tx_remaining; - tx_remaining -= len; - debug_P(DEBUG_USB_TRANS, PSTR("usbFunctionRead len=%i tx_remaining=%i \n"), len, tx_remaining); + if (len > usb_trans.tx_remaining) + len = usb_trans.tx_remaining; + usb_trans.tx_remaining -= len; + debug_P(DEBUG_USB_TRANS, PSTR("usbFunctionRead len=%i tx_remaining=%i \n"), len, usb_trans.tx_remaining); for (i = 0; i < len; i++) { - *data = tx_buffer[len]; + *data = usb_trans.tx_buffer[len]; data++; } return len;