From a741a2ff3aca3470df0f7e7ab2826d0c77df52e5 Mon Sep 17 00:00:00 2001 From: optixx Date: Thu, 27 Aug 2009 22:23:06 +0200 Subject: [PATCH] fix usbconfig typo --- avr/usbload/main.c | 2 +- avr/usbload/usbconfig.h | 1 - quickdev16.tmproj | 263 +++++++++++++++++++++++++++++----------- todo.txt | 1 + 4 files changed, 196 insertions(+), 71 deletions(-) diff --git a/avr/usbload/main.c b/avr/usbload/main.c index 017e6f4..29de6fb 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -339,7 +339,7 @@ int main(void) snes_reset_off(); info("Boot startup rom\n"); boot_startup_rom(); - irq_init(); + //irq_init(); usbInit(); usb_connect(); while (1) { diff --git a/avr/usbload/usbconfig.h b/avr/usbload/usbconfig.h index ed2de59..d35e64b 100644 --- a/avr/usbload/usbconfig.h +++ b/avr/usbload/usbconfig.h @@ -248,7 +248,6 @@ section at the end of this file). * obdev's free shared VID/PID pair. See the file USBID-License.txt for * details. */ -#define USB_CFG_DEVICE_NAME 'S', 'N', 'E', 'S', 'R', 'A', 'M' #define USB_CFG_DEVICE_NAME 'Q', 'U', 'I', 'C', 'K', 'D', 'E', 'V', '1', '6' #define USB_CFG_DEVICE_NAME_LEN 10 /* Same as above for the device name. If you don't want a device name, undefine diff --git a/quickdev16.tmproj b/quickdev16.tmproj index dad339f..df54438 100644 --- a/quickdev16.tmproj +++ b/quickdev16.tmproj @@ -3,7 +3,7 @@ currentDocument - avr/bootloader/usbconfig.h + avr/usbload/irq.c documents @@ -21,6 +21,36 @@ 271 metaData + README + + caret + + column + 49 + line + 7 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 1 + line + 7 + + selectTo + + column + 49 + line + 7 + + avr/bootloader/bootloader.c caret @@ -28,12 +58,42 @@ column 0 line - 268 + 31 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 0 + line + 30 + + selectTo + + column + 0 + line + 31 + + + avr/bootloader/bootloader.hex + + caret + + column + 0 + line + 0 firstVisibleColumn 0 firstVisibleLine - 64 + 0 avr/bootloader/config.h @@ -98,35 +158,51 @@ column 0 line - 0 + 22 firstVisibleColumn 0 firstVisibleLine - 10 + 14 avr/usbload/command.h caret column - 0 + 16 line - 0 + 25 + columnSelection + firstVisibleColumn 0 firstVisibleLine 0 + selectFrom + + column + 0 + line + 0 + + selectTo + + column + 0 + line + 29 + avr/usbload/config.h caret column - 0 + 38 line - 48 + 46 firstVisibleColumn 0 @@ -305,6 +381,34 @@ firstVisibleLine 0 + avr/usbload/irq.c + + caret + + column + 0 + line + 28 + + firstVisibleColumn + 0 + firstVisibleLine + 11 + + avr/usbload/irq.h + + caret + + column + 13 + line + 22 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + avr/usbload/loader.c caret @@ -326,7 +430,7 @@ column 0 line - 0 + 9 firstVisibleColumn 0 @@ -338,14 +442,30 @@ caret column - 10 + 0 line - 362 + 30 + columnSelection + firstVisibleColumn 0 firstVisibleLine - 342 + 0 + selectFrom + + column + 0 + line + 29 + + selectTo + + column + 0 + line + 30 + avr/usbload/rle.h @@ -394,9 +514,9 @@ caret column - 0 + 24 line - 296 + 34 firstVisibleColumn 0 @@ -410,12 +530,12 @@ column 0 line - 204 + 183 firstVisibleColumn 0 firstVisibleLine - 158 + 118 avr/usbload/testing.c @@ -429,7 +549,7 @@ firstVisibleColumn 0 firstVisibleLine - 55 + 25 avr/usbload/testing.h @@ -450,14 +570,30 @@ caret column - 44 + 41 line - 74 + 61 + columnSelection + firstVisibleColumn 0 firstVisibleLine - 38 + 28 + selectFrom + + column + 0 + line + 0 + + selectTo + + column + 0 + line + 94 + avr/usbload/timer.h @@ -506,14 +642,30 @@ caret column - 34 + 80 line - 252 + 251 + columnSelection + firstVisibleColumn 0 firstVisibleLine 231 + selectFrom + + column + 32 + line + 251 + + selectTo + + column + 80 + line + 251 + avr/usbload/watchdog.c @@ -701,6 +853,20 @@ firstVisibleLine 0 + tools/ucon64/2.0/src/backup/snesram.h + + caret + + column + 38 + line + 70 + + firstVisibleColumn + 0 + firstVisibleLine + 30 + tools/ucon64/2.0/src/console/snes.c caret @@ -721,6 +887,9 @@ avr/usbload/testing.h avr/usbload/testing.c avr/usbload/timer.c + avr/usbload/irq.c + avr/bootloader/bootloader.hex + avr/usbload/irq.h avr/usbload/timer.h avr/usbload/uart.c avr/usbload/usb_bulk.c @@ -731,6 +900,7 @@ poc/avr_sdcard/main.lst avr/bootloader/config.h avr/bootloader/bootloader.c + README avr/bootloader/usbconfig.h avr/usbload/debug.c avr/usbload/dump.h @@ -749,6 +919,7 @@ poc/avr_sdcard/main.c poc/avr_usbload/sram.c avr/usbload/sram.h + tools/ucon64/2.0/src/backup/snesram.h avr/usbload/shared_memory.h avr/usbload/checksize avr/usbload/shared_memory.c @@ -796,52 +967,6 @@ - tools - - isExpanded - - subItems - - ucon64 - - isExpanded - - subItems - - 2.0 - - isExpanded - - subItems - - src - - isExpanded - - subItems - - backup - - isExpanded - - subItems - - - console - - isExpanded - - subItems - - - - - - - - - - diff --git a/todo.txt b/todo.txt index 8b13789..833b4c5 100644 --- a/todo.txt +++ b/todo.txt @@ -1 +1,2 @@ +Checkout nootloader lock fuses