diff --git a/avr/usbload/crc.c b/avr/usbload/crc.c index 9a2e2dc..87cc25e 100644 --- a/avr/usbload/crc.c +++ b/avr/usbload/crc.c @@ -71,12 +71,12 @@ uint16_t crc_check_bulk_memory(uint32_t bottom_addr, uint32_t top_addr, uint32_t uint32_t addr = 0; uint8_t req_bank = 0; sram_bulk_read_start(bottom_addr); - debug(DEBUG_CRC,"crc_check_bulk_memory: bottom_addr=0x%08lx top_addr=0x%08lx\n", + debug_P(DEBUG_CRC, PSTR("crc_check_bulk_memory: bottom_addr=0x%08lx top_addr=0x%08lx\n"), bottom_addr,top_addr); for (addr = bottom_addr; addr < top_addr; addr++) { if (addr && addr % bank_size == 0) { - debug(DEBUG_CRC,"crc_check_bulk_memory: bank=0x%02x addr=0x%08lx crc=0x%04x\n", + debug_P(DEBUG_CRC, PSTR("crc_check_bulk_memory: bank=0x%02x addr=0x%08lx crc=0x%04x\n"), req_bank,addr,crc); req_bank++; crc = 0; @@ -85,7 +85,7 @@ uint16_t crc_check_bulk_memory(uint32_t bottom_addr, uint32_t top_addr, uint32_t sram_bulk_read_next(); } if (addr % 0x8000 == 0) - debug(DEBUG_CRC,"crc_check_bulk_memory: bank=0x%02x addr=0x%08lx crc=0x%04x\n", + debug_P(DEBUG_CRC, PSTR("crc_check_bulk_memory: bank=0x%02x addr=0x%08lx crc=0x%04x\n"), req_bank,addr,crc); sram_bulk_read_end(); return crc; diff --git a/avr/usbload/main.c b/avr/usbload/main.c index 1f2c012..b6a48e2 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -84,7 +84,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) req_bank = 0; rx_remaining = 0; - debug(DEBUG_USB, "USB_BULK_UPLOAD_INIT: %i %i\n", rq->wValue.word, + 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; @@ -199,7 +199,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) "USB_BULK_UPLOAD_END: ERROR state is not REQ_STATUS_BULK_UPLOAD\n"); return 0; } - debug(DEBUG_USB, "USB_BULK_UPLOAD_END:\n"); + debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_END:\n")); req_state = REQ_STATUS_IDLE; sram_bulk_write_end(); shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_END, 0); @@ -212,7 +212,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) req_addr = rq->wValue.word; req_addr = req_addr << 16; req_addr = req_addr | rq->wIndex.word; - debug(DEBUG_USB, "USB_CRC: addr=0x%08lx \n", req_addr); + debug_P(DEBUG_USB, PSTR("USB_CRC: addr=0x%08lx \n"), req_addr); crc_check_bulk_memory(0x000000, req_addr, req_bank_size); ret_len = 0; /* @@ -220,20 +220,20 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) */ } else if (rq->bRequest == USB_MODE_SNES) { req_state = REQ_STATUS_SNES; - debug(DEBUG_USB, "USB_MODE_SNES:\n"); + debug_P(DEBUG_USB, PSTR("USB_MODE_SNES:\n")); ret_len = 0; /* * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_MODE_AVR) { req_state = REQ_STATUS_AVR; - debug(DEBUG_USB, "USB_MODE_AVR:\n"); + debug_P(DEBUG_USB, PSTR("USB_MODE_AVR:\n")); ret_len = 0; /* * ------------------------------------------------------------------------- */ } else if (rq->bRequest == USB_AVR_RESET) { - debug(DEBUG_USB, "USB_AVR_RESET:\n"); + debug_P(DEBUG_USB, PSTR("USB_AVR_RESET:\n")); soft_reset(); ret_len = 0; /* @@ -245,12 +245,12 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) req_addr = rq->wValue.word; req_addr = req_addr << 16; req_addr = req_addr | rq->wIndex.word; - debug(DEBUG_USB, "USB_CRC_ADDR: addr=0x%lx size=%i\n", req_addr, + debug_P(DEBUG_USB, PSTR("USB_CRC_ADDR: addr=0x%lx size=%i\n"), req_addr, rq->wLength.word); req_size = rq->wLength.word; req_size = req_size << 2; tx_remaining = 2; - debug(DEBUG_USB, "USB_CRC_ADDR: addr=0x%lx size=%li\n", req_addr, + debug_P(DEBUG_USB, PSTR("USB_CRC_ADDR: addr=0x%lx size=%li\n"), req_addr, req_size); crc = crc_check_memory_range(req_addr, req_size, read_buffer); diff --git a/avr/usbload/shared_memory.c b/avr/usbload/shared_memory.c index 347d3f4..debc4a0 100644 --- a/avr/usbload/shared_memory.c +++ b/avr/usbload/shared_memory.c @@ -49,12 +49,12 @@ uint8_t scratchpad_locked_tx = 1; uint8_t shared_memory_scratchpad_region_save_helper(uint32_t addr){ if(addr > (SHARED_MEM_TX_LOC_STATE + SHARED_MEM_TX_LOC_SIZE) && scratchpad_locked_tx){ - debug(DEBUG_SHM,"shared_memory_scratchpad_region_save_helper: open tx addr=0x%06lx\n",addr); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_save_helper: open tx addr=0x%06lx\n"),addr); shared_memory_scratchpad_region_tx_save(); return 0; } if(addr > (SHARED_MEM_RX_LOC_STATE + SHARED_MEM_RX_LOC_SIZE) && scratchpad_locked_rx){ - debug(DEBUG_SHM,"shared_memory_scratchpad_region_save_helper: open rx addr=0x%06lx\n",addr); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_save_helper: open rx addr=0x%06lx\n"),addr); shared_memory_scratchpad_region_rx_save(); return 0; } @@ -68,10 +68,10 @@ void shared_memory_scratchpad_region_tx_save() uint16_t crc; crc = crc_check_bulk_memory((uint32_t)SHARED_MEM_TX_LOC_STATE, (uint32_t)(SHARED_MEM_TX_LOC_STATE + SHARED_MEM_TX_LOC_SIZE), 0x8000); - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_save: crc=%x\n",crc); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_save: crc=%x\n"),crc); #endif - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_save: unlock\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_save: unlock\n")); sram_bulk_copy_into_buffer((uint32_t)SHARED_MEM_TX_LOC_STATE,scratchpad_region_tx, (uint32_t)SHARED_MEM_TX_LOC_SIZE); scratchpad_locked_tx = 0; @@ -90,10 +90,10 @@ void shared_memory_scratchpad_region_rx_save() uint16_t crc; crc = crc_check_bulk_memory((uint32_t)SHARED_MEM_RX_LOC_STATE, (uint32_t)(SHARED_MEM_RX_LOC_STATE + SHARED_MEM_RX_LOC_SIZE), 0x8000); - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_save: crc=%x\n",crc); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_save: crc=%x\n"),crc); #endif - debug(DEBUG_SHM,"shared_memory_scratchpad_region_rx_save: unlock\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_rx_save: unlock\n")); sram_bulk_copy_into_buffer((uint32_t)SHARED_MEM_RX_LOC_STATE,scratchpad_region_rx, (uint32_t)SHARED_MEM_RX_LOC_SIZE); scratchpad_locked_rx = 0; @@ -109,7 +109,7 @@ void shared_memory_scratchpad_region_tx_restore() if (scratchpad_locked_tx) return; - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_restore: lock\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_restore: lock\n")); sram_bulk_copy_from_buffer((uint32_t)SHARED_MEM_TX_LOC_STATE,scratchpad_region_tx, (uint32_t)SHARED_MEM_TX_LOC_SIZE); scratchpad_locked_tx = 1; @@ -122,7 +122,7 @@ void shared_memory_scratchpad_region_tx_restore() uint16_t crc; crc = crc_check_bulk_memory((uint32_t)SHARED_MEM_TX_LOC_STATE, (uint32_t)(SHARED_MEM_TX_LOC_STATE + SHARED_MEM_TX_LOC_SIZE), 0x8000); - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_restore: crc=%x\n",crc); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_restore: crc=%x\n"),crc); #endif } @@ -131,7 +131,7 @@ void shared_memory_scratchpad_region_rx_restore() { if (scratchpad_locked_rx) return; - debug(DEBUG_SHM,"shared_memory_scratchpad_region_tx_save: lock\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_tx_save: lock\n")); sram_bulk_copy_from_buffer((uint32_t)SHARED_MEM_RX_LOC_STATE,scratchpad_region_rx, (uint32_t)SHARED_MEM_RX_LOC_SIZE); scratchpad_locked_rx = 1; @@ -145,7 +145,7 @@ void shared_memory_scratchpad_region_rx_restore() uint16_t crc; crc = crc_check_bulk_memory((uint32_t)SHARED_MEM_RX_LOC_STATE, (uint32_t)(SHARED_MEM_RX_LOC_STATE + SHARED_MEM_RX_LOC_SIZE), 0x8000); - debug(DEBUG_SHM,"shared_memory_scratchpad_region_rx_restore: crc=%x\n",crc); + debug_P(DEBUG_SHM, PSTR("shared_memory_scratchpad_region_rx_restore: crc=%x\n"),crc); #endif } @@ -183,9 +183,9 @@ void shared_memory_write(uint8_t cmd, uint8_t value) { if (scratchpad_locked_tx) - debug(DEBUG_SHM,"shared_memory_write: locked_tx\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_write: locked_tx\n")); - debug(DEBUG_SHM,"shared_memory_write: 0x%04x=0x%02x 0x%04x=0x%02x \n", + debug_P(DEBUG_SHM, PSTR("shared_memory_write: 0x%04x=0x%02x 0x%04x=0x%02x \n"), SHARED_MEM_TX_LOC_CMD, cmd, SHARED_MEM_TX_LOC_PAYLOAD, value); sram_bulk_addr_save(); @@ -241,7 +241,7 @@ int shared_memory_read(uint8_t *cmd, uint8_t *len,uint8_t *buffer) uint8_t state; if (scratchpad_locked_rx) - debug(DEBUG_SHM,"shared_memory_write: locked_tx\n"); + debug_P(DEBUG_SHM, PSTR("shared_memory_write: locked_tx\n")); state = sram_read(SHARED_MEM_RX_LOC_STATE); @@ -252,7 +252,7 @@ int shared_memory_read(uint8_t *cmd, uint8_t *len,uint8_t *buffer) *cmd = sram_read(SHARED_MEM_RX_LOC_CMD); *len = sram_read(SHARED_MEM_RX_LOC_LEN); - debug(DEBUG_SHM,"shared_memory_read: 0x%04x=0x%02x 0x%04x=0x%02x \n", + debug_P(DEBUG_SHM, PSTR("shared_memory_read: 0x%04x=0x%02x 0x%04x=0x%02x \n"), SHARED_MEM_RX_LOC_CMD, *cmd, SHARED_MEM_RX_LOC_LEN, *len); sram_bulk_copy_into_buffer(SHARED_MEM_RX_LOC_PAYLOAD,buffer, *len); diff --git a/avr/usbload/sram.c b/avr/usbload/sram.c index 9f5063a..1541174 100644 --- a/avr/usbload/sram.c +++ b/avr/usbload/sram.c @@ -94,19 +94,19 @@ void system_init(void) void sreg_set(uint32_t addr) { uint8_t i = 24; - debug(DEBUG_SREG,"sreg_set: addr=0x%08lx",addr); + debug_P(DEBUG_SREG, PSTR("sreg_set: addr=0x%08lx"),addr); while(i--) { if ((addr & ( 1L << i))){ - debug(DEBUG_SREG,"1"); + debug_P(DEBUG_SREG, PSTR("1")); AVR_ADDR_SER_PORT |= ( 1 << AVR_ADDR_SER_PIN); } else { AVR_ADDR_SER_PORT &= ~( 1 << AVR_ADDR_SER_PIN); - debug(DEBUG_SREG,"0"); + debug_P(DEBUG_SREG, PSTR("0")); } AVR_ADDR_SCK_PORT |= (1 << AVR_ADDR_SCK_PIN); AVR_ADDR_SCK_PORT &= ~(1 << AVR_ADDR_SCK_PIN); } - debug(DEBUG_SREG,"\n"); + debug_P(DEBUG_SREG, PSTR("\n")); AVR_ADDR_LATCH_PORT |= (1 << AVR_ADDR_LATCH_PIN); AVR_ADDR_LATCH_PORT &= ~(1 << AVR_ADDR_LATCH_PIN); @@ -127,7 +127,7 @@ inline void sram_bulk_addr_restore() void sram_bulk_read_start(uint32_t addr) { - debug(DEBUG_SRAM,"sram_bulk_read_start: addr=0x%08lx\n\r", addr); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_read_start: addr=0x%08lx\n\r"), addr); addr_current = addr; @@ -173,7 +173,7 @@ inline uint8_t sram_bulk_read(void) void sram_bulk_read_end(void) { - debug(DEBUG_SRAM,"sram_bulk_read_end:\n"); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_read_end:\n")); AVR_RD_PORT |= (1 << AVR_RD_PIN); AVR_CS_PORT |= (1 << AVR_CS_PIN); @@ -183,7 +183,7 @@ void sram_bulk_read_end(void) uint8_t sram_read(uint32_t addr) { uint8_t byte; - debug(DEBUG_SRAM_RAW,"sram_read: addr=0x%08lx\n\r", addr); + debug_P(DEBUG_SRAM_RAW, PSTR("sram_read: addr=0x%08lx\n\r"), addr); avr_data_in(); @@ -215,7 +215,7 @@ uint8_t sram_read(uint32_t addr) void sram_bulk_write_start(uint32_t addr) { - debug(DEBUG_SRAM,"sram_bulk_write_start: addr=0x%08lx\n\r", addr); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_write_start: addr=0x%08lx\n\r"), addr); avr_data_out(); @@ -243,7 +243,7 @@ inline void sram_bulk_write( uint8_t data) void sram_bulk_write_end(void) { - debug(DEBUG_SRAM,"sram_bulk_write_end:"); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_write_end:")); AVR_WR_PORT |= (1 << AVR_WR_PIN); AVR_CS_PORT |= (1 << AVR_CS_PIN); avr_data_in(); @@ -252,7 +252,7 @@ void sram_bulk_write_end(void) void sram_write(uint32_t addr, uint8_t data) { - debug(DEBUG_SRAM_RAW,"sram_write: addr=0x%08lx data=%x\n\r", addr, data); + debug_P(DEBUG_SRAM_RAW, PSTR("sram_write: addr=0x%08lx data=%x\n\r"), addr, data); avr_data_out(); @@ -286,7 +286,7 @@ void sram_bulk_copy_from_buffer(uint32_t addr, uint8_t * src, uint32_t len) uint32_t i; uint8_t *ptr = src; - debug(DEBUG_SRAM,"sram_bulk_copy_from_buffer: addr=0x%08lx src=0x%p len=%li\n\r", + debug_P(DEBUG_SRAM, PSTR("sram_bulk_copy_from_buffer: addr=0x%08lx src=0x%p len=%li\n\r"), addr, src, len); sram_bulk_write_start(addr); for (i = addr; i < (addr + len); i++){ @@ -301,7 +301,7 @@ void sram_bulk_copy_into_buffer(uint32_t addr, uint8_t * dst, uint32_t len) uint32_t i; uint8_t *ptr = dst; - debug(DEBUG_SRAM,"sram_bulk_copy_into_buffer: addr=0x%08lx dst=0x%p len=%li\n\r", + debug_P(DEBUG_SRAM, PSTR("sram_bulk_copy_into_buffer: addr=0x%08lx dst=0x%p len=%li\n\r"), addr, dst, len); sram_bulk_read_start(addr); for (i = addr; i < (addr + len); i++) { @@ -314,11 +314,11 @@ 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){ uint32_t i; - debug(DEBUG_SRAM,"sram_bulk_set: addr=0x%08lx len=%li\n\r", addr,len); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_set: addr=0x%08lx len=%li\n\r"), addr,len); sram_bulk_write_start(addr); for (i = addr; i < (addr + len); i++) { if (0 == i % 0xfff) - debug(DEBUG_SRAM,"sram_bulk_set: addr=0x%08lx\n\r", i); + debug_P(DEBUG_SRAM, PSTR("sram_bulk_set: addr=0x%08lx\n\r"), i); sram_bulk_write(value); sram_bulk_write_next(); } diff --git a/avr/usbload/usb_bulk.c b/avr/usbload/usb_bulk.c index 4b1c5d7..ec01668 100644 --- a/avr/usbload/usb_bulk.c +++ b/avr/usbload/usb_bulk.c @@ -63,7 +63,7 @@ uint8_t usbFunctionWrite(uint8_t * data, uint8_t len) 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", + 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); ptr = data; i = len; @@ -81,7 +81,7 @@ uint8_t usbFunctionRead(uint8_t * data, uint8_t len) if (len > tx_remaining) len = tx_remaining; tx_remaining -= len; - debug(DEBUG_USB_TRANS,"usbFunctionRead len=%i tx_remaining=%i \n", len, tx_remaining); + debug_P(DEBUG_USB_TRANS, PSTR("usbFunctionRead len=%i tx_remaining=%i \n"), len, tx_remaining); for (i = 0; i < len; i++) { *data = tx_buffer[len];