From ac70ddd0a1c412bb54def48e53caaebd0b5c9c61 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 8 Jun 2009 07:34:16 +0000 Subject: Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier Start-of-frame event experiments. --- Bootloaders/CDC/BootloaderCDC.c | 4 ++-- Bootloaders/DFU/BootloaderDFU.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Bootloaders') diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 265e90f8f..d797915bc 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -248,7 +248,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command) else { /* Read the next FLASH byte from the current FLASH page */ - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) WriteNextResponseByte(pgm_read_byte_far(CurrAddress | HighByte)); #else WriteNextResponseByte(pgm_read_byte(CurrAddress | HighByte)); @@ -513,7 +513,7 @@ TASK(CDC_Task) } else if (Command == 'R') { - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) uint16_t ProgramWord = pgm_read_word_far(CurrAddress); #else uint16_t ProgramWord = pgm_read_word(CurrAddress); diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 11177c5a6..1850803d4 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -342,7 +342,7 @@ void EVENT_USB_UnhandledControlPacket(void) } /* Read the flash word and send it via USB to the host */ - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) Endpoint_Write_Word_LE(pgm_read_word_far(CurrFlashAddress.Long)); #else Endpoint_Write_Word_LE(pgm_read_word(CurrFlashAddress.Long)); @@ -585,7 +585,7 @@ static void ProcessMemReadCommand(void) while (CurrFlashAddress < BOOT_START_ADDR) { /* Check if the current byte is not blank */ - #if defined(RAMPZ) + #if (FLASHEND > 0xFFFF) if (pgm_read_byte_far(CurrFlashAddress) != 0xFF) #else if (pgm_read_byte(CurrFlashAddress) != 0xFF) -- cgit v1.2.3