From d67158f5238359ebf487098d5c63831ee58054fd Mon Sep 17 00:00:00 2001 From: optixx Date: Thu, 27 Aug 2009 19:02:27 +0200 Subject: [PATCH] change counter down io to bootloader enable --- avr/bootloader/avr.mk | 2 +- avr/usbload/sram.c | 9 +- avr/usbload/sram.h | 30 +- quickdev16.tmproj | 756 ++++++++++++++++-------------------------- 4 files changed, 311 insertions(+), 486 deletions(-) diff --git a/avr/bootloader/avr.mk b/avr/bootloader/avr.mk index 30f7814..cc17993 100644 --- a/avr/bootloader/avr.mk +++ b/avr/bootloader/avr.mk @@ -67,7 +67,7 @@ clean: .PHONY: all clean interactive-isp interactive-serial launch-bootloader -flash: +flash: bootloader.hex $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -U flash:w:$< flash-eeprom-%: %.eep.hex diff --git a/avr/usbload/sram.c b/avr/usbload/sram.c index 9a80ab4..38eac31 100644 --- a/avr/usbload/sram.c +++ b/avr/usbload/sram.c @@ -48,18 +48,17 @@ void system_init(void) | (1 << AVR_ADDR_SCK_PIN) | (1 << AVR_ADDR_SER_PIN) | (1 << AVR_ADDR_LOAD_PIN) - | (1 << AVR_ADDR_DOWN_PIN) - | (1 << AVR_ADDR_UP_PIN)); + | (1 << AVR_ADDR_UP_PIN)); - DDRC &= ~ (1 << SNES_WR_PIN); + DDRC &= ~ ((1 << SNES_WR_PIN) + | (1 << AVR_BTLDR_EN_PIN)); PORTC &= ~((1 << AVR_ADDR_LATCH_PIN) | (1 << AVR_ADDR_SCK_PIN) | (1 << SNES_WR_PIN)); - PORTC |= ( (1 << AVR_ADDR_DOWN_PIN) - | (1 << AVR_ADDR_UP_PIN) + PORTC |= ( (1 << AVR_ADDR_UP_PIN) | (1 << AVR_ADDR_LOAD_PIN)); //| (1 << SNES_WR_PIN)); diff --git a/avr/usbload/sram.h b/avr/usbload/sram.h index 0a3cc3a..a380641 100644 --- a/avr/usbload/sram.h +++ b/avr/usbload/sram.h @@ -40,14 +40,6 @@ #define avr_data_out() (AVR_DATA_DIR = 0xff) -#define LED_PORT PORTC -#define LED_DIR DDRC -#define LED_PIN PC7 - -#define led_on() ((LED_PORT &=~ (1 << LED_PIN)),\ - (LED_DIR &=~ (1 << LED_PIN))) -#define led_off() ((LED_PORT &=~ (1 << LED_PIN)),\ - (LED_DIR |= (1 << LED_PIN))) /* ---------------------------- PORT B ---------------------------- */ @@ -129,12 +121,14 @@ #define counter_load() ((AVR_ADDR_LOAD_PORT &= ~(1 << AVR_ADDR_LOAD_PIN)),\ (AVR_ADDR_LOAD_PORT |= (1 << AVR_ADDR_LOAD_PIN))) -#define AVR_ADDR_DOWN_PORT PORTC -#define AVR_ADDR_DOWN_DIR DDRC -#define AVR_ADDR_DOWN_PIN PC1 +#define AVR_BTLDR_EN_PORT PORTC +#define AVR_BTLDR_EN_DIR DDRC +#define AVR_BTLDR_EN_PIN PC1 + +#define btldr_down() ((AVR_BTLDR_EN_PORT &= ~(1 << AVR_BTLDR_EN_PIN)),\ + (AVR_BTLDR_EN_PORT |= (1 << AVR_BTLDR_EN_PIN))) + -#define counter_down() ((AVR_ADDR_DOWN_PORT &= ~(1 << AVR_ADDR_DOWN_PIN)),\ - (AVR_ADDR_DOWN_PORT |= (1 << AVR_ADDR_DOWN_PIN))) #define AVR_ADDR_UP_PORT PORTC #define AVR_ADDR_UP_DIR DDRC @@ -147,6 +141,16 @@ #define SNES_WR_DIR DDRC #define SNES_WR_PIN PC3 +#define LED_PORT PORTC +#define LED_DIR DDRC +#define LED_PIN PC7 + +#define led_on() ((LED_PORT &=~ (1 << LED_PIN)),\ + (LED_DIR &=~ (1 << LED_PIN))) +#define led_off() ((LED_PORT &=~ (1 << LED_PIN)),\ + (LED_DIR |= (1 << LED_PIN))) + + /* ---------------------------- PORT D ---------------------------- */ #define AVR_SNES_PORT PORTD diff --git a/quickdev16.tmproj b/quickdev16.tmproj index 6cb80c1..dad339f 100644 --- a/quickdev16.tmproj +++ b/quickdev16.tmproj @@ -3,7 +3,7 @@ currentDocument - avr/usbload/main.c + avr/bootloader/usbconfig.h documents @@ -21,6 +21,20 @@ 271 metaData + avr/bootloader/bootloader.c + + caret + + column + 0 + line + 268 + + firstVisibleColumn + 0 + firstVisibleLine + 64 + avr/bootloader/config.h caret @@ -35,72 +49,70 @@ firstVisibleLine 0 - avr/usbload/Makefile - - caret - - column - 11 - line - 18 - - firstVisibleColumn - 0 - firstVisibleLine - 1 - - avr/usbload/commandline/Makefile + avr/bootloader/interrupts.S caret column 0 line - 24 + 0 firstVisibleColumn 0 firstVisibleLine 0 - avr/usbload/commandline/opendevice.c + avr/bootloader/usbconfig.h caret column - 0 + 39 line - 0 + 50 - columnSelection - firstVisibleColumn 0 firstVisibleLine - 26 - selectFrom - - column - 0 - line - 0 - - selectTo - - column - 3 - line - 19 - + 144 - avr/usbload/commandline/snesuploader.ll + avr/usbload/checksize caret column - 36 + 0 line - 9 + 12 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + avr/usbload/command.c + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 10 + + avr/usbload/command.h + + caret + + column + 0 + line + 0 firstVisibleColumn 0 @@ -114,7 +126,7 @@ column 0 line - 23 + 48 firstVisibleColumn 0 @@ -126,30 +138,28 @@ caret column - 0 + 20 line - 31 + 81 + + firstVisibleColumn + 0 + firstVisibleLine + 41 + + avr/usbload/crc.h + + caret + + column + 26 + line + 6 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom - - column - 0 - line - 21 - - selectTo - - column - 0 - line - 31 - avr/usbload/debug.c @@ -170,9 +180,9 @@ caret column - 6 + 0 line - 30 + 33 columnSelection @@ -183,16 +193,16 @@ selectFrom column - 4 + 0 line - 30 + 31 selectTo column - 11 + 0 line - 30 + 33 avr/usbload/dump.c @@ -200,14 +210,30 @@ caret column - 0 + 13 line - 26 + 67 + columnSelection + firstVisibleColumn 0 firstVisibleLine - 0 + 31 + selectFrom + + column + 5 + line + 67 + + selectTo + + column + 16 + line + 67 + avr/usbload/dump.h @@ -216,7 +242,7 @@ column 0 line - 19 + 0 firstVisibleColumn 0 @@ -237,6 +263,20 @@ firstVisibleLine 0 + avr/usbload/fifo.h + + caret + + column + 0 + line + 19 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + avr/usbload/info.c caret @@ -277,7 +317,7 @@ firstVisibleColumn 0 firstVisibleLine - 1664 + 443 avr/usbload/loader.h @@ -298,42 +338,14 @@ caret column - 0 + 10 line - 0 + 362 firstVisibleColumn 0 firstVisibleLine - 452 - - avr/usbload/requests.h - - caret - - column - 0 - line - 19 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/rle.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 14 + 342 avr/usbload/rle.h @@ -354,28 +366,28 @@ caret column - 0 + 41 line - 0 + 135 firstVisibleColumn 0 firstVisibleLine - 46 + 108 avr/usbload/shared_memory.h caret column - 0 + 50 line - 0 + 50 firstVisibleColumn 0 firstVisibleLine - 0 + 22 avr/usbload/sram.c @@ -384,7 +396,7 @@ column 0 line - 32 + 296 firstVisibleColumn 0 @@ -398,7 +410,35 @@ column 0 line - 19 + 204 + + firstVisibleColumn + 0 + firstVisibleLine + 158 + + avr/usbload/testing.c + + caret + + column + 0 + line + 106 + + firstVisibleColumn + 0 + firstVisibleLine + 55 + + avr/usbload/testing.h + + caret + + column + 0 + line + 0 firstVisibleColumn 0 @@ -410,14 +450,14 @@ caret column - 0 + 44 line - 31 + 74 firstVisibleColumn 0 firstVisibleLine - 22 + 38 avr/usbload/timer.h @@ -428,26 +468,10 @@ line 29 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom - - column - 0 - line - 0 - - selectTo - - column - 0 - line - 29 - avr/usbload/uart.c @@ -456,12 +480,12 @@ column 0 line - 26 + 34 firstVisibleColumn 0 firstVisibleLine - 0 + 44 avr/usbload/usb_bulk.c @@ -470,12 +494,26 @@ column 0 line - 37 + 74 firstVisibleColumn 0 firstVisibleLine + 40 + + avr/usbload/usbconfig.h + + caret + + column + 34 + line + 252 + + firstVisibleColumn 0 + firstVisibleLine + 231 avr/usbload/watchdog.c @@ -491,7 +529,7 @@ firstVisibleLine 0 - poc/avr_sdcard/checksize + avr/usbload/watchdog.h caret @@ -512,7 +550,7 @@ column 0 line - 0 + 38 firstVisibleColumn 0 @@ -524,28 +562,60 @@ caret column - 0 + 4 line - 0 + 63 + columnSelection + firstVisibleColumn 0 firstVisibleLine - 0 + 23 + selectFrom + + column + 1 + line + 63 + + selectTo + + column + 9 + line + 63 + poc/avr_sdcard/main.c caret column - 0 + 12 line - 0 + 170 + columnSelection + firstVisibleColumn 0 firstVisibleLine - 422 + 137 + selectFrom + + column + 1 + line + 170 + + selectTo + + column + 20 + line + 170 + poc/avr_sdcard/main.lst @@ -559,78 +629,22 @@ firstVisibleColumn 0 firstVisibleLine - 405 - - poc/avr_sdcard/main.map - - caret - - column - 0 - line - 0 - - firstVisibleColumn 0 - firstVisibleLine - 526 - poc/avr_sdcard/main.sym + poc/avr_usbload/sram.c caret column - 0 + 17 line - 0 + 5 firstVisibleColumn 0 firstVisibleLine 0 - poc/avr_sdcard/mmc.c - - caret - - column - 16 - line - 292 - - firstVisibleColumn - 0 - firstVisibleLine - 5 - - poc/avr_sdcard/mmc.h - - caret - - column - 0 - line - 24 - - firstVisibleColumn - 0 - firstVisibleLine - 4 - - scripts/conv_rle.py - - caret - - column - 0 - line - 32 - - firstVisibleColumn - 0 - firstVisibleLine - 7 - snes/banktest/LoadGraphics.asm caret @@ -659,21 +673,7 @@ firstVisibleLine 211 - snes/loader/main.asm - - caret - - column - 14 - line - 232 - - firstVisibleColumn - 0 - firstVisibleLine - 259 - - snes/loader/routines/joypadread.asm + tools/ucon64/2.0/src/backup/f2a.c caret @@ -685,37 +685,9 @@ firstVisibleColumn 0 firstVisibleLine - 75 + 558 - snes/loader/routines/menusystem.asm - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 655 - - snes/loader/routines/miscdata.asm - - caret - - column - 0 - line - 5 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/Makefile_ata + tools/ucon64/2.0/src/backup/fal.c caret @@ -729,203 +701,66 @@ firstVisibleLine 0 - tools/ffsample/avr/Makefile_cfc + tools/ucon64/2.0/src/console/snes.c caret column - 0 + 28 line - 0 + 1135 firstVisibleColumn 0 firstVisibleLine - 0 - - tools/ffsample/avr/Makefile_cfmm - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/Makefile_mmc - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/cfmm.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/ff.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/ff.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/main.c - - caret - - column - 30 - line - 177 - - firstVisibleColumn - 0 - firstVisibleLine - 152 - - tools/ffsample/avr/mmc.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 15 - - tools/ffsample/avr/rtc.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/huffman/huffman-encode.c - - caret - - column - 14 - line - 443 - - firstVisibleColumn - 0 - firstVisibleLine - 418 + 1952 openDocuments - snes/loader/main.asm - snes/loader/routines/joypadread.asm - snes/loader/routines/menusystem.asm - snes/loader/routines/miscdata.asm - avr/usbload/main.c - tools/huffman/huffman-encode.c - scripts/conv_rle.py - avr/usbload/loader.h - poc/avr_sdcard/fat.h - poc/avr_sdcard/fat.c - poc/avr_sdcard/main.c - poc/avr_sdcard/mmc.c - poc/avr_sdcard/main.sym - poc/avr_sdcard/mmc.h - poc/avr_sdcard/main.map - poc/avr_sdcard/main.lst - tools/ffsample/avr/Makefile_ata - tools/ffsample/avr/ff.h - tools/ffsample/avr/ff.c - tools/ffsample/avr/Makefile_mmc - tools/ffsample/avr/Makefile_cfc - tools/ffsample/avr/Makefile_cfmm - tools/ffsample/avr/rtc.c - tools/ffsample/avr/mmc.c - tools/ffsample/avr/main.c - tools/ffsample/avr/cfmm.c - poc/avr_sdcard/checksize - avr/usbload/loader.c - avr/usbload/timer.h + avr/usbload/testing.h + avr/usbload/testing.c avr/usbload/timer.c + avr/usbload/timer.h avr/usbload/uart.c avr/usbload/usb_bulk.c avr/usbload/watchdog.c - avr/usbload/debug.h - avr/usbload/debug.c - avr/usbload/fifo.c - avr/usbload/commandline/Makefile - avr/usbload/info.c - avr/usbload/dump.h - avr/usbload/info.h + avr/usbload/watchdog.h + poc/avr_sdcard/fat.c + poc/avr_sdcard/fat.h + poc/avr_sdcard/main.lst avr/bootloader/config.h - avr/usbload/config.h - avr/usbload/Makefile - avr/usbload/shared_memory.c - avr/usbload/shared_memory.h - avr/usbload/commandline/opendevice.c - avr/usbload/sram.h - avr/usbload/requests.h - avr/usbload/rle.c - avr/usbload/sram.c - avr/usbload/rle.h - avr/usbload/dump.c + avr/bootloader/bootloader.c + avr/bootloader/usbconfig.h + avr/usbload/debug.c + avr/usbload/dump.h avr/usbload/crc.c - avr/usbload/commandline/snesuploader.ll + avr/usbload/command.h + avr/usbload/dump.c + avr/usbload/loader.h + avr/usbload/info.h + avr/usbload/loader.c + avr/usbload/fifo.c + avr/usbload/command.c + avr/usbload/debug.h + avr/usbload/rle.h + avr/usbload/config.h + tools/ucon64/2.0/src/console/snes.c + poc/avr_sdcard/main.c + poc/avr_usbload/sram.c + avr/usbload/sram.h + avr/usbload/shared_memory.h + avr/usbload/checksize + avr/usbload/shared_memory.c + avr/bootloader/interrupts.S + avr/usbload/info.c + avr/usbload/fifo.h + avr/usbload/main.c + avr/usbload/sram.c + tools/ucon64/2.0/src/backup/fal.c + tools/ucon64/2.0/src/backup/f2a.c + avr/usbload/usbconfig.h + avr/usbload/crc.h showFileHierarchyDrawer @@ -945,6 +780,13 @@ subItems + bootloader + + isExpanded + + subItems + + usbload isExpanded @@ -954,70 +796,50 @@ - poc - - isExpanded - - subItems - - avr_sdcard - - isExpanded - - subItems - - - - - scripts - - isExpanded - - subItems - - - snes - - isExpanded - - subItems - - tools isExpanded subItems - ff - - isExpanded - - subItems - - - ffsample + ucon64 isExpanded subItems - avr + 2.0 isExpanded subItems - + + src + + isExpanded + + subItems + + backup + + isExpanded + + subItems + + + console + + isExpanded + + subItems + + + + + - huffman - - isExpanded - - subItems - -