diff --git a/snesram.tmproj b/snesram.tmproj index 72a28d8..0f8b05d 100644 --- a/snesram.tmproj +++ b/snesram.tmproj @@ -3,7 +3,7 @@ currentDocument - snes/fatfstest/integer.h + snes/fatfstest/pad.c documents @@ -35,6 +35,36 @@ firstVisibleLine 0 + poc/avr_sdcard/main.c + + caret + + column + 0 + line + 113 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 106 + selectFrom + + column + 0 + line + 146 + + selectTo + + column + 0 + line + 113 + + poc/avr_sdcard/mmc.h caret @@ -77,33 +107,215 @@ firstVisibleLine 211 - snes/fatfstest/debug.c + snes/crc/crc.c caret column - 1 - line 39 + line + 27 firstVisibleColumn 0 firstVisibleLine 0 + snes/crc/debug.c + + caret + + column + 3 + line + 6 + + firstVisibleColumn + 0 + firstVisibleLine + 2 + + snes/crc/debug.h + + caret + + column + 10 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/crc/main.c + + caret + + column + 0 + line + 49 + + firstVisibleColumn + 0 + firstVisibleLine + 20 + + snes/fatfstest/Makefile + + caret + + column + 23 + line + 72 + + firstVisibleColumn + 0 + firstVisibleLine + 29 + + snes/fatfstest/StartupSnes.asm + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 97 + + snes/fatfstest/config.h + + caret + + column + 28 + line + 17 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/crc.c + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/crc.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/data.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/debug.c + + caret + + column + 0 + line + 144 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/debug.h + + caret + + column + 32 + line + 7 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + snes/fatfstest/dis + + caret + + column + 0 + line + 32759 + + firstVisibleColumn + 0 + firstVisibleLine + 32759 + snes/fatfstest/diskio.c caret column - 25 + 6 line - 39 + 91 firstVisibleColumn 0 firstVisibleLine - 13 + 72 + + snes/fatfstest/event.c + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 39 snes/fatfstest/event.h @@ -119,14 +331,56 @@ firstVisibleLine 0 + snes/fatfstest/ff.c + + caret + + column + 0 + line + 1281 + + firstVisibleColumn + 0 + firstVisibleLine + 153 + + snes/fatfstest/ff.h + + caret + + column + 18 + line + 56 + + firstVisibleColumn + 0 + firstVisibleLine + 42 + + snes/fatfstest/hook.asm + + caret + + column + 0 + line + 7 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + snes/fatfstest/integer.h caret column - 2 + 28 line - 35 + 24 firstVisibleColumn 0 @@ -138,14 +392,28 @@ caret column - 13 + 0 line - 22 + 26 firstVisibleColumn 0 firstVisibleLine - 62 + 0 + + snes/fatfstest/myEvents.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 snes/fatfstest/pad.c @@ -161,19 +429,47 @@ firstVisibleLine 0 - tools/bsnes/cart/cart.cpp + snes/fatfstest/ressource.asm caret column 0 line - 95 + 14 firstVisibleColumn 0 firstVisibleLine - 44 + 0 + + snes/fatfstest/ressource.h + + caret + + column + 0 + line + 2 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cart/cart.cpp + + caret + + column + 24 + line + 48 + + firstVisibleColumn + 0 + firstVisibleLine + 33 tools/bsnes/cart/cart.hpp @@ -189,35 +485,77 @@ firstVisibleLine 24 - tools/bsnes/chip/fatfs/diskio.cpp + tools/bsnes/chip/fatfs/config.h caret column 0 line - 0 + 21 firstVisibleColumn 0 firstVisibleLine - 24 + 0 + + tools/bsnes/chip/fatfs/diskio.cpp + + caret + + column + 58 + line + 102 + + firstVisibleColumn + 0 + firstVisibleLine + 65 + + tools/bsnes/chip/fatfs/diskio.h + + caret + + column + 28 + line + 50 + + firstVisibleColumn + 0 + firstVisibleLine + 0 tools/bsnes/chip/fatfs/fatfs.cpp caret column - 23 + 2 line - 69 + 56 firstVisibleColumn 0 firstVisibleLine - 43 + 17 tools/bsnes/chip/fatfs/fatfs.hpp + + caret + + column + 31 + line + 10 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/chip/fatfs/integer.h caret @@ -245,22 +583,121 @@ firstVisibleLine 0 + tools/bsnes/memory/memory.cpp + + caret + + column + 6 + line + 22 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/memory/memory.hpp + + caret + + column + 31 + line + 132 + + firstVisibleColumn + 0 + firstVisibleLine + 84 + + tools/bsnes/memory/smemory/smemory.cpp + + caret + + column + 20 + line + 9 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/memory/smemory/smemory.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/linux/main.c + + caret + + column + 18 + line + 385 + + firstVisibleColumn + 0 + firstVisibleLine + 229 + openDocuments snes/fatfstest/debug.c snes/fatfstest/pad.c snes/fatfstest/diskio.c + snes/fatfstest/ff.c + tools/bsnes/memory/memory.hpp + tools/bsnes/memory/memory.cpp + tools/bsnes/memory/smemory/smemory.cpp + tools/bsnes/cart/cart.cpp + tools/bsnes/memory/smemory/smemory.hpp + snes/fatfstest/data.h + snes/fatfstest/ff.h + snes/fatfstest/event.c + snes/fatfstest/StartupSnes.asm snes/fatfstest/main.c + tools/ffsample/linux/main.c + snes/crc/crc.c + snes/crc/main.c + poc/avr_sdcard/main.c + snes/crc/debug.h + snes/crc/debug.c + snes/fatfstest/crc.h + snes/fatfstest/crc.c + snes/fatfstest/Makefile + snes/fatfstest/hook.asm + snes/fatfstest/myEvents.h + snes/fatfstest/ressource.asm + snes/fatfstest/ressource.h + snes/fatfstest/dis snes/fatfstest/event.h snes/fatfstest/integer.h tools/bsnes/chip/fatfs/fatfs.hpp + tools/bsnes/chip/fatfs/diskio.h tools/bsnes/chip/fatfs/fatfs.cpp + snes/fatfstest/debug.h + tools/bsnes/chip/fatfs/config.h + snes/fatfstest/config.h + tools/bsnes/chip/fatfs/integer.h tools/bsnes/chip/fatfs/diskio.cpp showFileHierarchyDrawer windowFrame - {{0, 60}, {1110, 818}} + {{0, 52}, {1205, 826}} diff --git a/tools/bsnes/cart/cart.cpp b/tools/bsnes/cart/cart.cpp index 60ea832..4daf269 100755 --- a/tools/bsnes/cart/cart.cpp +++ b/tools/bsnes/cart/cart.cpp @@ -46,8 +46,8 @@ void Cartridge::load_end() { memory::stAram.map(stA.ram, stA.ram_size); memory::stBrom.map(stB.rom, stB.rom_size); memory::stBram.map(stB.ram, stB.ram_size); - - memory::cartrom.write_protect(true); + /* enable rom write */ + memory::cartrom.write_protect(false); memory::cartram.write_protect(false); memory::bscram.write_protect(true); memory::stArom.write_protect(true); diff --git a/tools/bsnes/chip/fatfs/config.h b/tools/bsnes/chip/fatfs/config.h index 77ac0d0..c9b48f0 100644 --- a/tools/bsnes/chip/fatfs/config.h +++ b/tools/bsnes/chip/fatfs/config.h @@ -14,8 +14,8 @@ #define MMIO_RETVAL 0x3016 -#define SHARED_SIZE 512 -#define SHARED_ADDR 0x3f0000 +#define SHARED_MAX_SIZE 512 +#define SHARED_ADDR 0x3d0000 #undef MMIO_DEBUG #undef FATFS_DEBUG diff --git a/tools/bsnes/chip/fatfs/diskio.cpp b/tools/bsnes/chip/fatfs/diskio.cpp index 3387932..ad6c529 100644 --- a/tools/bsnes/chip/fatfs/diskio.cpp +++ b/tools/bsnes/chip/fatfs/diskio.cpp @@ -96,10 +96,11 @@ DRESULT disk_read ( DWORD offset = sector * 512; int size = count * 512; - #ifdef MMIO_DEBUG + //#ifdef MMIO_DEBUG printf("DISKIO::disk_read: sector=%li count=%i addr=%p off=%li size=%i\n",sector,count,image_addr + offset,offset,size); - #endif + //#endif memcpy(buff,image_addr + offset,size); + printf("%x %x %x %x\n",buff[0],buff[1],buff[2],buff[3]); #ifdef MMIO_DEBUG printf("DISKIO::disk_read: done\n"); #endif diff --git a/tools/bsnes/chip/fatfs/fatfs.cpp b/tools/bsnes/chip/fatfs/fatfs.cpp index 3edde01..974c7fc 100644 --- a/tools/bsnes/chip/fatfs/fatfs.cpp +++ b/tools/bsnes/chip/fatfs/fatfs.cpp @@ -13,7 +13,7 @@ void FATFS::init() { sector = 0; count = 0; retval = -1; - scratch_buffer = (unsigned char*)malloc(SHARED_SIZE); + scratch_buffer = (unsigned char*)malloc(SHARED_MAX_SIZE); } void FATFS::enable() { @@ -38,17 +38,17 @@ void FATFS::reset() { } -void FATFS::fetchMem() { - for ( int i=0;i - Open a file */ - if (!(&ptr, &p1)) break; + //if (!(&ptr, &p1)) break; while (*ptr == ' ') ptr++; - put_rc(f_open(&file1, ptr, (BYTE)p1)); + put_rc(f_open(&file1, ptr, (BYTE)FA_READ)); break; case 'c' : /* fc - Close a file */ @@ -383,7 +383,7 @@ int main (void) p2 += s2; if (cnt != s2) break; } - s2 = Timer; + s2 = Timer + 1; printf("%lu bytes read with %lu bytes/sec.\n", p2, p2 * 100 / s2); break;