diff --git a/avr/usbload/main.c b/avr/usbload/main.c index ef1f9bc..3c9e266 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -165,6 +165,8 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) #endif if (!shared_memory_scratchpad_region_save_helper(req_addr)){ + debug(DEBUG_USB, + "USB_BULK_UPLOAD_NEXT: scratchpad_region_save_helper was dirty\n"); sram_bulk_write_start(req_addr); } diff --git a/avr/usbload/shared_memory.c b/avr/usbload/shared_memory.c index b6c67f6..8b714aa 100644 --- a/avr/usbload/shared_memory.c +++ b/avr/usbload/shared_memory.c @@ -29,6 +29,7 @@ #include "config.h" #include "sram.h" #include "debug.h" +#include "dump.h" #include "info.h" uint8_t irq_addr_lo; @@ -64,6 +65,12 @@ void shared_memory_scratchpad_region_tx_save() debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_save: unlock\n"); sram_bulk_copy_into_buffer(SHARED_MEM_TX_LOC_STATE,scratchpad_region_tx,SHARED_MEM_TX_LOC_SIZE); scratchpad_locked_tx = 0; +#if 0 + dump_packet(SHARED_MEM_TX_LOC_STATE, SHARED_MEM_TX_LOC_SIZE, scratchpad_region_tx); + dump_memory(SHARED_MEM_TX_LOC_STATE, SHARED_MEM_TX_LOC_STATE + SHARED_MEM_TX_LOC_SIZE); +#endif + + } void shared_memory_scratchpad_region_rx_save() @@ -71,6 +78,10 @@ void shared_memory_scratchpad_region_rx_save() debug(DEBUG_SHM,"shared_memory_scratchpad_region_rx_save: unlock\n"); sram_bulk_copy_into_buffer(SHARED_MEM_RX_LOC_STATE,scratchpad_region_rx,SHARED_MEM_RX_LOC_SIZE); scratchpad_locked_rx = 0; +#if 0 + dump_packet(SHARED_MEM_RX_LOC_STATE, SHARED_MEM_RX_LOC_SIZE, scratchpad_region_tx); + dump_memory(SHARED_MEM_RX_LOC_STATE, SHARED_MEM_RX_LOC_STATE + SHARED_MEM_RX_LOC_SIZE); +#endif } void shared_memory_scratchpad_region_tx_restore() @@ -80,6 +91,10 @@ void shared_memory_scratchpad_region_tx_restore() debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_restore: lock\n"); sram_bulk_copy_from_buffer(SHARED_MEM_TX_LOC_STATE,scratchpad_region_tx,SHARED_MEM_TX_LOC_SIZE); scratchpad_locked_tx = 1; +#if 0 + dump_packet(SHARED_MEM_TX_LOC_STATE, SHARED_MEM_TX_LOC_SIZE, scratchpad_region_tx); + dump_memory(SHARED_MEM_TX_LOC_STATE, SHARED_MEM_TX_LOC_STATE + SHARED_MEM_TX_LOC_SIZE); +#endif } diff --git a/avr/usbload/sram.h b/avr/usbload/sram.h index 72c8491..0a3cc3a 100644 --- a/avr/usbload/sram.h +++ b/avr/usbload/sram.h @@ -197,8 +197,9 @@ inline void sram_bulk_write_next(void); inline void sram_bulk_write_end(void); void sram_bulk_write(uint8_t data); -void sram_bulk_copy(uint32_t addr, uint8_t * src, uint32_t len); -void sram_bulk_read_buffer(uint32_t addr, uint8_t * dst, uint32_t len); +void sram_bulk_copy_from_buffer(uint32_t addr, uint8_t * src, uint32_t len); +void sram_bulk_copy_into_buffer(uint32_t addr, uint8_t * dst, uint32_t len); + void sram_bulk_set(uint32_t addr, uint32_t len,uint8_t value); inline void sram_bulk_addr_save();