diff --git a/avr/usbload/dump.h b/avr/usbload/dump.h index 3cadd5a..ab4abf2 100644 --- a/avr/usbload/dump.h +++ b/avr/usbload/dump.h @@ -31,4 +31,4 @@ void dump_memory(uint32_t bottom_addr, uint32_t top_addr); void dump_packet(uint32_t addr,uint32_t len,uint8_t *packet); #endif - \ No newline at end of file + diff --git a/avr/usbload/sram.c b/avr/usbload/sram.c index 70fade0..7486b75 100644 --- a/avr/usbload/sram.c +++ b/avr/usbload/sram.c @@ -309,27 +309,6 @@ void sram_bulk_set(uint32_t addr, uint32_t len,uint8_t value){ sram_bulk_write_end(); } -void sram_set(uint32_t addr, uint32_t len,uint8_t value) -{ - uint32_t i; - debug(DEBUG_SRAM,"sram_clear: addr=0x%08lx len=%li\n\r", addr,len); - for (i = addr; i < (addr + len); i++) { - if (0 == i % 0xfff) - debug(DEBUG_SRAM,"sram_clear: addr=0x%08lx\n\r", i); - sram_write(i, value); - } -} - -void sram_copy(uint32_t addr, uint8_t * src, uint32_t len) -{ - - uint32_t i; - uint8_t *ptr = src; - debug(DEBUG_SRAM,"sram_copy: addr=0x%08lx src=0x%p len=%li\n\r", addr,src,len); - for (i = addr; i < (addr + len); i++) - sram_write(i, *ptr++); -} - void sram_read_buffer(uint32_t addr, uint8_t * dst, uint32_t len) { diff --git a/avr/usbload/sram.h b/avr/usbload/sram.h index d8a6774..0d7ce23 100644 --- a/avr/usbload/sram.h +++ b/avr/usbload/sram.h @@ -186,8 +186,6 @@ void sreg_set(uint32_t addr); uint8_t sram_read(uint32_t addr); void sram_write(uint32_t addr, uint8_t data); -void sram_set(uint32_t addr, uint32_t len, uint8_t value); -void sram_copy(uint32_t addr,uint8_t *src, uint32_t len); void sram_read_buffer(uint32_t addr,uint8_t *dst, uint32_t len); void sram_bulk_read_start(uint32_t addr); diff --git a/avr/usbload/uart.h b/avr/usbload/uart.h index 3de6307..a8ec5e7 100644 --- a/avr/usbload/uart.h +++ b/avr/usbload/uart.h @@ -37,3 +37,4 @@ static int uart_stream(char c, FILE *stream); #endif + diff --git a/avr/usbload/usb_bulk.c b/avr/usbload/usb_bulk.c index 7357711..c9853ac 100644 --- a/avr/usbload/usb_bulk.c +++ b/avr/usbload/usb_bulk.c @@ -60,16 +60,7 @@ uint8_t usbFunctionWrite(uint8_t * data, uint8_t len) rx_remaining, len); len = rx_remaining; } - if (req_state == REQ_STATUS_UPLOAD) { - - rx_remaining -= len; - debug(DEBUG_USB_TRANS,"usbFunctionWrite REQ_STATUS_UPLOAD addr: 0x%08lx len: %i rx_remaining=%i\n", - req_addr, len, rx_remaining); - debug(DEBUG_USB_TRANS,"usbFunctionWrite %02x %02x %02x %02x %02x %02x %02x %x\n", - data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]); - sram_copy(req_addr, data, len); - req_addr += len; - } else if (req_state == REQ_STATUS_BULK_UPLOAD) { + if (req_state == REQ_STATUS_BULK_UPLOAD) { rx_remaining -= len; debug(DEBUG_USB_TRANS,"usbFunctionWrite REQ_STATUS_BULK_UPLOAD addr: 0x%08lx len: %i rx_remaining=%i\n",