diff --git a/avr/usbload/main.c b/avr/usbload/main.c index 513bfc6..ed1d196 100644 --- a/avr/usbload/main.c +++ b/avr/usbload/main.c @@ -314,10 +314,11 @@ int main(void) uart_init(); stdout = &uart_stdout; + test_sdcard(); + info("Sytem start\n"); system_init(); - test_sdcard(); #if 0 test_read_write(); test_bulk_read_write(); diff --git a/avr/usbload/mmc.c b/avr/usbload/mmc.c index c5efbad..4678a25 100755 --- a/avr/usbload/mmc.c +++ b/avr/usbload/mmc.c @@ -26,7 +26,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. #######################################################################################*/ #include - +#include #include "mmc.h" @@ -41,7 +41,7 @@ unsigned char mmc_init (){ MMC_Direction_REG |= (1< 200){ MMC_Disable(); + printf("fail1\n"); return(1); //Abbruch bei Commando1 (Return Code1) } } @@ -73,6 +74,7 @@ unsigned char mmc_init (){ while( mmc_write_command (CMD) !=0){ if (Timeout++ > 400){ MMC_Disable(); + printf("fail2\n"); return(2); //Abbruch bei Commando2 (Return Code2) } } diff --git a/avr/usbload/mmc.h b/avr/usbload/mmc.h index 833f036..aaf3ce3 100755 --- a/avr/usbload/mmc.h +++ b/avr/usbload/mmc.h @@ -13,11 +13,11 @@ Copyright (C) 2004 Ulrich Radig #define MMC_Direction_REG DDRB - #define SPI_DI 6 //Port Pin an dem Data Output der MMC/SD-Karte angeschlossen ist + #define SPI_DI 6 //Port Pin an dem Data Output der MMC/SD-Karte angeschlossen ist #define SPI_DO 5 //Port Pin an dem Data Input der MMC/SD-Karte angeschlossen ist #define SPI_Clock 7 //Port Pin an dem die Clock der MMC/SD-Karte angeschlossen ist (clk) - #define MMC_Chip_Select 4 //Port Pin an dem Chip Select der MMC/SD-Karte angeschlossen ist - #define SPI_SS 4 //Nicht Benutz mu� aber definiert werden + #define MMC_Chip_Select 4 //Port Pin an dem Chip Select der MMC/SD-Karte angeschlossen ist + //#define SPI_SS 4 //Nicht Benutz mu� aber definiert werden extern unsigned char mmc_read_byte(void); diff --git a/avr/usbload/testing.c b/avr/usbload/testing.c index 469a3a0..ece496b 100644 --- a/avr/usbload/testing.c +++ b/avr/usbload/testing.c @@ -122,10 +122,10 @@ void test_sdcard(void){ } - if (fat_initfat()){ + if (fat_initfat()==0){ printf("fatinit ok\n"); } else { - printf("fatinit failed\n"); + printf("fatinit failed\n"); return; } diff --git a/quickdev16.tmproj b/quickdev16.tmproj index 6cb80c1..176739c 100644 --- a/quickdev16.tmproj +++ b/quickdev16.tmproj @@ -2,8 +2,6 @@ - currentDocument - avr/usbload/main.c documents @@ -21,265 +19,7 @@ 271 metaData - avr/bootloader/config.h - - caret - - column - 0 - line - 22 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/Makefile - - caret - - column - 11 - line - 18 - - firstVisibleColumn - 0 - firstVisibleLine - 1 - - avr/usbload/commandline/Makefile - - caret - - column - 0 - line - 24 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/commandline/opendevice.c - - caret - - column - 0 - line - 0 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 26 - selectFrom - - column - 0 - line - 0 - - selectTo - - column - 3 - line - 19 - - - avr/usbload/commandline/snesuploader.ll - - caret - - column - 36 - line - 9 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/config.h - - caret - - column - 0 - line - 23 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/crc.c - - caret - - column - 0 - line - 31 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 0 - selectFrom - - column - 0 - line - 21 - - selectTo - - column - 0 - line - 31 - - - avr/usbload/debug.c - - caret - - column - 31 - line - 39 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/debug.h - - caret - - column - 6 - line - 30 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 0 - selectFrom - - column - 4 - line - 30 - - selectTo - - column - 11 - line - 30 - - - avr/usbload/dump.c - - caret - - column - 0 - line - 26 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/dump.h - - caret - - column - 0 - line - 19 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/fifo.c - - caret - - column - 17 - line - 22 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/info.c - - caret - - column - 4 - line - 33 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/info.h - - caret - - column - 22 - line - 32 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/loader.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 1664 - - avr/usbload/loader.h + avr/usbload/fat.h caret @@ -293,344 +33,6 @@ firstVisibleLine 0 - avr/usbload/main.c - - caret - - column - 0 - line - 0 - - 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 - - avr/usbload/rle.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/shared_memory.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 46 - - avr/usbload/shared_memory.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/sram.c - - caret - - column - 0 - line - 32 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/sram.h - - caret - - column - 0 - line - 19 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/timer.c - - caret - - column - 0 - line - 31 - - firstVisibleColumn - 0 - firstVisibleLine - 22 - - avr/usbload/timer.h - - caret - - column - 0 - line - 29 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 0 - selectFrom - - column - 0 - line - 0 - - selectTo - - column - 0 - line - 29 - - - avr/usbload/uart.c - - caret - - column - 0 - line - 26 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/usb_bulk.c - - caret - - column - 0 - line - 37 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - avr/usbload/watchdog.c - - caret - - column - 0 - line - 22 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - poc/avr_sdcard/checksize - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - poc/avr_sdcard/fat.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - poc/avr_sdcard/fat.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - poc/avr_sdcard/main.c - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 422 - - poc/avr_sdcard/main.lst - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 405 - - poc/avr_sdcard/main.map - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 526 - - poc/avr_sdcard/main.sym - - caret - - column - 0 - line - 0 - - 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,274 +61,7 @@ firstVisibleLine 211 - snes/loader/main.asm - - caret - - column - 14 - line - 232 - - firstVisibleColumn - 0 - firstVisibleLine - 259 - - snes/loader/routines/joypadread.asm - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 75 - - 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 - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/ffsample/avr/Makefile_cfc - - caret - - column - 0 - line - 0 - - 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 - - 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/timer.c - 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/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/usbload/crc.c - avr/usbload/commandline/snesuploader.ll - showFileHierarchyDrawer showFileHierarchyPanel @@ -981,7 +116,15 @@ isExpanded subItems - + + fatfstest + + isExpanded + + subItems + + + tools @@ -1011,13 +154,6 @@ - huffman - - isExpanded - - subItems - -