From 9b3dcc844fa2fb8db7adff509cb57f17f07f7281 Mon Sep 17 00:00:00 2001 From: optixx Date: Tue, 22 Sep 2009 21:26:11 +0200 Subject: [PATCH] make shm optional --- avr/usbload/config.h | 2 +- avr/usbload/main.c | 11 ++++++++--- todo.txt | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/avr/usbload/config.h b/avr/usbload/config.h index 505aeee..dfe4f28 100644 --- a/avr/usbload/config.h +++ b/avr/usbload/config.h @@ -51,6 +51,6 @@ #define DO_CRC_CHECK 0 #define DO_SHM_SCRATCHPAD 0 #define DO_SHM 0 -#define DO_TIMER 0 +#define DO_TIMER 1 #endif diff --git a/avr/usbload/main.c b/avr/usbload/main.c index 4973279..a2eba72 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -149,14 +149,14 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) req_addr = req_addr | rq->wIndex.word; 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); } req_percent_last = req_percent; - shared_memory_scratchpad_region_save_helper(req_addr); - +#endif if (req_addr && (req_addr % req_bank_size) == 0) { #if DO_TIMER @@ -172,8 +172,9 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) timer_start(); #endif req_bank++; +#if DO_SHM shared_memory_write(SHARED_MEM_TX_CMD_BANK_CURRENT, req_bank); - +#endif } ret_len = USB_MAX_TRANS; /* @@ -188,7 +189,9 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) debug_P(DEBUG_USB, PSTR("USB_BULK_UPLOAD_END:\n")); req_state = REQ_STATUS_IDLE; sram_bulk_write_end(); +#if DO_SHM shared_memory_write(SHARED_MEM_TX_CMD_UPLOAD_END, 0); +#endif ret_len = 0; /* @@ -301,8 +304,10 @@ int main(void) shell_run(); } +#if DO_SHM shared_memory_write(SHARED_MEM_TX_CMD_TERMINATE, 0); +#endif #if DO_SHM_SCRATCHPAD shared_memory_scratchpad_region_tx_restore(); diff --git a/todo.txt b/todo.txt index c09dcac..83eb393 100644 --- a/todo.txt +++ b/todo.txt @@ -8,3 +8,5 @@ Package for Quickdev16 Bootloader lockbits Flash all cartridge with latest firmware and bootloader Email to seeed about the retour package +Add structs for machine state +Add struct for usb and communcations flags