diff --git a/avr/usbload/crc.c b/avr/usbload/crc.c index b8f6123..19b37a7 100644 --- a/avr/usbload/crc.c +++ b/avr/usbload/crc.c @@ -91,31 +91,13 @@ uint16_t crc_check_bulk_memory(uint32_t bottom_addr, uint32_t top_addr, uint32_t -void crc_check_memory(uint32_t bottom_addr,uint32_t top_addr,uint32_t bank_size,uint8_t *buffer) -{ - uint16_t crc = 0; - uint32_t addr; - uint8_t req_bank = 0; - for (addr = bottom_addr; addr < top_addr; addr += TRANSFER_BUFFER_SIZE) { - if (addr && addr % bank_size == 0) { - debug(DEBUG_CRC,"crc_check_memory: bank=0x%02x addr=0x%08lx crc=0x%04x\n", - req_bank,addr,crc); - req_bank++; - crc = 0; - } - sram_read_buffer(addr, buffer, TRANSFER_BUFFER_SIZE); - crc = do_crc_update(crc, buffer, TRANSFER_BUFFER_SIZE); - } -} - - uint16_t crc_check_memory_range(uint32_t start_addr, uint32_t size,uint8_t *buffer) { uint16_t crc = 0; uint32_t addr; for (addr = start_addr; addr < start_addr + size; addr += TRANSFER_BUFFER_SIZE) { - sram_read_buffer(addr, buffer, TRANSFER_BUFFER_SIZE); + sram_bulk_read_buffer(addr, buffer, TRANSFER_BUFFER_SIZE); crc = do_crc_update(crc, buffer, TRANSFER_BUFFER_SIZE); } return crc; diff --git a/avr/usbload/crc.h b/avr/usbload/crc.h index 2aac33f..7ec3f09 100644 --- a/avr/usbload/crc.h +++ b/avr/usbload/crc.h @@ -29,7 +29,6 @@ uint16_t crc_xmodem_update(uint16_t crc, uint8_t data); uint16_t do_crc(uint8_t * data,uint16_t size); uint16_t do_crc_update(uint16_t crc,uint8_t * data,uint16_t size); -void crc_check_memory(uint32_t bottom_addr,uint32_t top_addr,uint32_t bank_size,uint8_t *buffer); uint16_t crc_check_memory_range(uint32_t start_addr, uint32_t size,uint8_t *buffer); uint16_t crc_check_bulk_memory(uint32_t bottom_addr, uint32_t bank_size,uint32_t top_addr); diff --git a/avr/usbload/main.c b/avr/usbload/main.c index dd70d27..01c81ce 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -309,6 +309,7 @@ void boot_startup_rom() #endif } + int main(void) { @@ -348,11 +349,11 @@ int main(void) } shared_memory_write(SHARED_MEM_TX_CMD_TERMINATE, 0); info("USB poll done\n"); - snes_reset_hi(); - snes_reset_off(); - snes_irq_lo(); - snes_irq_off(); - info("IRQ off\n"); + //snes_reset_hi(); + //snes_reset_off(); + //snes_irq_lo(); + //snes_irq_off(); + //info("IRQ off\n"); set_rom_mode(); snes_wr_disable(); info("Disable snes WR\n"); diff --git a/avr/usbload/sram.c b/avr/usbload/sram.c index 7486b75..a01e9ea 100644 --- a/avr/usbload/sram.c +++ b/avr/usbload/sram.c @@ -309,27 +309,3 @@ void sram_bulk_set(uint32_t addr, uint32_t len,uint8_t value){ sram_bulk_write_end(); } -void sram_read_buffer(uint32_t addr, uint8_t * dst, uint32_t len) -{ - - uint32_t i; - uint8_t *ptr = dst; - debug(DEBUG_SRAM,"sram_read_buffer: addr=0x%08lx dst=0x%p len=%li\n\r", addr,dst,len); - for (i = addr; i < (addr + len); i++) { - *ptr = sram_read(i); - ptr++; - } -} - - -uint8_t sram_check(uint8_t * buffer, uint32_t len) -{ - uint16_t cnt; - debug(DEBUG_SRAM,"sram_check: len=%li\n\r",len); - for (cnt = 0; cnt < len; cnt++) - if (buffer[cnt]) - return 1; - return 0; -} - - diff --git a/avr/usbload/sram.h b/avr/usbload/sram.h index 0d7ce23..7c8ee9a 100644 --- a/avr/usbload/sram.h +++ b/avr/usbload/sram.h @@ -186,7 +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_read_buffer(uint32_t addr,uint8_t *dst, uint32_t len); void sram_bulk_read_start(uint32_t addr); inline void sram_bulk_read_next(void);