From 23a5b777ec15b0677d97f7845172bc37c4e0cffa Mon Sep 17 00:00:00 2001 From: David Voswinkel Date: Thu, 28 May 2009 14:45:48 +0200 Subject: [PATCH] o minor changes --- snesram.tmproj | 943 +++++++++++++++++++++++++++++++--- tools/ffsample/linux/diskio.c | 10 + 2 files changed, 882 insertions(+), 71 deletions(-) diff --git a/snesram.tmproj b/snesram.tmproj index 10cd867..67cddb7 100644 --- a/snesram.tmproj +++ b/snesram.tmproj @@ -3,7 +3,7 @@ currentDocument - snes/irqtest/debug.asm + tools/ffsample/linux/diskio.c documents @@ -77,20 +77,6 @@ firstVisibleLine 211 - snes/irqtest/LoadGraphics.asm - - caret - - column - 0 - line - 45 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - snes/irqtest/debug.asm caret @@ -98,7 +84,7 @@ column 0 line - 22 + 25 firstVisibleColumn 0 @@ -112,41 +98,57 @@ column 0 line - 36 - - firstVisibleColumn - 0 - firstVisibleLine - 9 - - snes/irqtest/init.inc - - caret - - column - 0 - line - 248 + 35 columnSelection firstVisibleColumn 0 firstVisibleLine - 211 + 9 selectFrom column - 0 + 16 line - 246 + 41 selectTo column 0 line - 248 + 35 + + + snes/irqtest/init.inc + + caret + + column + 5 + line + 13 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 2 + line + 13 + + selectTo + + column + 5 + line + 13 snes/irqtest/intro.asm @@ -166,16 +168,120 @@ snes/irqtest/irqtest.asm caret + + column + 5 + line + 116 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom column 0 line - 67 + 116 + + selectTo + + column + 10 + line + 116 + + + snes/irqtest/optixx.inc + + caret + + column + 22 + line + 0 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 22 + line + 0 + + selectTo + + column + 30 + line + 0 + + + snes/simpletest/init.inc + + caret + + column + 0 + line + 0 firstVisibleColumn 0 firstVisibleLine - 49 + 0 + + snes/simpletest/sprite.asm + + caret + + column + 0 + line + 179 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 47 + selectFrom + + column + 0 + line + 175 + + selectTo + + column + 0 + line + 179 + + + tools/bsnes/base.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 tools/bsnes/cart/cart.cpp @@ -205,64 +311,376 @@ firstVisibleLine 24 + tools/bsnes/chip/bsx/bsx.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/chip/bsx/bsx.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 26 + + tools/bsnes/chip/bsx/bsx_base.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 86 + + tools/bsnes/chip/bsx/bsx_cart.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 49 + + tools/bsnes/chip/bsx/bsx_flash.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 62 + + tools/bsnes/chip/chip.hpp + + caret + + column + 21 + line + 11 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + tools/bsnes/chip/cmmio/cmmio.cpp caret column - 1 + 35 line - 17 + 38 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom - - column - 0 - line - 17 - - selectTo - - column - 1 - line - 17 - - tools/bsnes/cpu/scpu/memory/memory.cpp + tools/bsnes/chip/cmmio/cmmio.hpp caret column - 1 + 0 line - 56 + 16 columnSelection firstVisibleColumn 0 firstVisibleLine - 56 + 0 selectFrom column 0 line - 56 + 15 selectTo column - 2 + 0 line - 56 + 16 + + + tools/bsnes/chip/dsp1/dsp1emu.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 99 + + tools/bsnes/chip/dsp2/dsp2.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/chip/dsp2/dsp2.hpp + + caret + + column + 8 + line + 21 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 4 + line + 21 + + selectTo + + column + 8 + line + 21 + + + tools/bsnes/chip/dsp2/dsp2_op.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/chip/sdd1/sdd1.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 107 + + tools/bsnes/chip/spc7110/decomp.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 224 + + tools/bsnes/chip/spc7110/decomp.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/chip/spc7110/spc7110.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 185 + + tools/bsnes/cpu/cpu.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/cpu.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/scpu/core/core.cpp + + caret + + column + 19 + line + 18 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 0 + selectFrom + + column + 13 + line + 18 + + selectTo + + column + 24 + line + 18 + + + tools/bsnes/cpu/scpu/core/core.hpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/scpu/core/op_misc.b + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/scpu/core/op_misc.cpp + + caret + + column + 36 + line + 73 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 57 + selectFrom + + column + 32 + line + 73 + + selectTo + + column + 36 + line + 73 tools/bsnes/cpu/scpu/memory/memory.hpp @@ -293,14 +711,352 @@ firstVisibleLine 459 - tools/bsnes/memory/memory.cpp + tools/bsnes/cpu/scpu/scpu.cpp caret column - 6 + 0 line - 22 + 26 + + firstVisibleColumn + 0 + firstVisibleLine + 3 + + tools/bsnes/cpu/scpu/scpu.hpp + + caret + + column + 19 + line + 90 + + firstVisibleColumn + 0 + firstVisibleLine + 43 + + tools/bsnes/cpu/scpu/timing/event.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/scpu/timing/irq.cpp + + caret + + column + 0 + line + 47 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/cpu/scpu/timing/timing.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 115 + + tools/bsnes/snes/snes.cpp + + caret + + column + 14 + line + 66 + + firstVisibleColumn + 0 + firstVisibleLine + 16 + + tools/bsnes/snes/snes.hpp + + caret + + column + 18 + line + 62 + + firstVisibleColumn + 0 + firstVisibleLine + 33 + + tools/bsnes/ui_qt/base/main.hpp + + caret + + column + 10 + line + 89 + + firstVisibleColumn + 0 + firstVisibleLine + 57 + + tools/bsnes/ui_qt/interface.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/ui_qt/main.cpp + + caret + + column + 0 + line + 103 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/bsnes/ui_qt/main.hpp + + caret + + column + 0 + line + 23 + + firstVisibleColumn + 0 + firstVisibleLine + 1 + + tools/bsnes/ui_qt/utility/cartridge.cpp + + caret + + column + 8 + line + 161 + + firstVisibleColumn + 0 + firstVisibleLine + 119 + + tools/bsnes/ui_qt/utility/utility.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 167 + + tools/bsnes/ui_qt/utility/window.cpp + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/avr/ata.c + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/avr/cfc.c + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/avr/uart.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/linux/Makefile + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/linux/diskio.c + + caret + + column + 67 + line + 50 + + firstVisibleColumn + 0 + firstVisibleLine + 25 + + tools/ffsample/linux/diskio.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/linux/ff.c + + caret + + column + 17 + line + 2006 + + columnSelection + + firstVisibleColumn + 0 + firstVisibleLine + 859 + selectFrom + + column + 10 + line + 2006 + + selectTo + + column + 17 + line + 2006 + + + tools/ffsample/linux/ff.h + + caret + + column + 26 + line + 83 + + firstVisibleColumn + 0 + firstVisibleLine + 64 + + tools/ffsample/linux/integer.h + + caret + + column + 0 + line + 0 + + firstVisibleColumn + 0 + firstVisibleLine + 0 + + tools/ffsample/linux/main.c + + caret + + column + 0 + line + 0 firstVisibleColumn 0 @@ -313,18 +1069,63 @@ snes/irqtest/debug.asm tools/bsnes/cpu/scpu/mmio/mmio.cpp tools/bsnes/chip/cmmio/cmmio.cpp - tools/bsnes/cpu/scpu/memory/memory.cpp - tools/bsnes/memory/memory.cpp - tools/bsnes/cpu/scpu/memory/memory.hpp + tools/bsnes/ui_qt/utility/window.cpp + tools/bsnes/ui_qt/utility/cartridge.cpp + tools/bsnes/ui_qt/utility/utility.cpp + tools/bsnes/ui_qt/main.cpp + tools/bsnes/snes/snes.hpp + tools/bsnes/ui_qt/main.hpp + tools/bsnes/ui_qt/base/main.hpp + tools/bsnes/chip/dsp2/dsp2.hpp + tools/bsnes/chip/dsp2/dsp2_op.cpp + tools/bsnes/chip/dsp2/dsp2.cpp snes/irqtest/irqtest.asm - snes/irqtest/intro.asm - snes/irqtest/LoadGraphics.asm + snes/irqtest/optixx.inc + tools/ffsample/linux/main.c + tools/ffsample/linux/Makefile + tools/ffsample/linux/ff.h + tools/ffsample/linux/ff.c + tools/ffsample/avr/ata.c + tools/ffsample/avr/uart.h + tools/ffsample/avr/cfc.c + tools/ffsample/linux/diskio.c + tools/ffsample/linux/integer.h + tools/ffsample/linux/diskio.h snes/irqtest/init.inc + tools/bsnes/cpu/scpu/timing/irq.cpp + tools/bsnes/cpu/scpu/core/core.cpp + tools/bsnes/cpu/scpu/core/core.hpp + tools/bsnes/cpu/cpu.cpp + tools/bsnes/cpu/cpu.hpp + tools/bsnes/cpu/scpu/scpu.cpp + tools/bsnes/cpu/scpu/scpu.hpp + tools/bsnes/snes/snes.cpp + tools/bsnes/base.hpp + tools/bsnes/chip/chip.hpp + tools/bsnes/chip/cmmio/cmmio.hpp + tools/bsnes/cpu/scpu/core/op_misc.b + tools/bsnes/cpu/scpu/core/op_misc.cpp + tools/bsnes/cpu/scpu/timing/event.cpp + tools/bsnes/cpu/scpu/timing/timing.cpp + tools/bsnes/chip/dsp1/dsp1emu.cpp + tools/bsnes/chip/spc7110/decomp.cpp + tools/bsnes/chip/sdd1/sdd1.cpp + tools/bsnes/chip/bsx/bsx.cpp + tools/bsnes/chip/bsx/bsx.hpp + tools/bsnes/chip/bsx/bsx_base.cpp + tools/bsnes/ui_qt/interface.cpp + tools/bsnes/chip/bsx/bsx_cart.cpp + tools/bsnes/chip/bsx/bsx_flash.cpp + tools/bsnes/chip/spc7110/spc7110.cpp + tools/bsnes/chip/spc7110/decomp.hpp + snes/simpletest/sprite.asm + snes/simpletest/init.inc + snes/irqtest/intro.asm snes/irqtest/header.inc showFileHierarchyDrawer windowFrame - {{0, 59}, {895, 819}} + {{0, 50}, {720, 828}} diff --git a/tools/ffsample/linux/diskio.c b/tools/ffsample/linux/diskio.c index 8661aeb..669b59d 100644 --- a/tools/ffsample/linux/diskio.c +++ b/tools/ffsample/linux/diskio.c @@ -39,6 +39,16 @@ scan_files ret + +Disk: /dev/disk1 geometry: 993/4/63 [250368 sectors] +Signature: 0xAA55 + Starting Ending + #: id cyl hd sec - cyl hd sec [ start - size] +------------------------------------------------------------------------ + 1: 0B 0 1 1 - 1023 254 63 [ 63 - 250299] Win95 FAT-32 + 2: 00 0 0 0 - 0 0 0 [ 0 - 0] unused + 3: 00 0 0 0 - 0 0 0 [ 0 - 0] unused + 4: 00 0 0 0 - 0 0 0 [ 0 - 0] unused */ /* Interface