소스 검색

add mmc and fat layer

David Voswinkel 15 년 전
부모
커밋
82f8229c8f
7개의 변경된 파일751개의 추가작업 그리고 891개의 파일을 삭제
  1. 1 1
      avr/usbload/Makefile
  2. 286 0
      avr/usbload/fat.c
  3. 107 0
      avr/usbload/fat.h
  4. 55 11
      avr/usbload/main.c
  5. 259 0
      avr/usbload/mmc.c
  6. 43 0
      avr/usbload/mmc.h
  7. 0 879
      quickdev16.tmproj

+ 1 - 1
avr/usbload/Makefile

@@ -30,7 +30,7 @@ SIZE    = avr-size
 ifeq ($(DEBUG),1)
     LDFLAGS =  -Wl,-u,vfprintf -lprintf_flt 
     CFLAGS  = -Iusbdrv -I. -DDEBUG_LEVEL=0 
-    OBJECTS = usbdrv/usbdrv.o usbdrv/usbdrvasm.o usbdrv/oddebug.o  main.o usb_bulk.o uart.o fifo.o sram.o crc.o debug.o dump.o timer.o watchdog.o rle.c loader.o info.o shared_memory.o
+    OBJECTS = usbdrv/usbdrv.o usbdrv/usbdrvasm.o usbdrv/oddebug.o  main.o usb_bulk.o uart.o fifo.o sram.o crc.o debug.o dump.o timer.o watchdog.o rle.c loader.o info.o shared_memory.o mmc.o fat.o
 else 
     LDFLAGS =  -Wl,-u
     CFLAGS  = -Iusbdrv -I. -DDEBUG_LEVEL=0 -DNO_DEBUG -DNO_INFO

+ 286 - 0
avr/usbload/fat.c

@@ -0,0 +1,286 @@
+/*
+ * ####################################################################################### FAT for AVR (MMC/SD)   Copyright (C) 2004
+ * Ulrich Radig  Bei Fragen und Verbesserungen wendet euch per EMail an  mail@ulrichradig.de  oder im Forum meiner Web Page :
+ * www.ulrichradig.de   Dieses Programm ist freie Software. Sie können es unter den Bedingungen der  GNU General Public License, wie
+ * von der Free Software Foundation veröffentlicht,  weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder  (nach
+ * Ihrer Option) jeder späteren Version.   Die Veröffentlichung dieses Programms erfolgt in der Hoffnung,  daß es Ihnen von Nutzen sein
+ * wird, aber OHNE IRGENDEINE GARANTIE,  sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT  FÜR EINEN BESTIMMTEN
+ * ZWECK. Details finden Sie in der GNU General Public License.   Sie sollten eine Kopie der GNU General Public License zusammen mit
+ * diesem  Programm erhalten haben.  Falls nicht, schreiben Sie an die Free Software Foundation,  Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.  #######################################################################################
+ */
+
+#include "fat.h"
+unsigned char cluster_size;
+unsigned int fat_offset;
+unsigned int cluster_offset;
+unsigned int volume_boot_record_addr;
+
+    // ############################################################################
+    // Auslesen Cluster Size der MMC/SD Karte und Speichern der größe ins EEprom
+    // Auslesen Cluster Offset der MMC/SD Karte und Speichern der größe ins EEprom
+void fat_init(uint8_t * Buffer)
+// ############################################################################
+{
+    struct BootSec *bootp;      // Zeiger auf Bootsektor Struktur
+
+    // unsigned char Buffer[BlockSize];
+
+    // volume_boot_record_addr = fat_addr (Buffer); 
+    mmc_read_sector(MASTER_BOOT_RECORD, Buffer);        // Read Master Boot Record 
+    if (Buffer[510] == 0x55 && Buffer[511] == 0xAA) {
+        FAT_DEBUG("MBR Signatur found!\r\n");
+    }
+
+    else {
+        FAT_DEBUG("MBR Signatur not found!\r\n");
+        while (1);
+    }
+    volume_boot_record_addr = Buffer[VBR_ADDR] + (Buffer[VBR_ADDR + 1] << 8);
+    mmc_read_sector(volume_boot_record_addr, Buffer);
+    if (Buffer[510] == 0x55 && Buffer[511] == 0xAA) {
+        FAT_DEBUG("VBR Signatur found!\r\n");
+    }
+
+    else {
+        FAT_DEBUG("VBR Signatur not found!\r\n");
+        volume_boot_record_addr = MASTER_BOOT_RECORD;   // <- added by Hennie
+        mmc_read_sector(MASTER_BOOT_RECORD, Buffer);    // Read Master Boot Record 
+    }
+    bootp = (struct BootSec *) Buffer;
+    cluster_size = bootp->BPB_SecPerClus;
+    fat_offset = bootp->BPB_RsvdSecCnt;
+    cluster_offset = ((bootp->BPB_BytesPerSec * 32) / BlockSize);
+    cluster_offset += fat_root_dir_addr(Buffer);
+}
+    // ############################################################################
+    // Auslesen der Adresse des First Root Directory von Volume Boot Record
+unsigned int fat_root_dir_addr(unsigned char *Buffer)
+// ############################################################################
+{
+    struct BootSec *bootp;      // Zeiger auf Bootsektor Struktur
+    unsigned int FirstRootDirSecNum;
+
+    // auslesen des Volume Boot Record von der MMC/SD Karte 
+    mmc_read_sector(volume_boot_record_addr, Buffer);
+    bootp = (struct BootSec *) Buffer;
+
+    // berechnet den ersten Sector des Root Directory
+    FirstRootDirSecNum = (bootp->BPB_RsvdSecCnt +
+                          (bootp->BPB_NumFATs * bootp->BPB_FATSz16));
+    FirstRootDirSecNum += volume_boot_record_addr;
+    return (FirstRootDirSecNum);
+}
+
+    // ############################################################################
+    // Ausgabe des angegebenen Directory Eintrag in Entry_Count
+    // ist kein Eintrag vorhanden, ist der Eintrag im 
+    // Rückgabe Cluster 0xFFFF. Es wird immer nur ein Eintrag ausgegeben
+    // um Speicherplatz zu sparen um es auch für kleine Atmels zu benutzen
+unsigned int fat_read_dir_ent(unsigned int dir_cluster, // Angabe Dir Cluster
+                              unsigned char Entry_Count,        // Angabe welcher Direintrag
+                              unsigned long *Size,      // Rückgabe der File Größe
+                              unsigned char *Dir_Attrib,        // Rückgabe des Dir Attributs
+                              unsigned char *Buffer)    // Working Buffer
+// ############################################################################
+{
+    unsigned char *pointer;
+    unsigned int TMP_Entry_Count = 0;
+    unsigned long Block = 0;
+    struct DirEntry *dir;       // Zeiger auf einen Verzeichniseintrag
+    unsigned int blk;
+    unsigned int a;
+    unsigned char b;
+    pointer = Buffer;
+    if (dir_cluster == 0) {
+        Block = fat_root_dir_addr(Buffer);
+    }
+
+    else {
+
+        // Berechnung des Blocks aus BlockCount und Cluster aus FATTabelle
+        // Berechnung welcher Cluster zu laden ist
+        // Auslesen der FAT - Tabelle
+        fat_load(dir_cluster, &Block, Buffer);
+        Block = ((Block - 2) * cluster_size) + cluster_offset;
+    }
+
+    // auslesen des gesamten Root Directory
+    for (blk = Block;; blk++) {
+        mmc_read_sector(blk, Buffer);   // Lesen eines Blocks des Root Directory
+        for (a = 0; a < BlockSize; a = a + 32) {
+            dir = (struct DirEntry *) &Buffer[a];       // Zeiger auf aktuellen Verzeichniseintrag holen
+            if (dir->DIR_Name[0] == 0)  // Kein weiterer Eintrag wenn erstes Zeichen des Namens 0 ist
+            {
+                return (0xFFFF);
+            }
+            // Prüfen ob es ein 8.3 Eintrag ist
+            // Das ist der Fall wenn es sich nicht um einen Eintrag für lange Dateinamen
+            // oder um einen als gelöscht markierten Eintrag handelt.
+            if ((dir->DIR_Attr != ATTR_LONG_NAME) &&
+                (dir->DIR_Name[0] != DIR_ENTRY_IS_FREE)) {
+
+                // Ist es der gewünschte Verzeichniseintrag
+                if (TMP_Entry_Count == Entry_Count) {
+
+                    // Speichern des Verzeichnis Eintrages in den Rückgabe Buffer
+                    for ( b = 0; b < 11; b++) {
+                        if (dir->DIR_Name[b] != SPACE) {
+                            if (b == 8) {
+                                *pointer++ = '.';
+                            }
+                            *pointer++ = dir->DIR_Name[b];
+                        }
+                    }
+                    *pointer++ = '\0';
+                    *Dir_Attrib = dir->DIR_Attr;
+
+                    // Speichern der Filegröße
+                    *Size = dir->DIR_FileSize;
+
+                    // Speichern des Clusters des Verzeichniseintrages
+                    dir_cluster = dir->DIR_FstClusLO;
+
+                    // Eintrag gefunden Rücksprung mit Cluster File Start
+                    return (dir_cluster);
+                }
+                TMP_Entry_Count++;
+            }
+        }
+    }
+    return (0xFFFF);            // Kein Eintrag mehr gefunden Rücksprung mit 0xFFFF
+}
+
+    // ############################################################################
+    // Auslesen der Cluster für ein File aus der FAT
+    // in den Buffer(512Byte). Bei einer 128MB MMC/SD 
+    // Karte ist die Cluster größe normalerweise 16KB groß
+    // das bedeutet das File kann max. 4MByte groß sein.
+    // Bei größeren Files muß der Buffer größer definiert
+    // werden! (Ready)
+    // Cluster = Start Clusterangabe aus dem Directory 
+void fat_load(unsigned int Cluster,     // Angabe Startcluster
+              unsigned long *Block, unsigned char *TMP_Buffer)  // Workingbuffer
+// ############################################################################
+{
+
+    // Zum Überprüfen ob der FAT Block schon geladen wurde
+    unsigned int FAT_Block_Store = 0;
+
+    // Byte Adresse innerhalb des Fat Blocks
+    unsigned int FAT_Byte_Addresse;
+
+    // FAT Block Adresse
+    unsigned int FAT_Block_Addresse;
+    unsigned int a;
+
+    // Berechnung für den ersten FAT Block (FAT Start Addresse)
+    for (a = 0;; a++) {
+        if (a == *Block) {
+            *Block = (0x0000FFFF & Cluster);
+            return;
+        }
+        if (Cluster == 0xFFFF) {
+            break;              // Ist das Ende des Files erreicht Schleife beenden
+        }
+        // Berechnung des Bytes innerhalb des FAT Block´s
+        FAT_Byte_Addresse = (Cluster * 2) % BlockSize;
+
+        // Berechnung des Blocks der gelesen werden muß
+        FAT_Block_Addresse =
+            ((Cluster * 2) / BlockSize) + volume_boot_record_addr + fat_offset;
+
+        // Lesen des FAT Blocks
+        // Überprüfung ob dieser Block schon gelesen wurde
+        if (FAT_Block_Addresse != FAT_Block_Store) {
+            FAT_Block_Store = FAT_Block_Addresse;
+
+            // Lesen des FAT Blocks
+            mmc_read_sector(FAT_Block_Addresse, TMP_Buffer);
+        }
+        // Lesen der nächsten Clusternummer
+        Cluster =
+            (TMP_Buffer[FAT_Byte_Addresse + 1] << 8) +
+            TMP_Buffer[FAT_Byte_Addresse];
+    }
+    return;
+}
+
+    // ############################################################################
+    // Lesen eines 512Bytes Blocks von einem File
+void fat_read_file(unsigned int Cluster,        // Angabe des Startclusters vom File
+                   unsigned char *Buffer,       // Workingbuffer
+                   unsigned long BlockCount)    // Angabe welcher Bock vom File geladen 
+                                                                                      // werden soll a 512 Bytes
+// ############################################################################
+{
+
+    // Berechnung des Blocks aus BlockCount und Cluster aus FATTabelle
+    // Berechnung welcher Cluster zu laden ist
+    unsigned long Block = (BlockCount / cluster_size);
+
+    // Auslesen der FAT - Tabelle
+    fat_load(Cluster, &Block, Buffer);
+    Block = ((Block - 2) * cluster_size) + cluster_offset;
+
+    // Berechnung des Blocks innerhalb des Cluster
+    Block += (BlockCount % cluster_size);
+
+    // Read Data Block from Device
+    mmc_read_sector(Block, Buffer);
+    return;
+}
+
+    // ############################################################################
+    // Lesen eines 512Bytes Blocks von einem File
+void fat_write_file(unsigned int cluster,       // Angabe des Startclusters vom File
+                    unsigned char *buffer,      // Workingbuffer
+                    unsigned long blockCount)   // Angabe welcher Bock vom File gespeichert 
+                                                                          // werden soll a 512 Bytes
+// ############################################################################
+{
+
+    // Berechnung des Blocks aus BlockCount und Cluster aus FATTabelle
+    // Berechnung welcher Cluster zu speichern ist
+    unsigned char tmp_buffer[513];
+    unsigned long block = (blockCount / cluster_size);
+
+    // Auslesen der FAT - Tabelle
+    fat_load(cluster, &block, tmp_buffer);
+    block = ((block - 2) * cluster_size) + cluster_offset;
+
+    // Berechnung des Blocks innerhalb des Cluster
+    block += (blockCount % cluster_size);
+
+    // Write Data Block to Device
+    mmc_write_sector(block, buffer);
+    return;
+}
+
+    // ####################################################################################
+    // Sucht ein File im Directory
+unsigned char fat_search_file(unsigned char *File_Name, // Name des zu suchenden Files
+                              unsigned int *Cluster,    // Angabe Dir Cluster welches
+                              // durchsucht werden soll
+                              // und Rückgabe des clusters
+                              // vom File welches gefunden
+                              // wurde
+                              unsigned long *Size,      // Rückgabe der File Größe
+                              unsigned char *Dir_Attrib,        // Rückgabe des Dir Attributs
+                              unsigned char *Buffer)    // Working Buffer
+// ####################################################################################
+{
+    unsigned int Dir_Cluster_Store = *Cluster;
+    unsigned char a ;
+    for (a = 0; a < 100; a++) {
+        *Cluster =
+            fat_read_dir_ent(Dir_Cluster_Store, a, Size, Dir_Attrib, Buffer);
+        if (*Cluster == 0xffff) {
+            return (0);         // File not Found
+        }
+        if (strcasecmp((char *) File_Name, (char *) Buffer) == 0) {
+            return (1);         // File Found
+        }
+    }
+    return (2);                 // Error
+}

+ 107 - 0
avr/usbload/fat.h

@@ -0,0 +1,107 @@
+/*
+ * ####################################################################################### Connect ARM to MMC/SD   Copyright (C) 2004
+ * Ulrich Radig #######################################################################################
+ */
+
+#ifndef _FAT_H_
+#define _FAT_H_
+#include <string.h>
+#include "mmc.h"
+#include "uart.h"
+
+#define FAT_DEBUG	uart_puts
+    // #define FAT_DEBUG(...) 
+
+    // Prototypes
+extern unsigned int fat_root_dir_addr(unsigned char *);
+extern unsigned int fat_read_dir_ent(unsigned int, unsigned char,
+                                     unsigned long *, unsigned char *,
+                                     unsigned char *);
+extern void fat_load(unsigned int, unsigned long *, unsigned char *);
+extern void fat_read_file(unsigned int, unsigned char *, unsigned long);
+extern void fat_write_file(unsigned int, unsigned char *, unsigned long);
+extern void fat_init(uint8_t * Buffer);
+extern unsigned char fat_search_file(unsigned char *, unsigned int *,
+                                     unsigned long *, unsigned char *,
+                                     unsigned char *);
+
+    // Block Size in Bytes
+#define BlockSize			512
+
+    // Master Boot Record
+#define MASTER_BOOT_RECORD	0
+
+    // Volume Boot Record location in Master Boot Record
+#define VBR_ADDR 			0x1C6
+
+    // define ASCII
+#define SPACE 				0x20
+#define DIR_ENTRY_IS_FREE   0xE5
+#define FIRST_LONG_ENTRY	0x01
+#define SECOND_LONG_ENTRY	0x42
+
+    // define DIR_Attr
+#define ATTR_LONG_NAME		0x0F
+#define ATTR_READ_ONLY		0x01
+#define ATTR_HIDDEN			0x02
+#define ATTR_SYSTEM			0x04
+#define ATTR_VOLUME_ID		0x08
+#define ATTR_DIRECTORY		0x10
+#define ATTR_ARCHIVE		0x20
+struct BootSec {
+    unsigned char BS_jmpBoot[3];
+    unsigned char BS_OEMName[8];
+    unsigned int BPB_BytesPerSec;       // 2 bytes
+    unsigned char BPB_SecPerClus;
+    unsigned int BPB_RsvdSecCnt;        // 2 bytes
+    unsigned char BPB_NumFATs;
+    unsigned int BPB_RootEntCnt;        // 2 bytes
+    unsigned int BPB_TotSec16;  // 2 bytes
+    unsigned char BPB_Media;
+    unsigned int BPB_FATSz16;   // 2 bytes
+    unsigned int BPB_SecPerTrk; // 2 bytes
+    unsigned int BPB_NumHeads;  // 2 bytes
+    unsigned long BPB_HiddSec;  // 4 bytes
+    unsigned long BPB_TotSec32; // 4 bytes
+};
+
+    // FAT12 and FAT16 Structure Starting at Offset 36
+#define BS_DRVNUM			36
+#define BS_RESERVED1		37
+#define BS_BOOTSIG			38
+#define BS_VOLID			39
+#define BS_VOLLAB			43
+#define BS_FILSYSTYPE		54
+
+    // FAT32 Structure Starting at Offset 36
+#define BPB_FATSZ32			36
+#define BPB_EXTFLAGS		40
+#define BPB_FSVER			42
+#define BPB_ROOTCLUS		44
+#define BPB_FSINFO			48
+#define BPB_BKBOOTSEC		50
+#define BPB_RESERVED		52
+
+#define FAT32_BS_DRVNUM		64
+#define FAT32_BS_RESERVED1	65
+#define FAT32_BS_BOOTSIG	66
+#define FAT32_BS_VOLID		67
+#define FAT32_BS_VOLLAB		71
+#define FAT32_BS_FILSYSTYPE	82
+    // End of Boot Sctor and BPB Structure
+struct DirEntry {
+    unsigned char DIR_Name[11]; // 8 chars filename
+    unsigned char DIR_Attr;     // file attributes RSHA, Longname, Drive Label, Directory
+    unsigned char DIR_NTRes;    // set to zero
+    unsigned char DIR_CrtTimeTenth;     // creation time part in milliseconds
+    unsigned int DIR_CrtTime;   // creation time
+    unsigned int DIR_CrtDate;   // creation date
+    unsigned int DIR_LastAccDate;       // last access date
+    unsigned int DIR_FstClusHI; // first cluster high word 
+    unsigned int DIR_WrtTime;   // last write time
+    unsigned int DIR_WrtDate;   // last write date
+    unsigned int DIR_FstClusLO; // first cluster low word 
+    unsigned long DIR_FileSize;
+};
+
+#endif                          // _FAT_H_

+ 55 - 11
avr/usbload/main.c

@@ -43,6 +43,9 @@
 #include "rle.h"
 #include "loader.h"
 #include "shared_memory.h"
+#include "mmc.h"
+#include "fat.h"
+
 
 
 extern const char _rom[] PROGMEM;
@@ -309,6 +312,53 @@ usbMsgLen_t usbFunctionSetup(uchar data[8])
 /*
  * ------------------------------------------------------------------------- 
  */
+ 
+#ifdef ENABLE_TEST
+ 
+void test_sdcard(){
+	uint16_t 	fat_cluster = 0;
+    uint8_t 	fat_attrib = 0;
+    uint32_t 	fat_size = 0;
+    uint32_t 	rom_addr = 0;
+    uint8_t 	bank_cnt = 0;
+ 	uint16_t 	crc = 0;
+	uint16_t 	block_cnt;
+    
+    #define FILENAME	"mrdo.smc"   //failed
+    #define ROMSIZE      2             // 4 == 4mbit == 512kb
+    #define BUFFER_SIZE 512
+    #define BLOCKS 		(ROMSIZE << 8)
+    
+    while ( mmc_init() !=0) {
+		info("No sdcard...\n");
+    }
+    info("MMC Init done\n");
+    fat_init(read_buffer);
+    info("FAT Init done.\n");
+    info("Look for %s\n",FILENAME);
+
+    if (fat_search_file((uint8_t*)FILENAME,
+						&fat_cluster,
+						&fat_size,
+						&fat_attrib,
+						read_buffer) == 1) {
+	   
+
+        for (block_cnt=0; block_cnt<BLOCKS; block_cnt++) {
+        	fat_read_file (fat_cluster,read_buffer,block_cnt);
+			
+			if (block_cnt && block_cnt % 64 == 0){
+				printf("Write Ram Bank: 0x%x Addr: 0x%lx Block: %x CRC: %x\n",bank_cnt,rom_addr,block_cnt,crc);
+				bank_cnt++;
+				crc = 0;
+			}
+        }
+		printf("Write Ram Bank: 0x%x Addr: 0x%lx Block: %x CRC: %x\n",bank_cnt,rom_addr,block_cnt,crc);
+		printf("Done\n");
+	}
+	
+}
+
 
 void test_read_write()
 {
@@ -381,17 +431,7 @@ void test_crc()
     info("test_crc: check\n");
     test_non_zero_memory(0x000000, 0x10000);
 }
-
-uint16_t read_byte_pgm(uint16_t addr)
-{
-    return pgm_read_byte((PGM_VOID_P) addr);
-}
-
-uint16_t read_byte_ee(uint16_t addr)
-{
-    return eeprom_read_byte((uint8_t *) addr);
-}
-
+#endif
 
 void send_reset()
 {
@@ -451,6 +491,7 @@ void boot_startup_rom()
     info("Activate AVR bus\n");
     avr_bus_active();
 
+
     info("IRQ off\n");
     snes_irq_lo();
     snes_irq_off();
@@ -494,9 +535,12 @@ int main(void)
     stdout = &uart_stdout;
 
     info("Sytem start\n");
+
+
     system_init();
 
 #if 0
+    test_sdcard();
     test_read_write();
     test_bulk_read_write();
     test_crc();

+ 259 - 0
avr/usbload/mmc.c

@@ -0,0 +1,259 @@
+/*
+ * ####################################################################################### Connect AVR to MMC/SD   Copyright (C) 2004
+ * Ulrich Radig  Bei Fragen und Verbesserungen wendet euch per EMail an  mail@ulrichradig.de  oder im Forum meiner Web Page :
+ * www.ulrichradig.de  Dieses Programm ist freie Software. Sie können es unter den Bedingungen der  GNU General Public License, wie von
+ * der Free Software Foundation veröffentlicht,  weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder  (nach Ihrer 
+ * Option) jeder späteren Version.   Die Veröffentlichung dieses Programms erfolgt in der Hoffnung,  daß es Ihnen von Nutzen sein wird,
+ * aber OHNE IRGENDEINE GARANTIE,  sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT  FÜR EINEN BESTIMMTEN ZWECK.
+ * Details finden Sie in der GNU General Public License.   Sie sollten eine Kopie der GNU General Public License zusammen mit diesem 
+ * Programm erhalten haben.  Falls nicht, schreiben Sie an die Free Software Foundation,  Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307, USA.  #######################################################################################
+ */
+
+#include "mmc.h"
+#include <util/delay.h>
+
+    // ############################################################################
+    // Routine zur Initialisierung der MMC/SD-Karte (SPI-MODE)
+unsigned char mmc_init()
+// ############################################################################
+{
+    unsigned int Timeout = 0, i;
+
+    // Konfiguration des Ports an der die MMC/SD-Karte angeschlossen wurde
+    DDRC |= ((1 << MMC_DO) | (1 << MMC_CS) | (1 << MMC_CLK));
+    DDRC &= ~(1 << MMC_DI);
+    PORTC |= ((1 << MMC_DO) | (1 << MMC_DI) | (1 << MMC_CS));
+
+    // Wartet eine kurze Zeit
+    _delay_ms(10);
+
+    // Initialisiere MMC/SD-Karte in den SPI-Mode
+    for (i = 0; i < 250; i++) {
+        PORTC ^= (1 << MMC_CLK);
+        _delay_us(4);
+    }
+    PORTC &= ~(1 << MMC_CLK);
+    _delay_us(10);
+    PORTC &= ~(1 << MMC_CS);
+    _delay_us(3);
+
+    // Sendet Commando CMD0 an MMC/SD-Karte
+    unsigned char CMD[] = { 0x40, 0x00, 0x00, 0x00, 0x00, 0x95 };
+    while (mmc_write_command(CMD) != 1) {
+        if (Timeout++ > 20) {
+            MMC_Disable();
+            printf("fail1\n");
+            return (1);         // Abbruch bei Commando1 (Return Code1)
+        }
+    }
+
+    // Sendet Commando CMD1 an MMC/SD-Karte
+    Timeout = 0;
+    CMD[0] = 0x41;              // Commando 1
+    CMD[5] = 0xFF;
+    while (mmc_write_command(CMD) != 0) {
+        if (Timeout++ > 800) {
+            MMC_Disable();
+            printf("fail2\n");
+            return (9);         // Abbruch bei Commando2 (Return Code2)
+        }
+    }
+    return (0);
+}
+
+    // ############################################################################
+    // Sendet ein Commando an die MMC/SD-Karte
+unsigned char mmc_write_command(unsigned char *cmd)
+// ############################################################################
+{
+    unsigned char tmp = 0xff;
+    unsigned int Timeout = 0;
+    unsigned char a;
+
+    // sendet 6 Byte Commando
+    for (a = 0; a < 0x06; a++)  // sendet 6 Byte Commando zur MMC/SD-Karte
+    {
+        mmc_write_byte(*cmd++);
+    }
+
+    // Wartet auf ein gültige Antwort von der MMC/SD-Karte
+    while (tmp == 0xff) {
+        tmp = mmc_read_byte();
+        if (Timeout++ > 50) {
+            break;              // Abbruch da die MMC/SD-Karte nicht Antwortet
+        }
+    }
+    return (tmp);
+}
+
+    // ############################################################################
+    // Routine zum Empfangen eines Bytes von der MMC-Karte 
+unsigned char mmc_read_byte(void)
+// ############################################################################
+{
+    uint8_t Byte = 0, j;
+    for (j = 0; j < 8; j++) {
+        Byte = (Byte << 1);
+        PORTC |= (1 << MMC_CLK);
+        _delay_us(4);
+        if (PINC & (1 << MMC_DI)) {
+            Byte |= 1;
+        }
+
+        else {
+            Byte &= ~1;
+        }
+        PORTC &= ~(1 << MMC_CLK);
+        _delay_us(4);
+    }
+    return (Byte);
+}
+
+    // ############################################################################
+    // Routine zum Senden eines Bytes zur MMC-Karte
+void mmc_write_byte(unsigned char Byte)
+// ############################################################################
+{
+    uint8_t i;
+    for (i = 0; i < 8; i++) {
+        if (Byte & 0x80) {
+            PORTC |= (1 << MMC_DO);
+        }
+
+        else {
+            PORTC &= ~(1 << MMC_DO);
+        }
+        Byte = (Byte << 1);
+        PORTC |= (1 << MMC_CLK);
+        _delay_us(4);
+        PORTC &= ~(1 << MMC_CLK);
+        _delay_us(4);
+    }
+    PORTC |= (1 << MMC_DO);
+}
+
+    // ############################################################################
+    // Routine zum schreiben eines Blocks(512Byte) auf die MMC/SD-Karte
+unsigned char mmc_write_sector(unsigned long addr, unsigned char *Buffer)
+// ############################################################################
+{
+    unsigned char tmp;
+
+    // Commando 24 zum schreiben eines Blocks auf die MMC/SD - Karte
+    unsigned char cmd[] = { 0x58, 0x00, 0x00, 0x00, 0x00, 0xFF };
+    unsigned char a;
+    unsigned int i;
+
+    /*
+     * Die Adressierung der MMC/SD-Karte wird in Bytes angegeben, addr wird von Blocks zu Bytes umgerechnet danach werden  diese in
+     * das Commando eingefügt
+     */
+    addr = addr << 9;           // addr = addr * 512
+    cmd[1] = ((addr & 0xFF000000) >> 24);
+    cmd[2] = ((addr & 0x00FF0000) >> 16);
+    cmd[3] = ((addr & 0x0000FF00) >> 8);
+
+    // Sendet Commando cmd24 an MMC/SD-Karte (Write 1 Block/512 Bytes)
+    tmp = mmc_write_command(cmd);
+    if (tmp != 0) {
+        return (tmp);
+    }
+    // Wartet einen Moment und sendet einen Clock an die MMC/SD-Karte
+    for (a = 0; a < 100; a++) {
+        mmc_read_byte();
+    }
+
+    // Sendet Start Byte an MMC/SD-Karte
+    mmc_write_byte(0xFE);
+
+    // Schreiben des Bolcks (512Bytes) auf MMC/SD-Karte
+    for (a = 0; i < 512; i++) {
+        mmc_write_byte(*Buffer++);
+    }
+
+    // CRC-Byte schreiben
+    mmc_write_byte(0xFF);       // Schreibt Dummy CRC
+    mmc_write_byte(0xFF);       // CRC Code wird nicht benutzt
+
+    // Fehler beim schreiben? (Data Response XXX00101 = OK)
+    if ((mmc_read_byte() & 0x1F) != 0x05)
+        return (1);
+
+    // Wartet auf MMC/SD-Karte Bussy
+    while (mmc_read_byte() != 0xff) {
+    };
+    return (0);
+}
+
+    // ############################################################################
+    // Routine zum lesen des CID Registers von der MMC/SD-Karte (16Bytes)
+void mmc_read_block(unsigned char *cmd, unsigned char *Buffer,
+                    unsigned int Bytes)
+// ############################################################################
+{
+    unsigned int a;
+
+    // Sendet Commando cmd an MMC/SD-Karte
+    if (mmc_write_command(cmd) != 0) {
+        return;
+    }
+    // Wartet auf Start Byte von der MMC/SD-Karte (FEh/Start Byte)
+    while (mmc_read_byte() != 0xfe) {
+    };
+
+    // Lesen des Bolcks (normal 512Bytes) von MMC/SD-Karte
+    for (a = 0; a < Bytes; a++) {
+        *Buffer++ = mmc_read_byte();
+    }
+
+    // CRC-Byte auslesen
+    mmc_read_byte();            // CRC - Byte wird nicht ausgewertet
+    mmc_read_byte();            // CRC - Byte wird nicht ausgewertet
+    return;
+}
+
+    // ############################################################################
+    // Routine zum lesen eines Blocks(512Byte) von der MMC/SD-Karte
+unsigned char mmc_read_sector(unsigned long addr, unsigned char *Buffer)
+// ############################################################################
+{
+
+    // Commando 16 zum lesen eines Blocks von der MMC/SD - Karte
+    unsigned char cmd[] = { 0x51, 0x00, 0x00, 0x00, 0x00, 0xFF };
+
+    /*
+     * Die Adressierung der MMC/SD-Karte wird in Bytes angegeben, addr wird von Blocks zu Bytes umgerechnet danach werden  diese in
+     * das Commando eingefügt
+     */
+    addr = addr << 9;           // addr = addr * 512
+    cmd[1] = ((addr & 0xFF000000) >> 24);
+    cmd[2] = ((addr & 0x00FF0000) >> 16);
+    cmd[3] = ((addr & 0x0000FF00) >> 8);
+    mmc_read_block(cmd, Buffer, 512);
+    return (0);
+}
+
+    // ############################################################################
+    // Routine zum lesen des CID Registers von der MMC/SD-Karte (16Bytes)
+unsigned char mmc_read_cid(unsigned char *Buffer)
+// ############################################################################
+{
+
+    // Commando zum lesen des CID Registers
+    unsigned char cmd[] = { 0x4A, 0x00, 0x00, 0x00, 0x00, 0xFF };
+    mmc_read_block(cmd, Buffer, 16);
+    return (0);
+}
+
+    // ############################################################################
+    // Routine zum lesen des CSD Registers von der MMC/SD-Karte (16Bytes)
+unsigned char mmc_read_csd(unsigned char *Buffer)
+// ############################################################################
+{
+
+    // Commando zum lesen des CSD Registers
+    unsigned char cmd[] = { 0x49, 0x00, 0x00, 0x00, 0x00, 0xFF };
+    mmc_read_block(cmd, Buffer, 16);
+    return (0);
+}

+ 43 - 0
avr/usbload/mmc.h

@@ -0,0 +1,43 @@
+/*
+ * ####################################################################################### Connect ARM to MMC/SD   Copyright (C) 2004
+ * Ulrich Radig #######################################################################################
+ */
+
+#ifndef _MMC_H_
+#define _MMC_H_
+
+#include <avr/io.h>
+
+    // #define SPI_Mode 1 //1 = Hardware SPI | 0 = Software SPI
+//#define SPI_Mode			1
+
+#define MMC_Write			PORTB   // Port an der die MMC/SD-Karte angeschlossen ist also des SPI
+#define MMC_Read			PINB
+#define MMC_Direction_REG	DDRB
+
+#define MMC_CS  PB4
+#define MMC_DO  PB6
+#define MMC_DI  PB5
+#define MMC_CLK PB7
+//#define SPI_SS  PC4             // Nicht Benutz muß aber definiert werden
+
+    // Prototypes
+extern unsigned char mmc_read_byte(void);
+extern void mmc_write_byte(unsigned char);
+extern void mmc_read_block(unsigned char *, unsigned char *, unsigned in);
+extern unsigned char mmc_init(void);
+extern unsigned char mmc_read_sector(unsigned long, unsigned char *);
+extern unsigned char mmc_write_sector(unsigned long, unsigned char *);
+extern unsigned char mmc_write_command(unsigned char *);
+extern unsigned char mmc_read_csd(unsigned char *);
+extern unsigned char mmc_read_cid(unsigned char *);
+
+    // set MMC_Chip_Select to high (MMC/SD-Karte Inaktiv)
+#define MMC_Disable() MMC_Write|= (1<<MMC_CS);
+
+    // set MMC_Chip_Select to low (MMC/SD-Karte Aktiv)
+#define MMC_Enable() MMC_Write&=~(1<<MMC_CS);
+
+#define nop()  __asm__ __volatile__ ("nop" ::)
+
+#endif                          // _MMC_H_

+ 0 - 879
quickdev16.tmproj

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>currentDocument</key>
-	<string>avr/usbload/main.c</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -21,616 +19,6 @@
 	<integer>271</integer>
 	<key>metaData</key>
 	<dict>
-		<key>avr/bootloader/config.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>22</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/Makefile</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>11</integer>
-				<key>line</key>
-				<integer>18</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>1</integer>
-		</dict>
-		<key>avr/usbload/commandline/Makefile</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>24</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/commandline/opendevice.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>26</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>3</integer>
-				<key>line</key>
-				<integer>19</integer>
-			</dict>
-		</dict>
-		<key>avr/usbload/commandline/snesuploader.ll</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>36</integer>
-				<key>line</key>
-				<integer>9</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/config.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>23</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/crc.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>31</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>21</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>31</integer>
-			</dict>
-		</dict>
-		<key>avr/usbload/debug.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>31</integer>
-				<key>line</key>
-				<integer>39</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/debug.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>6</integer>
-				<key>line</key>
-				<integer>30</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>4</integer>
-				<key>line</key>
-				<integer>30</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>11</integer>
-				<key>line</key>
-				<integer>30</integer>
-			</dict>
-		</dict>
-		<key>avr/usbload/dump.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>26</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/dump.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>19</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/fifo.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>17</integer>
-				<key>line</key>
-				<integer>22</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/info.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>4</integer>
-				<key>line</key>
-				<integer>33</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/info.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>22</integer>
-				<key>line</key>
-				<integer>32</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/loader.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>1664</integer>
-		</dict>
-		<key>avr/usbload/loader.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/main.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>452</integer>
-		</dict>
-		<key>avr/usbload/requests.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>19</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/rle.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>14</integer>
-		</dict>
-		<key>avr/usbload/rle.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/shared_memory.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>46</integer>
-		</dict>
-		<key>avr/usbload/shared_memory.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/sram.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>32</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/sram.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>19</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/timer.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>31</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>22</integer>
-		</dict>
-		<key>avr/usbload/timer.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>29</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>29</integer>
-			</dict>
-		</dict>
-		<key>avr/usbload/uart.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>26</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/usb_bulk.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>37</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>avr/usbload/watchdog.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>22</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>poc/avr_sdcard/checksize</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>poc/avr_sdcard/fat.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>poc/avr_sdcard/fat.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>poc/avr_sdcard/main.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>422</integer>
-		</dict>
-		<key>poc/avr_sdcard/main.lst</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>405</integer>
-		</dict>
-		<key>poc/avr_sdcard/main.map</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>526</integer>
-		</dict>
-		<key>poc/avr_sdcard/main.sym</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>poc/avr_sdcard/mmc.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>16</integer>
-				<key>line</key>
-				<integer>292</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>5</integer>
-		</dict>
-		<key>poc/avr_sdcard/mmc.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>24</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>4</integer>
-		</dict>
-		<key>scripts/conv_rle.py</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>32</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>7</integer>
-		</dict>
 		<key>snes/banktest/LoadGraphics.asm</key>
 		<dict>
 			<key>caret</key>
@@ -659,274 +47,7 @@
 			<key>firstVisibleLine</key>
 			<integer>211</integer>
 		</dict>
-		<key>snes/loader/main.asm</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>14</integer>
-				<key>line</key>
-				<integer>232</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>259</integer>
-		</dict>
-		<key>snes/loader/routines/joypadread.asm</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>75</integer>
-		</dict>
-		<key>snes/loader/routines/menusystem.asm</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>655</integer>
-		</dict>
-		<key>snes/loader/routines/miscdata.asm</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>5</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/Makefile_ata</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/Makefile_cfc</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/Makefile_cfmm</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/Makefile_mmc</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/cfmm.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/ff.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/ff.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/ffsample/avr/main.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>30</integer>
-				<key>line</key>
-				<integer>177</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>152</integer>
-		</dict>
-		<key>tools/ffsample/avr/mmc.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>15</integer>
-		</dict>
-		<key>tools/ffsample/avr/rtc.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>tools/huffman/huffman-encode.c</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>14</integer>
-				<key>line</key>
-				<integer>443</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>418</integer>
-		</dict>
 	</dict>
-	<key>openDocuments</key>
-	<array>
-		<string>snes/loader/main.asm</string>
-		<string>snes/loader/routines/joypadread.asm</string>
-		<string>snes/loader/routines/menusystem.asm</string>
-		<string>snes/loader/routines/miscdata.asm</string>
-		<string>avr/usbload/main.c</string>
-		<string>tools/huffman/huffman-encode.c</string>
-		<string>scripts/conv_rle.py</string>
-		<string>avr/usbload/loader.h</string>
-		<string>poc/avr_sdcard/fat.h</string>
-		<string>poc/avr_sdcard/fat.c</string>
-		<string>poc/avr_sdcard/main.c</string>
-		<string>poc/avr_sdcard/mmc.c</string>
-		<string>poc/avr_sdcard/main.sym</string>
-		<string>poc/avr_sdcard/mmc.h</string>
-		<string>poc/avr_sdcard/main.map</string>
-		<string>poc/avr_sdcard/main.lst</string>
-		<string>tools/ffsample/avr/Makefile_ata</string>
-		<string>tools/ffsample/avr/ff.h</string>
-		<string>tools/ffsample/avr/ff.c</string>
-		<string>tools/ffsample/avr/Makefile_mmc</string>
-		<string>tools/ffsample/avr/Makefile_cfc</string>
-		<string>tools/ffsample/avr/Makefile_cfmm</string>
-		<string>tools/ffsample/avr/rtc.c</string>
-		<string>tools/ffsample/avr/mmc.c</string>
-		<string>tools/ffsample/avr/main.c</string>
-		<string>tools/ffsample/avr/cfmm.c</string>
-		<string>poc/avr_sdcard/checksize</string>
-		<string>avr/usbload/loader.c</string>
-		<string>avr/usbload/timer.h</string>
-		<string>avr/usbload/timer.c</string>
-		<string>avr/usbload/uart.c</string>
-		<string>avr/usbload/usb_bulk.c</string>
-		<string>avr/usbload/watchdog.c</string>
-		<string>avr/usbload/debug.h</string>
-		<string>avr/usbload/debug.c</string>
-		<string>avr/usbload/fifo.c</string>
-		<string>avr/usbload/commandline/Makefile</string>
-		<string>avr/usbload/info.c</string>
-		<string>avr/usbload/dump.h</string>
-		<string>avr/usbload/info.h</string>
-		<string>avr/bootloader/config.h</string>
-		<string>avr/usbload/config.h</string>
-		<string>avr/usbload/Makefile</string>
-		<string>avr/usbload/shared_memory.c</string>
-		<string>avr/usbload/shared_memory.h</string>
-		<string>avr/usbload/commandline/opendevice.c</string>
-		<string>avr/usbload/sram.h</string>
-		<string>avr/usbload/requests.h</string>
-		<string>avr/usbload/rle.c</string>
-		<string>avr/usbload/sram.c</string>
-		<string>avr/usbload/rle.h</string>
-		<string>avr/usbload/dump.c</string>
-		<string>avr/usbload/crc.c</string>
-		<string>avr/usbload/commandline/snesuploader.ll</string>
-	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>showFileHierarchyPanel</key>