Emulation of multiple SCSI targets now working.
authorMichael McMaster <michael@codesrc.com>
Fri, 5 Dec 2014 03:17:06 +0000 (13:17 +1000)
committerMichael McMaster <michael@codesrc.com>
Fri, 5 Dec 2014 03:17:06 +0000 (13:17 +1000)
The CDROM device support has a few bugs, as does scsi2sd-util

312 files changed:
CHANGELOG
software/SCSI2SD/src/cdrom.c [new file with mode: 0755]
software/SCSI2SD/src/cdrom.h [new file with mode: 0755]
software/SCSI2SD/src/config.c
software/SCSI2SD/src/config.h
software/SCSI2SD/src/diagnostic.c
software/SCSI2SD/src/disk.c
software/SCSI2SD/src/geometry.c
software/SCSI2SD/src/geometry.h
software/SCSI2SD/src/inquiry.c
software/SCSI2SD/src/mode.c
software/SCSI2SD/src/scsi.c
software/SCSI2SD/src/scsi.h
software/SCSI2SD/src/sd.c
software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoCCreatorExportIDE.xml
software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit
software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
software/SCSI2SD/v3/USB_Bootloader.cydsn/Generated_Source/PSoCCreatorExportIDE.xml
software/SCSI2SD/v3/USB_Bootloader.cydsn/USB_Bootloader.cyfit
software/SCSI2SD/v3/USB_Bootloader.cydsn/USB_Bootloader.cyprj.Micha_000
software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoCCreatorExportIDE.xml
software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit
software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
software/SCSI2SD/v4/USB_Bootloader.cydsn/USB_Bootloader.cyfit
software/build.sh
software/scsi2sd-util/ConfigUtil.cc
software/scsi2sd-util/Makefile
software/scsi2sd-util/TargetPanel.cc
software/scsi2sd-util/TargetPanel.hh
software/scsi2sd-util/build.sh [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/COPYING [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/CompressedFile.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Compressor.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Container.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Decompressor.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Doxyfile.in [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Exception.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/FileReader.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/FileWriter.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/INSTALL [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/INSTALL.Android [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Makefile.am [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Makefile.in [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/NEWS [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/README [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Reader.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/VERSION [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/Writer.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/aclocal.m4 [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/android/zipper/Android.mk [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/autoconfig.h.in [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/autogen.sh [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/config.guess [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/config.sub [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/configure [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/configure.ac [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/deflate.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/deflate.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/depcomp [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/doxygen.am [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/gzip.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/gzip.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/install-sh [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/libzipper1.pc.in [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/ltmain.sh [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/missing [new file with mode: 0755]
software/scsi2sd-util/libzipper-1.0.3/port/strerror_gnu.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/port/strerror_posix.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/split.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/strerror.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/util.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/zip.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/zip.hh [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/zipper.1.in [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/zipper.cc [new file with mode: 0644]
software/scsi2sd-util/libzipper-1.0.3/zipper.hh [new file with mode: 0644]
software/scsi2sd-util/scsi2sd-util.cc
software/scsi2sd-util/zlib-1.2.8/CMakeLists.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/ChangeLog [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/FAQ [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/INDEX [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/Makefile.in [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/adler32.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/amiga/Makefile.pup [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/amiga/Makefile.sas [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/as400/bndsrc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/as400/compile.clp [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/as400/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/as400/zlib.inc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/compress.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/configure [new file with mode: 0755]
software/scsi2sd-util/zlib-1.2.8/contrib/README.contrib [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/buffer_demo.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/mtest.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/read.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/test.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib-streams.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib-streams.ads [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib-thin.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib-thin.ads [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib.adb [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib.ads [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/ada/zlib.gpr [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/amd64/amd64-match.S [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/asm686/README.686 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/asm686/match.S [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/blast.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/blast.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/test.pk [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/blast/test.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/delphi/ZLib.pas [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/delphi/ZLibConst.pas [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/delphi/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/delphi/zlibd32.mak [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib.build [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib.chm [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib.sln [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/AssemblyInfo.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/ChecksumImpl.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/CircularBuffer.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/CodecBase.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/Deflater.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.csproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/GZipStream.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/Inflater.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/DotZLib/UnitTests.cs [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/LICENSE_1_0.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/dotzlib/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/gcc_gvmat64/gvmat64.S [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/infback9.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/infback9.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/inffix9.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/inflate9.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/inftree9.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/infback9/inftree9.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/inflate86/inffas86.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/inflate86/inffast.S [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream/test.cpp [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream/zfstream.cpp [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream/zfstream.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream2/zstream.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream2/zstream_test.cpp [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream3/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream3/TODO [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream3/test.cc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream3/zfstream.cc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/iostream3/zfstream.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx64/bld_ml64.bat [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx64/gvmat64.asm [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx64/inffas8664.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx64/inffasx64.asm [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx64/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx86/bld_ml32.bat [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx86/inffas32.asm [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx86/match686.asm [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/masmx86/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/Makefile.am [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/MiniZip64_Changes.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/MiniZip64_info.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/configure.ac [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/crypt.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/ioapi.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/ioapi.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/iowin32.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/iowin32.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/make_vms.com [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/miniunz.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/miniunzip.1 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/minizip.1 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/minizip.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/minizip.pc.in [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/mztools.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/mztools.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/unzip.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/unzip.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/zip.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/minizip/zip.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/pascal/example.pas [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/pascal/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/pascal/zlibd32.mak [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/pascal/zlibpas.pas [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/puff.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/puff.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/pufftest.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/puff/zeros.raw [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/testzlib/testzlib.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/testzlib/testzlib.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/untgz/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/untgz/Makefile.msc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/untgz/untgz.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/readme.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlib.rc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.def [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.sln [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj.filters [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/miniunz.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/minizip.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/testzlib.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/testzlibdll.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/zlib.rc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/zlibstat.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/zlibvc.def [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/zlibvc.sln [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc11/zlibvc.vcxproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/miniunz.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/minizip.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/testzlib.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/testzlibdll.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/zlib.rc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.def [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.sln [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.vcproj [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/crc32.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/crc32.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/deflate.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/deflate.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/doc/algorithm.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/doc/rfc1950.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/doc/rfc1951.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/doc/rfc1952.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/doc/txtvsbin.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/README.examples [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/enough.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/fitblk.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/gun.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/gzappend.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/gzjoin.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/gzlog.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/gzlog.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/zlib_how.html [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/zpipe.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/examples/zran.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/gzclose.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/gzguts.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/gzlib.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/gzread.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/gzwrite.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/infback.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inffast.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inffast.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inffixed.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inflate.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inflate.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inftrees.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/inftrees.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/make_vms.com [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/msdos/Makefile.bor [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/msdos/Makefile.dj2 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/msdos/Makefile.emx [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/msdos/Makefile.msc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/msdos/Makefile.tc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/nintendods/Makefile [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/nintendods/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/Makefile.emx [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/Makefile.riscos [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/README [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/descrip.mms [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/os2/Makefile.os2 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/os2/zlib.def [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/old/visual-basic.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/qnx/package.qpg [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/test/example.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/test/infcover.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/test/minigzip.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/treebuild.xml [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/trees.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/trees.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/uncompr.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/watcom/watcom_f.mak [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/watcom/watcom_l.mak [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/DLL_FAQ.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/Makefile.bor [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/Makefile.gcc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/Makefile.msc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/README-WIN32.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/VisualC.txt [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/zlib.def [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/win32/zlib1.rc [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zconf.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zconf.h.cmakein [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zconf.h.in [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.3 [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.3.pdf [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.h [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.map [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.pc.cmakein [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib.pc.in [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zlib2ansi [new file with mode: 0755]
software/scsi2sd-util/zlib-1.2.8/zutil.c [new file with mode: 0644]
software/scsi2sd-util/zlib-1.2.8/zutil.h [new file with mode: 0644]

index 642d483..a2a5308 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,18 @@
-201408XX               3.6
+201412XX               3.6
        - Fix handling requests for LUNs other than 0 from SCSI-2 hosts.
        - Handle glitches of the scsi signals to improve stability and operate with
        multiple devices on the SCSI bus.
        - Re-add parity checking. This can be disabled using scsi2sd-config if
        required.
        - Added disconnect/reconnect support during SD card writes.
+       - Preliminary CDROM device support (incomplete)
+       - New configuration method. Data is now stored in flash to allow room for
+       custom VPD tables. The old eeprom configuration is ignored.
+       - Support for up to 4 SCSI targets.
+       - scsi2sd-config and bootloader hosts utilities are replaced by the
+       new scsi2sd-util GUI.
+       - Fix for SD cards with Samsung controllers which expect a "stop" bit
+       in each SD command over SPI.
 
 20140718               3.5.2
        - Fix blank SCSI ID in scsi2sd-config output.
diff --git a/software/SCSI2SD/src/cdrom.c b/software/SCSI2SD/src/cdrom.c
new file mode 100755 (executable)
index 0000000..6a30938
--- /dev/null
@@ -0,0 +1,142 @@
+//     Copyright (C) 2014 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of SCSI2SD.
+//
+//     SCSI2SD is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     SCSI2SD is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with SCSI2SD.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "device.h"
+#include "scsi.h"
+#include "config.h"
+#include "cdrom.h"
+
+uint8_t SimpleTOC[] =
+{
+       0x00, // toc length, MSB
+       0x0A, // toc length, LSB
+       0x01, // First track number
+       0x01, // Last track number,
+       // TRACK 1 Descriptor
+       0x00, // reservied
+       0x06, // Q sub-channel not supplied, Digital track
+       0x01, // Track 1,
+       0x00, // Reserved
+       0x00,0x00,0x00,0x00 // Track start sector (LBA)
+};
+
+void doReadTOC(int MSF, uint8_t track, uint16_t allocationLength)
+{
+       // We only support track 1.
+       // track 0 means "return all tracks"
+       if (track > 1)
+       {
+               scsiDev.status = CHECK_CONDITION;
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;
+               scsiDev.phase = STATUS;
+       }
+       else if (MSF)
+       {
+               // MSF addressing not currently supported.
+               scsiDev.status = CHECK_CONDITION;
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;
+               scsiDev.phase = STATUS;
+       }
+       else
+       {
+               uint32_t len = sizeof(SimpleTOC);
+               memcpy(scsiDev.data, SimpleTOC, len);
+               if (len > allocationLength)
+               {
+                       len = allocationLength;
+               }
+               scsiDev.dataLen = len;
+               scsiDev.phase = DATA_IN;
+       }
+}
+
+uint8_t SimpleHeader[] =
+{
+       0x01, // 2048byte user data, L-EC in 288 byte aux field.
+       0x00, // reserved
+       0x00, // reserved
+       0x00, // reserved
+       0x00,0x00,0x00,0x00 // Track start sector (LBA)
+};
+
+void doReadHeader(int MSF, uint32_t lba, uint16_t allocationLength)
+{
+       if (MSF)
+       {
+               // MSF addressing not currently supported.
+               scsiDev.status = CHECK_CONDITION;
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;
+               scsiDev.phase = STATUS;
+       }
+       else
+       {
+               uint32_t len = sizeof(SimpleHeader);
+               memcpy(scsiDev.data, SimpleHeader, len);
+               if (len > allocationLength)
+               {
+                       len = allocationLength;
+               }
+               scsiDev.dataLen = len;
+               scsiDev.phase = DATA_IN;
+       }
+}
+
+
+// Handle direct-access scsi device commands
+int scsiCDRomCommand()
+{
+       int commandHandled = 1;
+
+       uint8 command = scsiDev.cdb[0];
+       if (scsiDev.target->cfg->deviceType == CONFIG_OPTICAL)
+       {
+               if (command == 0x43)
+               {
+                       // CD-ROM Read TOC
+                       int MSF = scsiDev.cdb[1] & 0x02 ? 1 : 0;
+                       uint8_t track = scsiDev.cdb[6];
+                       uint16_t allocationLength =
+                               (((uint32_t) scsiDev.cdb[7]) << 8) +
+                               scsiDev.cdb[8];
+
+                       doReadTOC(MSF, track, allocationLength);
+               }
+               else if (command == 0x44)
+               {
+                       // CD-ROM Read Header
+                       int MSF = scsiDev.cdb[1] & 0x02 ? 1 : 0;
+                       uint32_t lba = 0; // IGNORED for now
+                       uint16_t allocationLength =
+                               (((uint32_t) scsiDev.cdb[7]) << 8) +
+                               scsiDev.cdb[8];
+                       doReadHeader(MSF, lba, allocationLength);
+               }
+               else
+               {
+                       commandHandled = 0;
+               }
+       }
+       else
+       {
+               commandHandled = 0;
+       }
+
+       return commandHandled;
+}
diff --git a/software/SCSI2SD/src/cdrom.h b/software/SCSI2SD/src/cdrom.h
new file mode 100755 (executable)
index 0000000..f61e328
--- /dev/null
@@ -0,0 +1,22 @@
+//     Copyright (C) 2014 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of SCSI2SD.
+//
+//     SCSI2SD is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     SCSI2SD is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with SCSI2SD.  If not, see <http://www.gnu.org/licenses/>.
+#ifndef CDROM_H
+#define CDROM_H
+
+int scsiCDRomCommand(void);
+
+#endif
index 93c0be6..fb0473a 100755 (executable)
 \r
 #include <string.h>\r
 \r
-// CYDEV_EEPROM_ROW_SIZE == 16.\r
-static const char magic[CYDEV_EEPROM_ROW_SIZE] = "codesrc_00000002";\r
 static const uint16_t FIRMWARE_VERSION = 0x0360;\r
 \r
-// Config shadow RAM (copy of EEPROM)\r
-static Config shadow =\r
-{\r
-       0, // SCSI ID\r
-       " codesrc", // vendor  (68k Apple Drive Setup: Set to " SEAGATE")\r
-       "         SCSI2SD", //prodId (68k Apple Drive Setup: Set to "          ST225N")\r
-       " 3.6", // revision (68k Apple Drive Setup: Set to "1.0 ")\r
-       1, // enable parity\r
-       1, // enable unit attention,\r
-       0, // RESERVED\r
-       0, // Max sectors (0 == disabled)\r
-       512 // Sector size\r
-       // reserved bytes will be initialised to 0.\r
-};\r
-\r
 enum USB_ENDPOINTS\r
 {\r
        USB_EP_OUT = 1,\r
@@ -67,92 +50,8 @@ static int usbInEpState;
 static int usbDebugEpState;\r
 static int usbReady;\r
 \r
-// Global\r
-Config* config = NULL;\r
-\r
-// The PSoC 5LP compile to little-endian format.\r
-static uint32_t ntohl(uint32_t val)\r
-{\r
-       return\r
-               ((val & 0xFF) << 24) |\r
-               ((val & 0xFF00) << 8) |\r
-               ((val >> 8) & 0xFF00) |\r
-               ((val >> 24) & 0xFF);\r
-}\r
-static uint16_t ntohs(uint16_t val)\r
-{\r
-       return\r
-               ((val & 0xFF) << 8) |\r
-               ((val >> 8) & 0xFF);\r
-}\r
-static uint32_t htonl(uint32_t val)\r
-{\r
-       return\r
-               ((val & 0xFF) << 24) |\r
-               ((val & 0xFF00) << 8) |\r
-               ((val >> 8) & 0xFF00) |\r
-               ((val >> 24) & 0xFF);\r
-}\r
-static uint16_t htons(uint16_t val)\r
-{\r
-       return\r
-               ((val & 0xFF) << 8) |\r
-               ((val >> 8) & 0xFF);\r
-}\r
-\r
-static void saveConfig()\r
-{\r
-       int shadowRows = (sizeof(shadow) / CYDEV_EEPROM_ROW_SIZE) + 1;\r
-       int row;\r
-       int status = CYRET_SUCCESS;\r
-\r
-       CySetTemp();\r
-       for (row = 0; (row < shadowRows) && (status == CYRET_SUCCESS); ++row)\r
-       {\r
-               CFG_EEPROM_Write(((uint8*)&shadow) + (row * CYDEV_EEPROM_ROW_SIZE), row);\r
-       }\r
-       if (status == CYRET_SUCCESS)\r
-       {\r
-               CFG_EEPROM_Write((uint8*)magic, row);\r
-       }\r
-}\r
-\r
 void configInit()\r
 {\r
-       int shadowRows, shadowBytes;\r
-       uint8* eeprom = (uint8*)CYDEV_EE_BASE;\r
-\r
-       // We could map cfgPtr directly into the EEPROM memory,\r
-       // but that would waste power. Copy it to RAM then turn off\r
-       // the EEPROM.\r
-       CFG_EEPROM_Start();\r
-       CyDelayUs(5); // 5us to start per datasheet.\r
-\r
-       // Check magic\r
-       shadowRows = (sizeof(shadow) / CYDEV_EEPROM_ROW_SIZE) + 1;\r
-       shadowBytes = CYDEV_EEPROM_ROW_SIZE * shadowRows;\r
-\r
-       if (memcmp(eeprom + shadowBytes, magic, sizeof(magic)))\r
-       {\r
-               // Initial state, invalid, or upgrade required.\r
-               if (!memcmp(eeprom + shadowBytes, magic, sizeof(magic) - 1) &&\r
-                       ((eeprom + shadowBytes)[sizeof(magic) - 2] == '1'))\r
-               {\r
-                       // Upgrade from version 1.\r
-                       memcpy(&shadow, eeprom, sizeof(shadow));\r
-                       shadow.bytesPerSector = 512;\r
-               }\r
-\r
-               saveConfig();\r
-       }\r
-       else\r
-       {\r
-               memcpy(&shadow, eeprom, sizeof(shadow));\r
-       }\r
-\r
-       config = &shadow;\r
-       CFG_EEPROM_Stop();\r
-\r
        // The USB block will be powered by an internal 3.3V regulator.\r
        // The PSoC must be operating between 4.6V and 5V for the regulator\r
        // to work.\r
@@ -353,10 +252,10 @@ void debugPoll()
                hidBuffer[14] = scsiDev.lastStatus;\r
                hidBuffer[15] = scsiDev.lastSense;\r
                hidBuffer[16] = scsiDev.phase;\r
-               hidBuffer[17] = SCSI_ReadPin(SCSI_In_BSY);\r
-               hidBuffer[18] = SCSI_ReadPin(SCSI_In_SEL);\r
-               hidBuffer[19] = SCSI_ReadPin(SCSI_ATN_INT);\r
-               hidBuffer[20] = SCSI_ReadPin(SCSI_RST_INT);\r
+               hidBuffer[17] = SCSI_ReadFilt(SCSI_Filt_BSY);\r
+               hidBuffer[18] = SCSI_ReadFilt(SCSI_Filt_SEL);\r
+               hidBuffer[19] = SCSI_ReadFilt(SCSI_Filt_ATN);\r
+               hidBuffer[20] = SCSI_ReadFilt(SCSI_Filt_RST);\r
                hidBuffer[21] = scsiDev.rstCount;\r
                hidBuffer[22] = scsiDev.selCount;\r
                hidBuffer[23] = scsiDev.msgCount;\r
@@ -403,8 +302,37 @@ void debugInit()
 // Public method for storing MODE SELECT results.\r
 void configSave()\r
 {\r
-       CFG_EEPROM_Start();\r
-       saveConfig(); // write to eeprom\r
-       CFG_EEPROM_Stop();\r
+// TODO REIMPLEMENT\r
+//     CFG_EEPROM_Start();\r
+//     saveConfig(); // write to eeprom\r
+//     CFG_EEPROM_Stop();\r
 }\r
 \r
+\r
+const TargetConfig* getConfigByIndex(int i)\r
+{\r
+       size_t row = SCSI_CONFIG_0_ROW + (i * SCSI_CONFIG_ROWS);\r
+       return (const TargetConfig*)\r
+               (\r
+                       CY_FLASH_BASE +\r
+                       (CY_FLASH_SIZEOF_ARRAY * (size_t) SCSI_CONFIG_ARRAY) +\r
+                       (CY_FLASH_SIZEOF_ROW * row)\r
+                       );\r
+}\r
+\r
+const TargetConfig* getConfigById(int scsiId)\r
+{\r
+       int i;\r
+       for (i = 0; i < MAX_SCSI_TARGETS; ++i)\r
+       {\r
+               const TargetConfig* tgt = getConfigByIndex(i);\r
+               if ((tgt->scsiId & CONFIG_TARGET_ID_BITS) == scsiId)\r
+               {\r
+                       return tgt;\r
+               }\r
+       }\r
+       return NULL;\r
+\r
+}\r
+\r
+\r
index c95474f..bce06e7 100755 (executable)
 #define Config_H\r
 \r
 #include "device.h"\r
-\r
-typedef struct\r
-{\r
-       uint8 scsiId;\r
-       char vendor[8];\r
-       char prodId[16];\r
-       char revision[4];\r
-       uint8 enableParity;\r
-       uint8 enableUnitAttention;\r
-       uint8 reserved1; // Unused. Ensures maxBlocks is aligned.\r
-       uint32 maxSectors;\r
-       uint16 bytesPerSector;\r
-\r
-       // Pad to 64 bytes, which is what we can fit into a USB HID packet.\r
-       char reserved[26]; \r
-} Config;\r
-\r
-extern Config* config;\r
+#include "scsi2sd.h"\r
 \r
 void configInit(void);\r
 void debugInit(void);\r
 void configPoll(void);\r
 void configSave(void);\r
 \r
+const TargetConfig* getConfigByIndex(int index);\r
+const TargetConfig* getConfigById(int scsiId);\r
+\r
 #endif\r
index 45f5a0b..15e624f 100755 (executable)
@@ -51,8 +51,8 @@ void scsiSendDiagnostic()
                        // Nowhere to store this data!\r
                        // Shouldn't happen - our buffer should be many magnitudes larger\r
                        // than the required size for diagnostic parameters.\r
-                       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-                       scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+                       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+                       scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                        scsiDev.status = CHECK_CONDITION;\r
                        scsiDev.phase = STATUS;\r
                }\r
@@ -95,9 +95,10 @@ void scsiReceiveDiagnostic()
                // Convert each supplied address back to a simple\r
                // 64bit linear address, then convert back again.\r
                uint64 fromByteAddr =\r
-                       scsiByteAddress(suppliedFmt, &scsiDev.data[6]);\r
+                       scsiByteAddress(scsiDev.target->cfg, suppliedFmt, &scsiDev.data[6]);\r
 \r
-               scsiSaveByteAddress(translateFmt, fromByteAddr, &scsiDev.data[6]);\r
+               scsiSaveByteAddress(\r
+                       scsiDev.target->cfg, translateFmt, fromByteAddr, &scsiDev.data[6]);\r
 \r
                // Fill out the rest of the response.\r
                // (Clear out any optional bits).\r
@@ -111,8 +112,8 @@ void scsiReceiveDiagnostic()
        {\r
                // error.\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                scsiDev.phase = STATUS;\r
        }\r
 \r
index 965cee4..adafdf4 100755 (executable)
@@ -113,7 +113,7 @@ static void doReadCapacity()
                scsiDev.cdb[5];\r
        int pmi = scsiDev.cdb[8] & 1;\r
 \r
-       uint32_t capacity = getScsiCapacity();\r
+       uint32_t capacity = getScsiCapacity(scsiDev.target->cfg);\r
 \r
        if (!pmi && lba)\r
        {\r
@@ -122,8 +122,8 @@ static void doReadCapacity()
                // assume that delays are constant across each block. But the spec\r
                // says we must return this error if pmi is specified incorrectly.\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                scsiDev.phase = STATUS;\r
        }\r
        else if (capacity > 0)\r
@@ -135,18 +135,19 @@ static void doReadCapacity()
                scsiDev.data[2] = highestBlock >> 8;\r
                scsiDev.data[3] = highestBlock;\r
 \r
-               scsiDev.data[4] = config->bytesPerSector >> 24;\r
-               scsiDev.data[5] = config->bytesPerSector >> 16;\r
-               scsiDev.data[6] = config->bytesPerSector >> 8;\r
-               scsiDev.data[7] = config->bytesPerSector;\r
+               uint32_t bytesPerSector = scsiDev.target->cfg->bytesPerSector;\r
+               scsiDev.data[4] = bytesPerSector >> 24;\r
+               scsiDev.data[5] = bytesPerSector >> 16;\r
+               scsiDev.data[6] = bytesPerSector >> 8;\r
+               scsiDev.data[7] = bytesPerSector;\r
                scsiDev.dataLen = 8;\r
                scsiDev.phase = DATA_IN;\r
        }\r
        else\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = NOT_READY;\r
-               scsiDev.sense.asc = MEDIUM_NOT_PRESENT;\r
+               scsiDev.target->sense.code = NOT_READY;\r
+               scsiDev.target->sense.asc = MEDIUM_NOT_PRESENT;\r
                scsiDev.phase = STATUS;\r
        }\r
 }\r
@@ -156,15 +157,15 @@ static void doWrite(uint32 lba, uint32 blocks)
        if (blockDev.state & DISK_WP)\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = WRITE_PROTECTED;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = WRITE_PROTECTED;\r
                scsiDev.phase = STATUS;\r
        }\r
-       else if (((uint64) lba) + blocks > getScsiCapacity())\r
+       else if (((uint64) lba) + blocks > getScsiCapacity(scsiDev.target->cfg))\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
@@ -174,8 +175,8 @@ static void doWrite(uint32 lba, uint32 blocks)
                transfer.blocks = blocks;\r
                transfer.currentBlock = 0;\r
                scsiDev.phase = DATA_OUT;\r
-               scsiDev.dataLen = config->bytesPerSector;\r
-               scsiDev.dataPtr = config->bytesPerSector; // TODO FIX scsiDiskPoll()\r
+               scsiDev.dataLen = scsiDev.target->cfg->bytesPerSector;\r
+               scsiDev.dataPtr = scsiDev.target->cfg->bytesPerSector;\r
 \r
                // No need for single-block writes atm.  Overhead of the\r
                // multi-block write is minimal.\r
@@ -188,12 +189,12 @@ static void doWrite(uint32 lba, uint32 blocks)
 \r
 static void doRead(uint32 lba, uint32 blocks)\r
 {\r
-       uint32_t capacity = getScsiCapacity();\r
+       uint32_t capacity = getScsiCapacity(scsiDev.target->cfg);\r
        if (((uint64) lba) + blocks > capacity)\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
@@ -223,11 +224,11 @@ static void doRead(uint32 lba, uint32 blocks)
 \r
 static void doSeek(uint32 lba)\r
 {\r
-       if (lba >= getScsiCapacity())\r
+       if (lba >= getScsiCapacity(scsiDev.target->cfg))\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;\r
                scsiDev.phase = STATUS;\r
        }\r
 }\r
@@ -239,24 +240,24 @@ static int doTestUnitReady()
        {\r
                ready = 0;\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = NOT_READY;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_NOT_READY_INITIALIZING_COMMAND_REQUIRED;\r
+               scsiDev.target->sense.code = NOT_READY;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_NOT_READY_INITIALIZING_COMMAND_REQUIRED;\r
                scsiDev.phase = STATUS;\r
        }\r
        else if (!(blockDev.state & DISK_PRESENT))\r
        {\r
                ready = 0;\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = NOT_READY;\r
-               scsiDev.sense.asc = MEDIUM_NOT_PRESENT;\r
+               scsiDev.target->sense.code = NOT_READY;\r
+               scsiDev.target->sense.asc = MEDIUM_NOT_PRESENT;\r
                scsiDev.phase = STATUS;\r
        }\r
        else if (!(blockDev.state & DISK_INITIALISED))\r
        {\r
                ready = 0;\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = NOT_READY;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_NOT_READY_CAUSE_NOT_REPORTABLE;\r
+               scsiDev.target->sense.code = NOT_READY;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_NOT_READY_CAUSE_NOT_REPORTABLE;\r
                scsiDev.phase = STATUS;\r
        }\r
        return ready;\r
@@ -444,8 +445,8 @@ int scsiDiskCommand()
                        // TODO. This means they are supplying data to verify against.\r
                        // Technically we should probably grab the data and compare it.\r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-                       scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+                       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+                       scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                        scsiDev.phase = STATUS;\r
                }\r
        }\r
@@ -464,8 +465,9 @@ void scsiDiskPoll()
        {\r
                scsiEnterPhase(DATA_IN);\r
 \r
-               int totalSDSectors = transfer.blocks * SDSectorsPerSCSISector();\r
-               uint32_t sdLBA = SCSISector2SD(transfer.lba);\r
+               int totalSDSectors =\r
+                       transfer.blocks * SDSectorsPerSCSISector(scsiDev.target->cfg);\r
+               uint32_t sdLBA = SCSISector2SD(scsiDev.target->cfg, transfer.lba);\r
                int buffers = sizeof(scsiDev.data) / SD_SECTOR_SIZE;\r
                int prep = 0;\r
                int i = 0;\r
@@ -502,9 +504,10 @@ void scsiDiskPoll()
                        else if ((scsiActive == 0) && ((prep - i) > 0))\r
                        {\r
                                int dmaBytes = SD_SECTOR_SIZE;\r
-                               if (i % SDSectorsPerSCSISector() == SDSectorsPerSCSISector() - 1)\r
+                               if ((i % SDSectorsPerSCSISector(scsiDev.target->cfg)) ==\r
+                                       (SDSectorsPerSCSISector(scsiDev.target->cfg) - 1))\r
                                {\r
-                                       dmaBytes = config->bytesPerSector % SD_SECTOR_SIZE;\r
+                                       dmaBytes = scsiDev.target->cfg->bytesPerSector % SD_SECTOR_SIZE;\r
                                        if (dmaBytes == 0) dmaBytes = SD_SECTOR_SIZE;\r
                                }\r
                                scsiWriteDMA(&scsiDev.data[SD_SECTOR_SIZE * (i % buffers)], dmaBytes);\r
@@ -522,7 +525,8 @@ void scsiDiskPoll()
        {\r
                scsiEnterPhase(DATA_OUT);\r
 \r
-               int totalSDSectors = transfer.blocks * SDSectorsPerSCSISector();\r
+               int totalSDSectors =\r
+                       transfer.blocks * SDSectorsPerSCSISector(scsiDev.target->cfg);\r
                int buffers = sizeof(scsiDev.data) / SD_SECTOR_SIZE;\r
                int prep = 0;\r
                int i = 0;\r
@@ -559,9 +563,10 @@ void scsiDiskPoll()
                                !scsiDisconnected)\r
                        {\r
                                int dmaBytes = SD_SECTOR_SIZE;\r
-                               if (prep % SDSectorsPerSCSISector() == SDSectorsPerSCSISector() - 1)\r
+                               if ((prep % SDSectorsPerSCSISector(scsiDev.target->cfg)) ==\r
+                                       (SDSectorsPerSCSISector(scsiDev.target->cfg) - 1))\r
                                {\r
-                                       dmaBytes = config->bytesPerSector % SD_SECTOR_SIZE;\r
+                                       dmaBytes = scsiDev.target->cfg->bytesPerSector % SD_SECTOR_SIZE;\r
                                        if (dmaBytes == 0) dmaBytes = SD_SECTOR_SIZE;\r
                                }\r
                                scsiReadDMA(&scsiDev.data[SD_SECTOR_SIZE * (prep % buffers)], dmaBytes);\r
@@ -622,10 +627,12 @@ void scsiDiskPoll()
 \r
                if (scsiDev.phase == DATA_OUT)\r
                {\r
-                       if (scsiDev.parityError && config->enableParity && !scsiDev.compatMode)\r
+                       if (scsiDev.parityError &&\r
+                               (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) &&\r
+                               !scsiDev.compatMode)\r
                        {\r
-                               scsiDev.sense.code = ABORTED_COMMAND;\r
-                               scsiDev.sense.asc = SCSI_PARITY_ERROR;\r
+                               scsiDev.target->sense.code = ABORTED_COMMAND;\r
+                               scsiDev.target->sense.asc = SCSI_PARITY_ERROR;\r
                                scsiDev.status = CHECK_CONDITION;;\r
                        }\r
                        scsiDev.phase = STATUS;\r
index 01478e3..d746d33 100755 (executable)
 \r
 #include <string.h>\r
 \r
-uint32_t getScsiCapacity()\r
+uint32_t getScsiCapacity(const TargetConfig* config)\r
 {\r
-       uint32_t capacity = sdDev.capacity / SDSectorsPerSCSISector();\r
-       if (config->maxSectors && (capacity > config->maxSectors))\r
+       uint32_t capacity =\r
+               (sdDev.capacity - config->sdSectorStart) /\r
+                       SDSectorsPerSCSISector(config);\r
+       if (config->scsiSectors && (capacity > config->scsiSectors))\r
        {\r
-               capacity = config->maxSectors;\r
+               capacity = config->scsiSectors;\r
        }\r
        return capacity;\r
 }\r
 \r
 \r
-uint32_t SCSISector2SD(uint32_t scsiSector)\r
+uint32_t SCSISector2SD(const TargetConfig* config, uint32_t scsiSector)\r
 {\r
-       return scsiSector * SDSectorsPerSCSISector();\r
+       return scsiSector * SDSectorsPerSCSISector(config) + config->sdSectorStart;\r
 }\r
 \r
 // Standard mapping according to ECMA-107 and ISO/IEC 9293:1994\r
@@ -54,7 +56,7 @@ void LBA2CHS(uint32 lba, uint32* c, uint8* h, uint32* s)
        *s = (lba % SCSI_SECTORS_PER_TRACK) + 1;\r
 }\r
 \r
-uint64 scsiByteAddress(int format, const uint8* addr)\r
+uint64 scsiByteAddress(const TargetConfig* config, int format, const uint8* addr)\r
 {\r
        uint64 result;\r
        switch (format)\r
@@ -114,7 +116,7 @@ uint64 scsiByteAddress(int format, const uint8* addr)
 }\r
 \r
 \r
-void scsiSaveByteAddress(int format, uint64 byteAddr, uint8* buf)\r
+void scsiSaveByteAddress(const TargetConfig* config, int format, uint64 byteAddr, uint8* buf)\r
 {\r
        uint32 lba = byteAddr / config->bytesPerSector;\r
        uint32 byteOffset = byteAddr % config->bytesPerSector;\r
index c965870..b20ab60 100755 (executable)
@@ -35,14 +35,14 @@ typedef enum
        ADDRESS_PHYSICAL_SECTOR = 5
 } SCSI_ADDRESS_FORMAT;
 
-static inline int SDSectorsPerSCSISector()
+static inline int SDSectorsPerSCSISector(const TargetConfig* config)
 {
        return (config->bytesPerSector + SD_SECTOR_SIZE - 1) / SD_SECTOR_SIZE;
 }
 
-uint32_t getScsiCapacity();
+uint32_t getScsiCapacity(const TargetConfig* config);
 
-uint32_t SCSISector2SD(uint32_t scsiSector);
+uint32_t SCSISector2SD(const TargetConfig* config, uint32_t scsiSector);
 
 uint64 CHS2LBA(uint32 c, uint8 h, uint32 s);
 void LBA2CHS(uint32 lba, uint32* c, uint8* h, uint32* s);
@@ -50,8 +50,10 @@ void LBA2CHS(uint32 lba, uint32* c, uint8* h, uint32* s);
 // Convert an address in the given SCSI_ADDRESS_FORMAT to
 // a linear byte address.
 // addr must be >= 8 bytes.
-uint64 scsiByteAddress(int format, const uint8* addr);
-void scsiSaveByteAddress(int format, uint64 byteAddr, uint8* buf);
+uint64 scsiByteAddress(
+       const TargetConfig* config, int format, const uint8* addr);
+void scsiSaveByteAddress(
+       const TargetConfig* config, int format, uint64 byteAddr, uint8* buf);
 
 
 #endif
index b90eb71..2067297 100755 (executable)
@@ -104,12 +104,13 @@ void scsiInquiry()
                {\r
                        // error.\r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-                       scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+                       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+                       scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                        scsiDev.phase = STATUS;\r
                }\r
                else\r
                {\r
+                       const TargetConfig* config = scsiDev.target->cfg;\r
                        memcpy(scsiDev.data, StandardResponse, sizeof(StandardResponse));\r
                        memcpy(&scsiDev.data[8], config->vendor, sizeof(config->vendor));\r
                        memcpy(&scsiDev.data[16], config->prodId, sizeof(config->prodId));\r
@@ -155,8 +156,8 @@ void scsiInquiry()
        {\r
                // error.\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                scsiDev.phase = STATUS;\r
        }\r
 \r
@@ -176,6 +177,21 @@ void scsiInquiry()
                }\r
                // Spec 8.2.5 requires us to simply truncate the response if it's too big.\r
                scsiDev.dataLen = allocationLength;\r
+               \r
+               // Set the device type as needed.\r
+               switch (scsiDev.target->cfg->deviceType)\r
+               {\r
+               case CONFIG_OPTICAL:\r
+                       scsiDev.data[0] = 0x05; // device type\r
+                       scsiDev.data[1] |= 0x80; // Removable bit.\r
+                       break;\r
+               case CONFIG_REMOVEABLE:\r
+                       scsiDev.data[1] |= 0x80; // Removable bit.\r
+                       break;\r
+                default:\r
+                       // Accept defaults for a fixed disk.\r
+                       break;\r
+               }\r
        }\r
 \r
        // Set the first byte to indicate LUN presence.\r
index 21ddadd..16207ec 100755 (executable)
@@ -135,8 +135,8 @@ static void doModeSense(
        if (pc == 0x03) // Saved Values not supported.\r
        {\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = SAVING_PARAMETERS_NOT_SUPPORTED;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = SAVING_PARAMETERS_NOT_SUPPORTED;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
@@ -200,9 +200,10 @@ static void doModeSense(
                        scsiDev.data[idx++] = 0; // reserved\r
 \r
                        // Block length\r
-                       scsiDev.data[idx++] = config->bytesPerSector >> 16;\r
-                       scsiDev.data[idx++] = config->bytesPerSector >> 8;\r
-                       scsiDev.data[idx++] = config->bytesPerSector & 0xFF;\r
+                       uint32_t bytesPerSector = scsiDev.target->cfg->bytesPerSector;\r
+                       scsiDev.data[idx++] = bytesPerSector >> 16;\r
+                       scsiDev.data[idx++] = bytesPerSector >> 8;\r
+                       scsiDev.data[idx++] = bytesPerSector & 0xFF;\r
                }\r
 \r
                switch (pageCode)\r
@@ -225,8 +226,9 @@ static void doModeSense(
                        if (pc != 0x01)\r
                        {\r
                                // Fill out the configured bytes-per-sector\r
-                               scsiDev.data[idx+12] = config->bytesPerSector >> 8;\r
-                               scsiDev.data[idx+13] = config->bytesPerSector & 0xFF;\r
+                               uint32_t bytesPerSector = scsiDev.target->cfg->bytesPerSector;\r
+                               scsiDev.data[idx+12] = bytesPerSector >> 8;\r
+                               scsiDev.data[idx+13] = bytesPerSector & 0xFF;\r
                        }\r
                        else\r
                        {\r
@@ -248,7 +250,7 @@ static void doModeSense(
                                uint32 cyl;\r
                                uint8 head;\r
                                uint32 sector;\r
-                               LBA2CHS(getScsiCapacity(), &cyl, &head, &sector);\r
+                               LBA2CHS(getScsiCapacity(scsiDev.target->cfg), &cyl, &head, &sector);\r
 \r
                                scsiDev.data[idx+2] = cyl >> 16;\r
                                scsiDev.data[idx+3] = cyl >> 8;\r
@@ -281,8 +283,8 @@ static void doModeSense(
                        // Unknown Page Code\r
                        pageFound = 0;\r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-                       scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+                       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+                       scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                        scsiDev.phase = STATUS;\r
                }\r
 \r
@@ -314,8 +316,8 @@ static void doModeSense(
                {\r
                        // Page not found\r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-                       scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+                       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+                       scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                        scsiDev.phase = STATUS;\r
                }\r
        }\r
@@ -355,9 +357,9 @@ static void doModeSelect(void)
                        {\r
                                goto bad;\r
                        }\r
-                       else if (bytesPerSector != config->bytesPerSector)\r
+                       else if (bytesPerSector != scsiDev.target->cfg->bytesPerSector)\r
                        {\r
-                               config->bytesPerSector = bytesPerSector;\r
+                               // TODO REIMPLEMENT CONFIG SAVEconfig->bytesPerSector = bytesPerSector;\r
                                configSave();\r
                        }\r
                }\r
@@ -387,7 +389,7 @@ static void doModeSelect(void)
                                        goto bad;\r
                                }\r
 \r
-                               config->bytesPerSector = bytesPerSector;\r
+                               // TODO CONFIGFAVE REIMPLEMENT config->bytesPerSector = bytesPerSector;\r
                                if (scsiDev.cdb[1] & 1) // SP Save Pages flag\r
                                {\r
                                        configSave();\r
@@ -406,8 +408,8 @@ static void doModeSelect(void)
        goto out;\r
 bad:\r
        scsiDev.status = CHECK_CONDITION;\r
-       scsiDev.sense.code = ILLEGAL_REQUEST;\r
-       scsiDev.sense.asc = INVALID_FIELD_IN_PARAMETER_LIST;\r
+       scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+       scsiDev.target->sense.asc = INVALID_FIELD_IN_PARAMETER_LIST;\r
 \r
 out:\r
        scsiDev.phase = STATUS;\r
index 8d64270..061818f 100755 (executable)
@@ -27,6 +27,7 @@
 #include "mode.h"\r
 #include "disk.h"\r
 #include "time.h"\r
+#include "cdrom.h"\r
 \r
 #include <string.h>\r
 \r
@@ -113,7 +114,7 @@ static void enter_Status(uint8 status)
        scsiDev.phase = STATUS;\r
 \r
        scsiDev.lastStatus = scsiDev.status;\r
-       scsiDev.lastSense = scsiDev.sense.code;\r
+       scsiDev.lastSense = scsiDev.target->sense.code;\r
 }\r
 \r
 static void process_Status()\r
@@ -143,7 +144,7 @@ static void process_Status()
        scsiWriteByte(scsiDev.status);\r
 \r
        scsiDev.lastStatus = scsiDev.status;\r
-       scsiDev.lastSense = scsiDev.sense.code;\r
+       scsiDev.lastSense = scsiDev.target->sense.code;\r
 \r
        // Command Complete occurs AFTER a valid status has been\r
        // sent. then we go bus-free.\r
@@ -198,10 +199,12 @@ static void process_DataOut()
                scsiRead(scsiDev.data + scsiDev.dataPtr, len);\r
                scsiDev.dataPtr += len;\r
 \r
-               if (scsiDev.parityError && config->enableParity && !scsiDev.compatMode)\r
+               if (scsiDev.parityError &&\r
+                       (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) &&\r
+                       !scsiDev.compatMode)\r
                {\r
-                       scsiDev.sense.code = ABORTED_COMMAND;\r
-                       scsiDev.sense.asc = SCSI_PARITY_ERROR;\r
+                       scsiDev.target->sense.code = ABORTED_COMMAND;\r
+                       scsiDev.target->sense.asc = SCSI_PARITY_ERROR;\r
                        enter_Status(CHECK_CONDITION);\r
                }\r
        }\r
@@ -256,17 +259,19 @@ static void process_Command()
                memset(scsiDev.cdb, 0xff, sizeof(scsiDev.cdb));\r
                return;\r
        }\r
-       else if (scsiDev.parityError && config->enableParity && !scsiDev.compatMode)\r
+       else if (scsiDev.parityError &&\r
+               (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) &&\r
+               !scsiDev.compatMode)\r
        {\r
-               scsiDev.sense.code = ABORTED_COMMAND;\r
-               scsiDev.sense.asc = SCSI_PARITY_ERROR;\r
+               scsiDev.target->sense.code = ABORTED_COMMAND;\r
+               scsiDev.target->sense.asc = SCSI_PARITY_ERROR;\r
                enter_Status(CHECK_CONDITION);\r
        }\r
        else if ((control & 0x02) && ((control & 0x01) == 0))\r
        {\r
                // FLAG set without LINK flag.\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                enter_Status(CHECK_CONDITION);\r
        }\r
        else if (command == 0x12)\r
@@ -284,7 +289,7 @@ static void process_Command()
 \r
                memset(scsiDev.data, 0, 256); // Max possible alloc length\r
                scsiDev.data[0] = 0xF0;\r
-               scsiDev.data[2] = scsiDev.sense.code & 0x0F;\r
+               scsiDev.data[2] = scsiDev.target->sense.code & 0x0F;\r
 \r
                scsiDev.data[3] = transfer.lba >> 24;\r
                scsiDev.data[4] = transfer.lba >> 16;\r
@@ -293,43 +298,44 @@ static void process_Command()
 \r
                // Additional bytes if there are errors to report\r
                scsiDev.data[7] = 10; // additional length\r
-               scsiDev.data[12] = scsiDev.sense.asc >> 8;\r
-               scsiDev.data[13] = scsiDev.sense.asc;\r
+               scsiDev.data[12] = scsiDev.target->sense.asc >> 8;\r
+               scsiDev.data[13] = scsiDev.target->sense.asc;\r
 \r
                // Silently truncate results. SCSI-2 spec 8.2.14.\r
                enter_DataIn(allocLength);\r
 \r
                // This is a good time to clear out old sense information.\r
-               scsiDev.sense.code = NO_SENSE;\r
-               scsiDev.sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
+               scsiDev.target->sense.code = NO_SENSE;\r
+               scsiDev.target->sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
        }\r
        // Some old SCSI drivers do NOT properly support\r
        // unitAttention. eg. the Mac Plus would trigger a SCSI reset\r
        // on receiving the unit attention response on boot, thus\r
        // triggering another unit attention condition.\r
-       else if (scsiDev.unitAttention && config->enableUnitAttention)\r
+       else if (scsiDev.target->unitAttention &&\r
+               (scsiDev.target->cfg->flags & CONFIG_ENABLE_UNIT_ATTENTION))\r
        {\r
-               scsiDev.sense.code = UNIT_ATTENTION;\r
-               scsiDev.sense.asc = scsiDev.unitAttention;\r
+               scsiDev.target->sense.code = UNIT_ATTENTION;\r
+               scsiDev.target->sense.asc = scsiDev.target->unitAttention;\r
 \r
                // If initiator doesn't do REQUEST SENSE for the next command, then\r
                // data is lost.\r
-               scsiDev.unitAttention = 0;\r
+               scsiDev.target->unitAttention = 0;\r
 \r
                enter_Status(CHECK_CONDITION);\r
        }\r
        else if (scsiDev.lun)\r
        {\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_NOT_SUPPORTED;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_NOT_SUPPORTED;\r
                enter_Status(CHECK_CONDITION);\r
        }\r
        else if (command == 0x17 || command == 0x16)\r
        {\r
                doReserveRelease();\r
        }\r
-       else if ((scsiDev.reservedId >= 0) &&\r
-               (scsiDev.reservedId != scsiDev.initiatorId))\r
+       else if ((scsiDev.target->reservedId >= 0) &&\r
+               (scsiDev.target->reservedId != scsiDev.initiatorId))\r
        {\r
                enter_Status(CONFLICT);\r
        }\r
@@ -347,10 +353,11 @@ static void process_Command()
        }\r
        else if (\r
                !scsiModeCommand() &&\r
-               !scsiDiskCommand())\r
+               !scsiDiskCommand() &&\r
+               !scsiCDRomCommand())\r
        {\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_COMMAND_OPERATION_CODE;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_COMMAND_OPERATION_CODE;\r
                enter_Status(CHECK_CONDITION);\r
        }\r
 \r
@@ -370,25 +377,25 @@ static void doReserveRelease()
        uint8 command = scsiDev.cdb[0];\r
 \r
        int canRelease =\r
-               (!thirdPty && (scsiDev.initiatorId == scsiDev.reservedId)) ||\r
+               (!thirdPty && (scsiDev.initiatorId == scsiDev.target->reservedId)) ||\r
                        (thirdPty &&\r
-                               (scsiDev.reserverId == scsiDev.initiatorId) &&\r
-                               (scsiDev.reservedId == thirdPtyId)\r
+                               (scsiDev.target->reserverId == scsiDev.initiatorId) &&\r
+                               (scsiDev.target->reservedId == thirdPtyId)\r
                        );\r
 \r
        if (extentReservation)\r
        {\r
                // Not supported.\r
-               scsiDev.sense.code = ILLEGAL_REQUEST;\r
-               scsiDev.sense.asc = INVALID_FIELD_IN_CDB;\r
+               scsiDev.target->sense.code = ILLEGAL_REQUEST;\r
+               scsiDev.target->sense.asc = INVALID_FIELD_IN_CDB;\r
                enter_Status(CHECK_CONDITION);\r
        }\r
        else if (command == 0x17) // release\r
        {\r
-               if ((scsiDev.reservedId < 0) || canRelease)\r
+               if ((scsiDev.target->reservedId < 0) || canRelease)\r
                {\r
-                       scsiDev.reservedId = -1;\r
-                       scsiDev.reserverId = -1;\r
+                       scsiDev.target->reservedId = -1;\r
+                       scsiDev.target->reserverId = -1;\r
                }\r
                else\r
                {\r
@@ -397,16 +404,16 @@ static void doReserveRelease()
        }\r
        else // assume reserve.\r
        {\r
-               if ((scsiDev.reservedId < 0) || canRelease)\r
+               if ((scsiDev.target->reservedId < 0) || canRelease)\r
                {\r
-                       scsiDev.reserverId = scsiDev.initiatorId;\r
+                       scsiDev.target->reserverId = scsiDev.initiatorId;\r
                        if (thirdPty)\r
                        {\r
-                               scsiDev.reservedId = thirdPtyId;\r
+                               scsiDev.target->reservedId = thirdPtyId;\r
                        }\r
                        else\r
                        {\r
-                               scsiDev.reservedId = scsiDev.initiatorId;\r
+                               scsiDev.target->reservedId = scsiDev.initiatorId;\r
                        }\r
                }\r
                else\r
@@ -431,14 +438,18 @@ static void scsiReset()
        scsiDev.resetFlag = 0;\r
        scsiDev.lun = -1;\r
 \r
-       if (scsiDev.unitAttention != POWER_ON_RESET)\r
+       if (scsiDev.target)\r
        {\r
-               scsiDev.unitAttention = SCSI_BUS_RESET;\r
+               if (scsiDev.target->unitAttention != POWER_ON_RESET)\r
+               {\r
+                       scsiDev.target->unitAttention = SCSI_BUS_RESET;\r
+               }\r
+               scsiDev.target->reservedId = -1;\r
+               scsiDev.target->reserverId = -1;\r
+               scsiDev.target->sense.code = NO_SENSE;\r
+               scsiDev.target->sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
        }\r
-       scsiDev.reservedId = -1;\r
-       scsiDev.reserverId = -1;\r
-       scsiDev.sense.code = NO_SENSE;\r
-       scsiDev.sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
+       scsiDev.target = NULL;\r
        scsiDiskReset();\r
 \r
        scsiDev.postDataOutHook = NULL;\r
@@ -468,6 +479,9 @@ static void enter_SelectionPhase()
        scsiDev.discPriv = 0;\r
        scsiDev.compatMode = 0;\r
 \r
+       scsiDev.initiatorId = -1;\r
+       scsiDev.target = NULL;\r
+\r
        transfer.blocks = 0;\r
        transfer.currentBlock = 0;\r
 \r
@@ -486,11 +500,23 @@ static void process_SelectionPhase()
        int goodParity = (Lookup_OddParity[mask] == SCSI_ReadPin(SCSI_In_DBP));\r
        int atnFlag = SCSI_ReadFilt(SCSI_Filt_ATN);\r
 \r
+       int tgtIndex;\r
+       TargetState* target = NULL;\r
+       for (tgtIndex = 0; tgtIndex < MAX_SCSI_TARGETS; ++tgtIndex)\r
+       {\r
+               if (mask & (1 << scsiDev.targets[tgtIndex].targetId))\r
+               {\r
+                       target = &scsiDev.targets[tgtIndex];\r
+                       break;\r
+               }\r
+       }\r
        if (!bsy && sel &&\r
-               (mask & scsiDev.scsiIdMask) &&\r
-               (goodParity || !config->enableParity || !atnFlag) &&\r
+               target &&\r
+               (goodParity || !(target->cfg->flags & CONFIG_ENABLE_PARITY) || !atnFlag) &&\r
                (maskBitCount <= 2))\r
        {\r
+               scsiDev.target = target;\r
+\r
                // Do we enter MESSAGE OUT immediately ? SCSI 1 and 2 standards says\r
                // move to MESSAGE OUT if ATN is true before we assert BSY.\r
                // The initiator should assert ATN with SEL.\r
@@ -502,7 +528,7 @@ static void process_SelectionPhase()
                // controllers don't generate parity bits.\r
                if (!scsiDev.atnFlag)\r
                {\r
-                       scsiDev.unitAttention = 0;\r
+                       target->unitAttention = 0;\r
                        scsiDev.compatMode = 1;\r
                }\r
 \r
@@ -529,11 +555,10 @@ static void process_SelectionPhase()
                // Save our initiator now that we're no longer in a time-critical\r
                // section.\r
                // SCSI1/SASI initiators may not set their own ID.\r
-               if (maskBitCount == 2)\r
                {\r
                        int i;\r
-                       uint8 initiatorMask = mask ^ scsiDev.scsiIdMask;\r
-                       scsiDev.initiatorId = 0;\r
+                       uint8_t initiatorMask = mask ^ (1 << target->targetId);\r
+                       scsiDev.initiatorId = -1;\r
                        for (i = 0; i < 8; ++i)\r
                        {\r
                                if (initiatorMask & (1 << i))\r
@@ -543,10 +568,6 @@ static void process_SelectionPhase()
                                }\r
                        }\r
                }\r
-               else\r
-               {\r
-                       scsiDev.initiatorId = -1;\r
-               }\r
 \r
                scsiDev.phase = COMMAND;\r
        }\r
@@ -565,7 +586,9 @@ static void process_MessageOut()
        scsiDev.msgOut = scsiReadByte();\r
        scsiDev.msgCount++;\r
 \r
-       if (scsiDev.parityError && config->enableParity && !scsiDev.compatMode)\r
+       if (scsiDev.parityError &&\r
+               (scsiDev.target->cfg->flags & CONFIG_ENABLE_PARITY) &&\r
+               !scsiDev.compatMode)\r
        {\r
                // Skip the remaining message bytes, and then start the MESSAGE_OUT\r
                // phase again from the start. The initiator will re-send the\r
@@ -596,11 +619,11 @@ static void process_MessageOut()
 \r
                scsiDiskReset();\r
 \r
-               scsiDev.unitAttention = SCSI_BUS_RESET;\r
+               scsiDev.target->unitAttention = SCSI_BUS_RESET;\r
 \r
                // ANY initiator can reset the reservation state via this message.\r
-               scsiDev.reservedId = -1;\r
-               scsiDev.reserverId = -1;\r
+               scsiDev.target->reservedId = -1;\r
+               scsiDev.target->reserverId = -1;\r
                enter_BusFree();\r
        }\r
        else if (scsiDev.msgOut == 0x05)\r
@@ -810,14 +833,31 @@ void scsiPoll(void)
 \r
 void scsiInit()\r
 {\r
-       scsiDev.scsiIdMask = 1 << (config->scsiId);\r
-\r
        scsiDev.atnFlag = 0;\r
        scsiDev.resetFlag = 1;\r
        scsiDev.phase = BUS_FREE;\r
-       scsiDev.reservedId = -1;\r
-       scsiDev.reserverId = -1;\r
-       scsiDev.unitAttention = POWER_ON_RESET;\r
+       scsiDev.target = NULL;\r
+\r
+       int i;\r
+       for (i = 0; i < MAX_SCSI_TARGETS; ++i)\r
+       {\r
+               const TargetConfig* cfg = getConfigByIndex(i);\r
+               if (cfg && (cfg->scsiId & CONFIG_TARGET_ENABLED))\r
+               {\r
+                       scsiDev.targets[i].targetId = cfg->scsiId & CONFIG_TARGET_ID_BITS;\r
+                       scsiDev.targets[i].cfg = cfg;\r
+               }\r
+               else\r
+               {\r
+                       scsiDev.targets[i].targetId = 0xff;\r
+                       scsiDev.targets[i].cfg = NULL;\r
+               }\r
+               scsiDev.targets[i].reservedId = -1;\r
+               scsiDev.targets[i].reserverId = -1;\r
+               scsiDev.targets[i].unitAttention = POWER_ON_RESET;\r
+               scsiDev.targets[i].sense.code = NO_SENSE;\r
+               scsiDev.targets[i].sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
+       }\r
 }\r
 \r
 void scsiDisconnect()\r
@@ -852,7 +892,8 @@ int scsiReconnect()
        {\r
                // Arbitrate.\r
                ledOn();\r
-               SCSI_Out_Bits_Write(scsiDev.scsiIdMask);\r
+               uint8_t scsiIdMask = 1 << scsiDev.target->targetId;\r
+               SCSI_Out_Bits_Write(scsiIdMask);\r
                SCSI_Out_Ctl_Write(1); // Write bits manually.\r
                SCSI_SetPin(SCSI_Out_BSY);\r
 \r
@@ -860,7 +901,7 @@ int scsiReconnect()
 \r
                uint8_t dbx = scsiReadDBxPins();\r
                sel = SCSI_ReadFilt(SCSI_Filt_SEL);\r
-               if (sel || ((dbx ^ scsiDev.scsiIdMask) > scsiDev.scsiIdMask))\r
+               if (sel || ((dbx ^ scsiIdMask) > scsiIdMask))\r
                {\r
                        // Lost arbitration.\r
                        SCSI_Out_Ctl_Write(0);\r
@@ -875,7 +916,7 @@ int scsiReconnect()
 \r
                        // Reselection phase\r
                        SCSI_CTL_PHASE_Write(__scsiphase_io);\r
-                       SCSI_Out_Bits_Write(scsiDev.scsiIdMask | (1 << scsiDev.initiatorId));\r
+                       SCSI_Out_Bits_Write(scsiIdMask | (1 << scsiDev.initiatorId));\r
                        scsiDeskewDelay(); // 2 deskew delays\r
                        scsiDeskewDelay(); // 2 deskew delays\r
                        SCSI_ClearPin(SCSI_Out_BSY);\r
index 26e8930..8aa1cd5 100755 (executable)
@@ -63,7 +63,23 @@ typedef enum
 
 typedef struct
 {
-       uint8_t scsiIdMask;
+       uint8_t targetId;
+       const TargetConfig* cfg;
+
+       ScsiSense sense;
+
+       uint16 unitAttention; // Set to the sense qualifier key to be returned.
+
+       // Only let the reserved initiator talk to us.
+       // A 3rd party may be sending the RESERVE/RELEASE commands
+       int reservedId; // 0 -> 7 if reserved. -1 if not reserved.
+       int reserverId; // 0 -> 7 if reserved. -1 if not reserved.
+} TargetState;
+
+typedef struct
+{
+       TargetState targets[MAX_SCSI_TARGETS];
+       TargetState* target;
 
        // Set to true (1) if the ATN flag was set, and we need to
        // enter the MESSAGE_OUT phase.
@@ -91,17 +107,11 @@ typedef struct
        // Only let the reserved initiator talk to us.
        // A 3rd party may be sending the RESERVE/RELEASE commands
        int initiatorId; // 0 -> 7. Set during the selection phase.
-       int reservedId; // 0 -> 7 if reserved. -1 if not reserved.
-       int reserverId; // 0 -> 7 if reserved. -1 if not reserved.
 
        // SCSI_STATUS value.
        // Change to CHECK_CONDITION when setting a SENSE value
        uint8 status;
 
-       ScsiSense sense;
-
-       uint16 unitAttention; // Set to the sense qualifier key to be returned.
-
        uint8 msgIn;
        uint8 msgOut;
 
index df77988..ba000d9 100755 (executable)
@@ -161,7 +161,7 @@ sdReadMultiSectorPrep()
 {\r
        uint8 v;\r
        uint32 scsiLBA = (transfer.lba + transfer.currentBlock);\r
-       uint32 sdLBA = SCSISector2SD(scsiLBA);\r
+       uint32 sdLBA = SCSISector2SD(scsiDev.target->cfg, scsiLBA);\r
 \r
        if (!sdDev.ccs)\r
        {\r
@@ -174,8 +174,8 @@ sdReadMultiSectorPrep()
                sdClearStatus();\r
 \r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = HARDWARE_ERROR;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
+               scsiDev.target->sense.code = HARDWARE_ERROR;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
@@ -205,8 +205,8 @@ dmaReadSector(uint8_t* outputBuffer)
                if (scsiDev.status != CHECK_CONDITION)\r
                {\r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = HARDWARE_ERROR;\r
-                       scsiDev.sense.asc = UNRECOVERED_READ_ERROR;\r
+                       scsiDev.target->sense.code = HARDWARE_ERROR;\r
+                       scsiDev.target->sense.asc = UNRECOVERED_READ_ERROR;\r
                        scsiDev.phase = STATUS;\r
                }\r
                return;\r
@@ -272,8 +272,8 @@ void sdReadSingleSectorDMA(uint32_t lba, uint8_t* outputBuffer)
                sdClearStatus();\r
 \r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = HARDWARE_ERROR;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
+               scsiDev.target->sense.code = HARDWARE_ERROR;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
@@ -323,8 +323,8 @@ void sdCompleteRead()
                }\r
 \r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = HARDWARE_ERROR;\r
-               scsiDev.sense.asc = UNRECOVERED_READ_ERROR;\r
+               scsiDev.target->sense.code = HARDWARE_ERROR;\r
+               scsiDev.target->sense.asc = UNRECOVERED_READ_ERROR;\r
                scsiDev.phase = STATUS;\r
        }\r
 \r
@@ -418,8 +418,8 @@ sdWriteSectorDMAPoll()
                        sdClearStatus();\r
 \r
                        scsiDev.status = CHECK_CONDITION;\r
-                       scsiDev.sense.code = HARDWARE_ERROR;\r
-                       scsiDev.sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
+                       scsiDev.target->sense.code = HARDWARE_ERROR;\r
+                       scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
                        scsiDev.phase = STATUS;\r
                }\r
                else\r
@@ -461,8 +461,8 @@ void sdCompleteWrite()
        {\r
                sdClearStatus();\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = HARDWARE_ERROR;\r
-               scsiDev.sense.asc = WRITE_ERROR_AUTO_REALLOCATION_FAILED;\r
+               scsiDev.target->sense.code = HARDWARE_ERROR;\r
+               scsiDev.target->sense.asc = WRITE_ERROR_AUTO_REALLOCATION_FAILED;\r
                scsiDev.phase = STATUS;\r
        }\r
 }\r
@@ -730,13 +730,14 @@ void sdWriteMultiSectorPrep()
        // We don't care about the response - if the command is not accepted, writes\r
        // will just be a bit slower.\r
        // Max 22bit parameter.\r
-       uint32_t sdBlocks = transfer.blocks * SDSectorsPerSCSISector();\r
+       uint32_t sdBlocks =\r
+               transfer.blocks * SDSectorsPerSCSISector(scsiDev.target->cfg);\r
        uint32 blocks = sdBlocks > 0x7FFFFF ? 0x7FFFFF : sdBlocks;\r
        sdCommandAndResponse(SD_APP_CMD, 0);\r
        sdCommandAndResponse(SD_APP_SET_WR_BLK_ERASE_COUNT, blocks);\r
 \r
        uint32 scsiLBA = (transfer.lba + transfer.currentBlock);\r
-       uint32 sdLBA = SCSISector2SD(scsiLBA);\r
+       uint32 sdLBA = SCSISector2SD(scsiDev.target->cfg, scsiLBA);\r
        if (!sdDev.ccs)\r
        {\r
                sdLBA = sdLBA * SD_SECTOR_SIZE;\r
@@ -747,8 +748,8 @@ void sdWriteMultiSectorPrep()
                scsiDiskReset();\r
                sdClearStatus();\r
                scsiDev.status = CHECK_CONDITION;\r
-               scsiDev.sense.code = HARDWARE_ERROR;\r
-               scsiDev.sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
+               scsiDev.target->sense.code = HARDWARE_ERROR;\r
+               scsiDev.target->sense.asc = LOGICAL_UNIT_COMMUNICATION_FAILURE;\r
                scsiDev.phase = STATUS;\r
        }\r
        else\r
index 53af611..00b5213 100755 (executable)
@@ -6,7 +6,7 @@
     <Toolchain Name="ARM GCC" Selected="True">
       <Tool Name="prebuild" Command="" Options="" />
       <Tool Name="assembler" Command="arm-none-eabi-as.exe" Options="-I. -I./Generated_Source/PSoC5 -mcpu=cortex-m3 -mthumb -g -alh=${OutputDir}/${CompileFile}.lst " />
-      <Tool Name="compiler" Command="arm-none-eabi-gcc.exe" Options="-I. -I./Generated_Source/PSoC5 -Wno-main -mcpu=cortex-m3 -mthumb -Wall -g -D NDEBUG -Wa,-alh=${OutputDir}\${CompileFile}.lst -Os -ffunction-sections " />
+      <Tool Name="compiler" Command="arm-none-eabi-gcc.exe" Options="-I. -I./Generated_Source/PSoC5 -Wno-main -mcpu=cortex-m3 -mthumb -I ../../../include -Wall -g -D NDEBUG -Wa,-alh=${OutputDir}\${CompileFile}.lst -Os -ffunction-sections " />
       <Tool Name="linker" Command="arm-none-eabi-gcc.exe" Options="-mthumb -march=armv7-m -mfix-cortex-m3-ldrd -T .\Generated_Source\PSoC5\cm3gcc.ld -g -Wl,-Map,${OutputDir}\${ProjectShortName}.map -specs=nano.specs -Wl,--gc-sections " />
       <Tool Name="postbuild" Command="" Options="" />
     </Toolchain>
@@ -18,7 +18,7 @@
       <Tool Name="postbuild" Command="" Options="" />
     </Toolchain>
   </Toolchains>
-  <Project Name="SCSI2SD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" Version="4.0" Type="Bootloadable">
+  <Project Name="SCSI2SD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" Version="4.0" Type="Bootloadable">
     <CMSIS_SVD_File>SCSI2SD.svd</CMSIS_SVD_File>
     <Datasheet />
     <LinkerFiles>
@@ -27,8 +27,8 @@
       <LinkerFile Toolchain="IAR EWARM">.\Generated_Source\PSoC5\Cm3Iar.icf</LinkerFile>
     </LinkerFiles>
     <Folders>
-      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\src">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\src">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">..\..\src\main.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\diagnostic.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\disk.c</File>
@@ -42,6 +42,8 @@
           <File BuildType="BUILD" Toolchain="">..\..\src\config.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\led.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\time.c</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\hidpacket.c</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\cdrom.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\diagnostic.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\disk.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\geometry.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\sd.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\config.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\time.h</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\cdrom.h</File>
         </Files>
       </Folder>
-      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">.\device.h</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\include">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+          <File BuildType="BUILD" Toolchain="">..\..\..\include\hidpacket.h</File>
+          <File BuildType="BUILD" Toolchain="">..\..\..\include\scsi2sd.h</File>
+        </Files>
+      </Folder>
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.h</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.c</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cydevice.h</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\libelf.dll</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_GCC">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_GCC">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="ARM GCC">.\Generated_Source\PSoC5\ARM_GCC\CyComponentLibrary.a</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="ARM Keil MDK">.\Generated_Source\PSoC5\ARM_Keil_MDK\CyComponentLibrary.a</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\IAR">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn\Generated_Source\PSoC5\IAR">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="IAR">.\Generated_Source\PSoC5\IAR\CyComponentLibrary.a</File>
         </Files>
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\codegentemp">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_441">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_473">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\DP8051_Keil_951">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\DP8051">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\CortexM0">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\CortexM3">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\SCSI2SD.cydsn" />
       </Folder>
     </Folders>
   </Project>
index 514a296..00cc37a 100644 (file)
Binary files a/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit differ
index 9c35e69..4fd79e0 100755 (executable)
 <build_action v="C_FILE" />\r
 <PropertyDeltas />\r
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">\r
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="hidpacket.c" persistent="..\..\src\hidpacket.c">\r
+<Hidden v="False" />\r
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>\r
+<build_action v="C_FILE" />\r
+<PropertyDeltas />\r
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">\r
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="cdrom.c" persistent="..\..\src\cdrom.c">\r
+<Hidden v="False" />\r
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>\r
+<build_action v="C_FILE" />\r
+<PropertyDeltas />\r
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
 </dependencies>\r
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>\r
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>\r
 <build_action v="NONE" />\r
 <PropertyDeltas />\r
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">\r
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="hidpacket.h" persistent="..\..\..\include\hidpacket.h">\r
+<Hidden v="False" />\r
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>\r
+<build_action v="NONE" />\r
+<PropertyDeltas />\r
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">\r
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="scsi2sd.h" persistent="..\..\..\include\scsi2sd.h">\r
+<Hidden v="False" />\r
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>\r
+<build_action v="NONE" />\r
+<PropertyDeltas />\r
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">\r
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="cdrom.h" persistent="..\..\src\cdrom.h">\r
+<Hidden v="False" />\r
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>\r
+<build_action v="NONE" />\r
+<PropertyDeltas />\r
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>\r
 </dependencies>\r
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>\r
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM0@Linker@Command Line@Command Line" v="" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM0@Library Generation@Command Line@Command Line" v="" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@General@Output Directory" v="${ProjectDir}\${ProcessorType}\${Platform}\${Config}" />\r
-<name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@C/C++@General@Additional Include Directories" v="" />\r
+<name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@C/C++@General@Additional Include Directories" v="../../../include" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@C/C++@General@Warnings as Errors" v="False" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@C/C++@General@Warning Level" v="High" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@C/C++@General@Pedantic Compilation" v="False" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@Linker@Command Line@Command Line" v="" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Debug@CortexM3@Library Generation@Command Line@Command Line" v="" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@General@Output Directory" v="${ProjectDir}\${ProcessorType}\${Platform}\${Config}" />\r
-<name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@C/C++@General@Additional Include Directories" v="" />\r
+<name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@C/C++@General@Additional Include Directories" v="../../../include" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@C/C++@General@Warnings as Errors" v="False" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@C/C++@General@Warning Level" v="High" />\r
 <name_val_pair name="b98f980c-3bd1-4fc7-a887-c56a20a46fdd@Release@CortexM3@C/C++@General@Pedantic Compilation" v="False" />\r
index 6cfd4f2..2530471 100755 (executable)
@@ -18,7 +18,7 @@
       <Tool Name="postbuild" Command="" Options="" />\r
     </Toolchain>\r
   </Toolchains>\r
-  <Project Name="USB_Bootloader" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" Version="4.0" Type="Bootloader">\r
+  <Project Name="USB_Bootloader" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" Version="4.0" Type="Bootloader">\r
     <CMSIS_SVD_File>USB_Bootloader.svd</CMSIS_SVD_File>\r
     <Datasheet />\r
     <LinkerFiles>\r
       <LinkerFile Toolchain="IAR EWARM">.\Generated_Source\PSoC5\Cm3Iar.icf</LinkerFile>\r
     </LinkerFiles>\r
     <Folders>\r
-      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
           <File BuildType="BUILD" Toolchain="">.\main.c</File>\r
         </Files>\r
       </Folder>\r
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5">\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.h</File>\r
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.c</File>\r
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cymetadata.c</File>\r
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\libelf.dll</File>\r
         </Files>\r
       </Folder>\r
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\ARM_GCC">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\ARM_GCC">\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
           <File BuildType="BUILD" Toolchain="ARM GCC">.\Generated_Source\PSoC5\ARM_GCC\CyComponentLibrary.a</File>\r
         </Files>\r
       </Folder>\r
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
           <File BuildType="BUILD" Toolchain="ARM Keil MDK">.\Generated_Source\PSoC5\ARM_Keil_MDK\CyComponentLibrary.a</File>\r
         </Files>\r
       </Folder>\r
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\IAR">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5\IAR">\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn">\r
           <File BuildType="BUILD" Toolchain="IAR">.\Generated_Source\PSoC5\IAR\CyComponentLibrary.a</File>\r
         </Files>\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\codegentemp">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_441">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_473">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\DP8051_Keil_951">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\DP8051">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\CortexM0">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
       <Folder BuildType="EXCLUDE" Path=".\CortexM3">\r
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn" />\r
       </Folder>\r
     </Folders>\r
   </Project>\r
index aeeabb3..744fc43 100644 (file)
Binary files a/software/SCSI2SD/v3/USB_Bootloader.cydsn/USB_Bootloader.cyfit and b/software/SCSI2SD/v3/USB_Bootloader.cydsn/USB_Bootloader.cyfit differ
index 42f3368..2a57dc0 100755 (executable)
 <name_val_pair name="W:\SCSI2SD\software\SCSI2SD\USB_Bootloader.cydsn\CortexM3\ARM_GCC_473\Debug\USB_Bootloader.hex" v="&quot;-mthumb &quot;&quot;-march=armv7-m &quot;&quot;-mfix-cortex-m3-ldrd &quot;&quot;-T &quot;&quot;.\Generated_Source\PSoC5\cm3gcc.ld &quot;&quot;-g &quot;&quot;-Wl,-Map,${OutputDir}\${ProjectShortName}.map &quot;&quot;-specs=nano.specs &quot;&quot;-Wl,--gc-sections &quot;" />\r
 </name>\r
 </genericCmdLineData>\r
-<codeGenCmdLineTag v="&quot;-.appdatapath&quot; &quot;C:\Users\Micha_000\AppData\Local\Cypress Semiconductor\PSoC Creator\3.0&quot; &quot;-.fdsnotice&quot; &quot;-.fdswarpdepfile=warp_dependencies.txt&quot; &quot;-.fdselabdepfile=elab_dependencies.txt&quot; &quot;-.fdsbldfile=generated_files.txt&quot; &quot;-p&quot; &quot;Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\USB_Bootloader.cyprj&quot; &quot;-d&quot; &quot;CY8C5267AXI-LP051&quot; &quot;-s&quot; &quot;Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5&quot; &quot;--&quot; &quot;-yv2&quot; &quot;-v3&quot; &quot;-ygs&quot; &quot;-q10&quot; &quot;-o2&quot; &quot;-.fftcfgtype=LE&quot; " />\r
+<codeGenCmdLineTag v="&quot;-.appdatapath&quot; &quot;C:\Users\Micha_000\AppData\Local\Cypress Semiconductor\PSoC Creator\3.0&quot; &quot;-.fdsnotice&quot; &quot;-.fdswarpdepfile=warp_dependencies.txt&quot; &quot;-.fdselabdepfile=elab_dependencies.txt&quot; &quot;-.fdsbldfile=generated_files.txt&quot; &quot;-p&quot; &quot;Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\USB_Bootloader.cyprj&quot; &quot;-d&quot; &quot;CY8C5267AXI-LP051&quot; &quot;-s&quot; &quot;Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v3\USB_Bootloader.cydsn\Generated_Source\PSoC5&quot; &quot;--&quot; &quot;-yv2&quot; &quot;-v3&quot; &quot;-ygs&quot; &quot;-q10&quot; &quot;-o2&quot; &quot;-.fftcfgtype=LE&quot; " />\r
 </CyGuid_b0374e30-ce3a-47f2-ad85-821643292c68>\r
 </dataGuid>\r
 <dataGuid v="597c5b74-0c46-4204-8b7f-96f3570671dc">\r
 <v>C:\Program Files (x86)\Cypress\PSoC Creator\3.0\PSoC Creator\warp\lib\common\stdlogic\mod_genv.vif</v>\r
 <v>C:\Program Files (x86)\Cypress\PSoC Creator\3.0\PSoC Creator\warp\lib\common\stdlogic\rtlpkg.vif</v>\r
 </warp_dep>\r
-<deps_time v="130571566842994698" />\r
+<deps_time v="130621702845187692" />\r
 <top_block v="TopDesign" />\r
 <last_generation v="0" />\r
 </CyGuid_925cc1e1-309e-4e08-b0a1-09a83c35b157>\r
 </dataGuid>\r
 <dataGuid v="769d31ea-68b1-4f0c-b90a-7c10a43ee563">\r
 <CyGuid_769d31ea-68b1-4f0c-b90a-7c10a43ee563 type_name="CyDesigner.Common.ProjMgmt.Model.CyLinkCustomData" version="1">\r
-<deps_time v="130571567839248780" />\r
+<deps_time v="130621704041554601" />\r
 </CyGuid_769d31ea-68b1-4f0c-b90a-7c10a43ee563>\r
 </dataGuid>\r
 <dataGuid v="bf610382-39c6-441f-80b8-b04622ea7845">\r
index 46533e6..d63a6c6 100755 (executable)
@@ -6,7 +6,7 @@
     <Toolchain Name="ARM GCC" Selected="True">
       <Tool Name="prebuild" Command="" Options="" />
       <Tool Name="assembler" Command="arm-none-eabi-as.exe" Options="-I. -I./Generated_Source/PSoC5 -mcpu=cortex-m3 -mthumb -g -alh=${OutputDir}/${CompileFile}.lst " />
-      <Tool Name="compiler" Command="arm-none-eabi-gcc.exe" Options="-I. -I./Generated_Source/PSoC5 -Wno-main -mcpu=cortex-m3 -mthumb -Wall -g -D NDEBUG -Wa,-alh=${OutputDir}\${CompileFile}.lst -Os -ffunction-sections " />
+      <Tool Name="compiler" Command="arm-none-eabi-gcc.exe" Options="-I. -I./Generated_Source/PSoC5 -Wno-main -mcpu=cortex-m3 -mthumb -I ../../../include -Wall -g -D NDEBUG -Wa,-alh=${OutputDir}\${CompileFile}.lst -Os -ffunction-sections " />
       <Tool Name="linker" Command="arm-none-eabi-gcc.exe" Options="-mthumb -march=armv7-m -mfix-cortex-m3-ldrd -T .\Generated_Source\PSoC5\cm3gcc.ld -g -Wl,-Map,${OutputDir}\${ProjectShortName}.map -specs=nano.specs -Wl,--gc-sections " />
       <Tool Name="postbuild" Command="" Options="" />
     </Toolchain>
@@ -18,7 +18,7 @@
       <Tool Name="postbuild" Command="" Options="" />
     </Toolchain>
   </Toolchains>
-  <Project Name="SCSI2SD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" Version="4.0" Type="Bootloadable">
+  <Project Name="SCSI2SD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" Version="4.0" Type="Bootloadable">
     <CMSIS_SVD_File>SCSI2SD.svd</CMSIS_SVD_File>
     <Datasheet />
     <LinkerFiles>
@@ -27,8 +27,8 @@
       <LinkerFile Toolchain="IAR EWARM">.\Generated_Source\PSoC5\Cm3Iar.icf</LinkerFile>
     </LinkerFiles>
     <Folders>
-      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\src">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\src">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">..\..\src\main.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\diagnostic.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\disk.c</File>
@@ -42,6 +42,8 @@
           <File BuildType="BUILD" Toolchain="">..\..\src\config.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\led.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\time.c</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\hidpacket.c</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\cdrom.c</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\diagnostic.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\disk.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\geometry.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\sd.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\config.h</File>
           <File BuildType="BUILD" Toolchain="">..\..\src\time.h</File>
+          <File BuildType="BUILD" Toolchain="">..\..\src\cdrom.h</File>
         </Files>
       </Folder>
-      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">.\device.h</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="BUILD" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\include">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+          <File BuildType="BUILD" Toolchain="">..\..\..\include\scsi2sd.h</File>
+          <File BuildType="BUILD" Toolchain="">..\..\..\include\hidpacket.h</File>
+        </Files>
+      </Folder>
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.h</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cyfitter_cfg.c</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\cybootloader.c</File>
           <File BuildType="BUILD" Toolchain="">.\Generated_Source\PSoC5\libelf.dll</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_GCC">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_GCC">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="ARM GCC">.\Generated_Source\PSoC5\ARM_GCC\CyComponentLibrary.a</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\ARM_Keil_MDK">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="ARM Keil MDK">.\Generated_Source\PSoC5\ARM_Keil_MDK\CyComponentLibrary.a</File>
         </Files>
       </Folder>
-      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\IAR">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
+      <Folder BuildType="STRICT" Path="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn\Generated_Source\PSoC5\IAR">
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn">
           <File BuildType="BUILD" Toolchain="IAR">.\Generated_Source\PSoC5\IAR\CyComponentLibrary.a</File>
         </Files>
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\codegentemp">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_441">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\ARM_GCC_473">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\DP8051_Keil_951">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\DP8051">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\CortexM0">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
       <Folder BuildType="EXCLUDE" Path=".\CortexM3">
-        <Files Root="Z:\projects\SCSI2SD\git-timeout\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
+        <Files Root="Z:\projects\SCSI2SD\git\SCSI2SD\software\SCSI2SD\v4\SCSI2SD.cydsn" />
       </Folder>
     </Folders>
   </Project>
index 7ac12a4..2e5c3a8 100644 (file)
Binary files a/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit and b/software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit differ
index b30c720..5bdf1f9 100755 (executable)
 <build_action v="C_FILE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="hidpacket.c" persistent="..\..\src\hidpacket.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="C_FILE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="cdrom.c" persistent="..\..\src\cdrom.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="C_FILE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
 <build_action v="NONE" />
 <PropertyDeltas />
 </CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="scsi2sd.h" persistent="..\..\..\include\scsi2sd.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="NONE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="hidpacket.h" persistent="..\..\..\include\hidpacket.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="NONE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFile" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItem" version="2" name="cdrom.h" persistent="..\..\src\cdrom.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="NONE" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM0@Linker@Command Line@Command Line" v="" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM0@Library Generation@Command Line@Command Line" v="" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@General@Output Directory" v="${ProjectDir}\${ProcessorType}\${Platform}\${Config}" />
-<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@C/C++@General@Additional Include Directories" v="" />
+<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@C/C++@General@Additional Include Directories" v="../../../include" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@C/C++@General@Warnings as Errors" v="False" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@C/C++@General@Warning Level" v="High" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@C/C++@General@Pedantic Compilation" v="False" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@Linker@Command Line@Command Line" v="" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Debug@CortexM3@Library Generation@Command Line@Command Line" v="" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@General@Output Directory" v="${ProjectDir}\${ProcessorType}\${Platform}\${Config}" />
-<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@C/C++@General@Additional Include Directories" v="" />
+<name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@C/C++@General@Additional Include Directories" v="../../../include" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@C/C++@General@Warnings as Errors" v="False" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@C/C++@General@Warning Level" v="High" />
 <name_val_pair name="c9323d49-d323-40b8-9b59-cc008d68a989@Release@CortexM3@C/C++@General@Pedantic Compilation" v="False" />
 <BootloaderTag hexFile="" elfFile="" />
 <current_generation v="2" />
 </CyGuid_fec8f9e8-2365-4bdb-96d3-a4380222e01b>
-</CyXmlSerializer>
\ No newline at end of file
+</CyXmlSerializer>
index e534dcd..470a7b5 100644 (file)
Binary files a/software/SCSI2SD/v4/USB_Bootloader.cydsn/USB_Bootloader.cyfit and b/software/SCSI2SD/v4/USB_Bootloader.cydsn/USB_Bootloader.cyfit differ
index c724a35..d437f60 100755 (executable)
@@ -5,8 +5,7 @@ Linux)
        # Builds all of the utilities (not firmware) under Linux.
        # Requires mingw installed to cross-compile Windows targets.
 
-       (cd bootloaderhost && ./build.sh) &&
-       (cd scsi2sd-config && ./build.sh) &&
+       (cd scsi2sd-util && ./build.sh) &&
        (cd scsi2sd-debug && ./build.sh)
 
        if [ $? -eq 0 ]; then
@@ -14,30 +13,25 @@ Linux)
                mkdir -p build/windows/64bit
                mkdir -p build/windows/32bit
 
-               cp bootloaderhost/build/linux/bootloaderhost build/linux
-               cp scsi2sd-config/build/linux/scsi2sd-config build/linux
+               cp scsi2sd-util/build/linux/scsi2sd-util build/linux
                cp scsi2sd-debug/build/linux/scsi2sd-debug build/linux
 
-               cp bootloaderhost/build/windows/32bit/bootloaderhost.exe build/windows/32bit
-               cp scsi2sd-config/build/windows/32bit/scsi2sd-config.exe build/windows/32bit
+               cp scsi2sd-util/build/windows/32bit/scsi2sd-util.exe build/windows/32bit
                cp scsi2sd-debug/build/windows/32bit/scsi2sd-debug.exe build/windows/32bit
 
-               cp bootloaderhost/build/windows/64bit/bootloaderhost.exe build/windows/64bit
-               cp scsi2sd-config/build/windows/64bit/scsi2sd-config.exe build/windows/64bit
+               cp scsi2sd-util/build/windows/64bit/scsi2sd-util.exe build/windows/64bit
                cp scsi2sd-debug/build/windows/64bit/scsi2sd-debug.exe build/windows/64bit
        fi
 ;;
 
 Darwin)
-       make -C bootloaderhost &&
-       make -C scsi2sd-config &&
+       make -C scsi2sd-util &&
        make -C scsi2sd-debug
 
        if [ $? -eq 0 ]; then
                mkdir -p build/mac
 
-               cp bootloaderhost/build/mac/bootloaderhost build/mac
-               cp scsi2sd-config/build/mac/scsi2sd-config build/mac
+               cp scsi2sd-util/build/mac/scsi2sd-util build/mac
                cp scsi2sd-debug/build/mac/scsi2sd-debug build/mac
        fi
 
index 32c87bd..9e560fa 100644 (file)
 #include <limits>
 
 #include <string.h>
-#include <arpa/inet.h>
 
 
 using namespace SCSI2SD;
 
+namespace
+{
+       // Endian conversion routines.
+       // The Cortex-M3 inside the Cypress PSoC 5LP is a
+       // little-endian device.
+
+       bool isHostLE()
+       {
+               union
+               {
+                       int i;
+                       char c[sizeof(int)];
+               } x;
+               x.i = 1;
+               return (x.c[0] == 1);
+       }
+
+       uint16_t toLE16(uint16_t in)
+       {
+               if (isHostLE())
+               {
+                       return in;
+               }
+               else
+               {
+                       return (in >> 8) | (in << 8);
+               }
+       }
+       uint16_t fromLE16(uint16_t in)
+       {
+               return toLE16(in);
+       }
+
+       uint32_t toLE32(uint32_t in)
+       {
+               if (isHostLE())
+               {
+                       return in;
+               }
+               else
+               {
+                       return (in >> 24) |
+                               ((in >> 8) & 0xff00) |
+                               ((in << 8) & 0xff0000) |
+                               (in << 24);
+               }
+       }
+       uint32_t fromLE32(uint32_t in)
+       {
+               return toLE32(in);
+       }
+
+}
+
 TargetConfig
 ConfigUtil::Default(size_t targetIdx)
 {
@@ -64,11 +117,11 @@ ConfigUtil::fromBytes(const uint8_t* data)
 {
        TargetConfig result;
        memcpy(&result, data, sizeof(TargetConfig));
-       result.sdSectorStart = ntohl(result.sdSectorStart);
-       result.scsiSectors = ntohl(result.scsiSectors);
-       result.bytesPerSector = ntohs(result.bytesPerSector);
-       result.sectorsPerTrack = ntohs(result.sectorsPerTrack);
-       result.headsPerCylinder = ntohs(result.headsPerCylinder);
+       result.sdSectorStart = toLE32(result.sdSectorStart);
+       result.scsiSectors = toLE32(result.scsiSectors);
+       result.bytesPerSector = toLE16(result.bytesPerSector);
+       result.sectorsPerTrack = toLE16(result.sectorsPerTrack);
+       result.headsPerCylinder = toLE16(result.headsPerCylinder);
        return result;
 }
 
@@ -77,11 +130,11 @@ std::vector<uint8_t>
 ConfigUtil::toBytes(const TargetConfig& _config)
 {
        TargetConfig config(_config);
-       config.sdSectorStart = htonl(config.sdSectorStart);
-       config.scsiSectors = htonl(config.scsiSectors);
-       config.bytesPerSector = htons(config.bytesPerSector);
-       config.sectorsPerTrack = htons(config.sectorsPerTrack);
-       config.headsPerCylinder = htons(config.headsPerCylinder);
+       config.sdSectorStart = fromLE32(config.sdSectorStart);
+       config.scsiSectors = fromLE32(config.scsiSectors);
+       config.bytesPerSector = fromLE16(config.bytesPerSector);
+       config.sectorsPerTrack = fromLE16(config.sectorsPerTrack);
+       config.headsPerCylinder = fromLE16(config.headsPerCylinder);
 
        const uint8_t* begin = reinterpret_cast<const uint8_t*>(&config);
        return std::vector<uint8_t>(begin, begin + sizeof(config));
index 1046f86..d765125 100644 (file)
@@ -1,8 +1,9 @@
 VPATH=cybootloaderutils ../SCSI2SD/src
 
-CPPFLAGS = -I cybootloaderutils -I hidapi/hidapi -I wxWidgets/include -I ../include
+CPPFLAGS = -I cybootloaderutils -I hidapi/hidapi -I wxWidgets/include -I ../include -Ilibzipper-1.0.3 -I$(BUILD)/zlib
 CFLAGS += -Wall -Wno-pointer-sign -O2 -g
 CXXFLAGS += -Wall -O2 -g -std=c++0x
+LDFLAGS += -L$(BUILD)/libzipper/.libs -lzipper -L$(BUILD)/zlib -lz
 
 TARGET ?= $(shell uname -s)
 ifeq ($(TARGET),Win32)
@@ -65,12 +66,33 @@ OBJ = \
        $(BUILD)/hidpacket.o \
 
 
+$(OBJ): $(BUILD)/zlib/buildstamp
+$(BUILD)/zlib/buildstamp:
+       mkdir -p $(dir $@)
+       ( \
+               cd $(dir $@) && \
+               cp -a $(CURDIR)/zlib-1.2.8/* . && \
+               ./configure --static && \
+               $(MAKE) \
+       ) && \
+       touch $@
+
 $(OBJ): $(BUILD)/wx.buildstamp
-$(BUILD)/wx.buildstamp:
+$(BUILD)/wx.buildstamp: $(BUILD)/zlib/buildstamp
        mkdir -p $(dir $@)
        ( \
                cd $(BUILD) && \
-               $(CURDIR)/wxWidgets/configure $(WX_CONFIG) && \
+               $(CURDIR)/wxWidgets/configure $(WX_CONFIG) CPPFLAGS=-I$(BUILD)/zlib LDFLAGS=-I$(BUILD)/zlib && \
+               $(MAKE) \
+       ) && \
+       touch $@
+
+$(OBJ): $(BUILD)/libzipper/buildstamp
+$(BUILD)/libzipper/buildstamp:
+       mkdir -p $(dir $@)
+       ( \
+               cd $(dir $@) && \
+               $(CURDIR)/libzipper-1.0.3/configure --disable-shared --enable-static && \
                $(MAKE) \
        ) && \
        touch $@
@@ -88,5 +110,5 @@ $(BUILD)/scsi2sd-util$(EXE): $(OBJ)
        $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) `$(BUILD)/wx-config --libs` -o $@
 
 clean:
-       rm $(BUILD)/scsi2sd-util$(EXE) $(OBJ)
+       rm $(BUILD)/scsi2sd-util$(EXE) $(OBJ) $(BUILD)/libzipper/buildstamp
 
index 565b02d..8d8e0ac 100644 (file)
@@ -69,7 +69,7 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) :
        myNumSectorValidator(new wxIntegerValidator<uint32_t>),
        mySizeValidator(new wxFloatingPointValidator<float>(2))
 {
-       wxFlexGridSizer *fgs = new wxFlexGridSizer(12, 3, 9, 25);
+       wxFlexGridSizer *fgs = new wxFlexGridSizer(13, 3, 9, 25);
 
        fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
        myEnableCtrl =
@@ -100,6 +100,22 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) :
        fgs->Add(myScsiIdMsg);
        Bind(wxEVT_SPINCTRL, &TargetPanel::onInput<wxSpinEvent>, this, ID_scsiIdCtrl);
 
+       fgs->Add(new wxStaticText(this, wxID_ANY, wxT("Device Type")));
+       wxString deviceTypes[] = {wxT("Hard Drive"), wxT("Removable"), wxT("CDROM")};
+       myDeviceTypeCtrl =
+               new wxChoice(
+                       this,
+                       ID_deviceTypeCtrl,
+                       wxDefaultPosition,
+                       wxDefaultSize,
+                       sizeof(deviceTypes) / sizeof(wxString),
+                       deviceTypes
+                       );
+       myDeviceTypeCtrl->SetSelection(0);
+       fgs->Add(myDeviceTypeCtrl);
+       fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
+       Bind(wxEVT_CHOICE, &TargetPanel::onInput<wxCommandEvent>, this, ID_deviceTypeCtrl);
+
        fgs->Add(new wxStaticText(this, wxID_ANY, wxT("")));
        myParityCtrl =
                new wxCheckBox(
@@ -186,7 +202,7 @@ TargetPanel::TargetPanel(wxWindow* parent, const TargetConfig& initialConfig) :
        mySizeCtrl->SetToolTip(wxT("Device size"));
        sizeContainer->Add(mySizeCtrl);
        wxString units[] = {wxT("KB"), wxT("MB"), wxT("GB")};
-       mySizeUnitCtrl = 
+       mySizeUnitCtrl =
                new wxChoice(
                        this,
                        ID_sizeUnitCtrl,
@@ -351,6 +367,7 @@ TargetPanel::evaluate()
        bool enabled = myEnableCtrl->IsChecked();
        {
                myScsiIdCtrl->Enable(enabled);
+               myDeviceTypeCtrl->Enable(enabled);
                myParityCtrl->Enable(enabled);
                myUnitAttCtrl->Enable(enabled);
                myStartSDSectorCtrl->Enable(enabled);
@@ -471,6 +488,8 @@ TargetPanel::getConfig() const
                config.scsiId = config.scsiId | CONFIG_TARGET_ENABLED;
        }
 
+       config.deviceType = myDeviceTypeCtrl->GetSelection();
+
        config.flags =
                (myParityCtrl->IsChecked() ? CONFIG_ENABLE_PARITY : 0) |
                (myUnitAttCtrl->IsChecked() ? CONFIG_ENABLE_UNIT_ATTENTION : 0);
@@ -503,6 +522,8 @@ TargetPanel::setConfig(const TargetConfig& config)
        myScsiIdCtrl->SetValue(config.scsiId & CONFIG_TARGET_ID_BITS);
        myEnableCtrl->SetValue(config.scsiId & CONFIG_TARGET_ENABLED);
 
+       myDeviceTypeCtrl->SetSelection(config.deviceType);
+
        myParityCtrl->SetValue(config.flags & CONFIG_ENABLE_PARITY);
        myUnitAttCtrl->SetValue(config.flags & CONFIG_ENABLE_UNIT_ATTENTION);
 
index 488f57d..769cd2e 100644 (file)
@@ -74,6 +74,7 @@ private:
        {
                ID_enableCtrl = wxID_HIGHEST + 1,
                ID_scsiIdCtrl,
+               ID_deviceTypeCtrl,
                ID_parityCtrl,
                ID_unitAttCtrl,
                ID_startSDSectorCtrl,
@@ -103,6 +104,8 @@ private:
        wxSpinCtrl* myScsiIdCtrl;
        wxStaticText* myScsiIdMsg;
 
+       wxChoice* myDeviceTypeCtrl;
+
        wxCheckBox* myParityCtrl;
        wxCheckBox* myUnitAttCtrl;
 
diff --git a/software/scsi2sd-util/build.sh b/software/scsi2sd-util/build.sh
new file mode 100755 (executable)
index 0000000..64b4eea
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rm -rf build/
+make && \
+       make TARGET=Win32 &&
+       make TARGET=Win64
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/COPYING b/software/scsi2sd-util/libzipper-1.0.3/COPYING
new file mode 100644 (file)
index 0000000..94a9ed0
--- /dev/null
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/software/scsi2sd-util/libzipper-1.0.3/CompressedFile.cc b/software/scsi2sd-util/libzipper-1.0.3/CompressedFile.cc
new file mode 100644 (file)
index 0000000..6f03c6b
--- /dev/null
@@ -0,0 +1,26 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+
+using namespace zipper;
+
+CompressedFile::~CompressedFile()
+{
+}
+
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/Compressor.cc b/software/scsi2sd-util/libzipper-1.0.3/Compressor.cc
new file mode 100644 (file)
index 0000000..8d12ccf
--- /dev/null
@@ -0,0 +1,152 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+#include "gzip.hh"
+#include "zip.hh"
+#include "util.hh"
+
+#include <algorithm>
+
+using namespace zipper;
+
+class Compressor::CompressorImpl
+{
+public:
+       virtual ~CompressorImpl() {}
+
+       virtual void
+       addFile(const std::string& filename, const Reader& reader) = 0;
+};
+
+namespace
+{
+       class PlainCompressor : public Compressor::CompressorImpl
+       {
+       public:
+               PlainCompressor(const WriterPtr& writer) : m_writer(writer) {}
+
+               virtual void
+               addFile(const std::string&, const Reader& reader)
+               {
+                       enum Constants
+                       {
+                               ChunkSize = 64*1024
+                       };
+
+                       uint8_t buffer[ChunkSize];
+                       zsize_t offset(0);
+                       while (offset < reader.getSize())
+                       {
+                               zsize_t bytes(
+                                       std::min(zsize_t(ChunkSize), reader.getSize() - offset));
+                               reader.readData(offset, bytes, &buffer[0]);
+                               m_writer->writeData(offset, bytes, &buffer[0]);
+                               offset += bytes;
+                       }
+               }
+       private:
+               WriterPtr m_writer;
+       };
+
+       class ZipCompressor : public Compressor::CompressorImpl
+       {
+       public:
+               ZipCompressor(const WriterPtr& writer) : m_writer(writer) {}
+
+               virtual ~ZipCompressor()
+               {
+                       zipFinalise(m_records, m_writer);
+               }
+
+               virtual void
+               addFile(const std::string& filename, const Reader& reader)
+               {
+                       ZipFileRecord record;
+                       zip(filename, reader, m_writer, record);
+                       m_records.push_back(record);
+               }
+       private:
+               WriterPtr m_writer;
+               std::vector<ZipFileRecord> m_records;
+       };
+
+       class GzipCompressor : public Compressor::CompressorImpl
+       {
+       public:
+               GzipCompressor(const WriterPtr& writer) : m_writer(writer) {}
+
+               virtual void
+               addFile(const std::string& filename, const Reader& reader)
+               {
+                       gzip(filename, reader, m_writer);
+               }
+       private:
+               WriterPtr m_writer;
+       };
+}
+
+Compressor::Compressor(ContainerFormat format, const WriterPtr& writer)
+{
+       switch (format)
+       {
+       case Container_none:
+               m_compressor = new PlainCompressor(writer); break;
+
+       case Container_zip:
+               m_compressor = new ZipCompressor(writer); break;
+
+       case Container_gzip:
+               m_compressor = new GzipCompressor(writer); break;
+
+       default:
+               throw UnsupportedException("Unknown format");
+       }
+}
+
+Compressor::Compressor(ContainerFormat format, Writer& writer) :
+       m_compressor(NULL)
+{
+       WriterPtr ptr(&writer, dummy_delete<Writer>());
+       switch (format)
+       {
+       case Container_none:
+               m_compressor = new PlainCompressor(ptr); break;
+
+       case Container_zip:
+               m_compressor = new ZipCompressor(ptr); break;
+
+       case Container_gzip:
+               m_compressor = new GzipCompressor(ptr); break;
+
+       default:
+               throw UnsupportedException("Unknown format");
+       }
+}
+
+Compressor::~Compressor()
+{
+       delete m_compressor;
+}
+
+void
+Compressor::addFile(const Reader& reader)
+{
+       m_compressor->addFile(reader.getSourceName(), reader);
+}
+
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/Container.cc b/software/scsi2sd-util/libzipper-1.0.3/Container.cc
new file mode 100644 (file)
index 0000000..273f6d2
--- /dev/null
@@ -0,0 +1,47 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+
+using namespace zipper;
+
+namespace
+{
+       struct Container info_none =
+               { Container_none, "application/octet-stream", 13 };
+       struct Container info_zip =
+               { Container_zip, "application/zip", 0x1f };
+       struct Container info_gzip =
+               { Container_gzip, "zpplication/x-gzip", 7 };
+}
+
+namespace zipper
+{
+       const Container&
+       getContainer(ContainerFormat format)
+       {
+               switch (format)
+               {
+               case Container_none: return info_none;
+               case Container_zip: return info_zip;
+               case Container_gzip: return info_gzip;
+               default: throw Exception("Unknown format type requested");
+               }
+
+       }
+}
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/Decompressor.cc b/software/scsi2sd-util/libzipper-1.0.3/Decompressor.cc
new file mode 100644 (file)
index 0000000..94c4942
--- /dev/null
@@ -0,0 +1,142 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+#include "util.hh"
+
+#include "gzip.hh"
+#include "zip.hh"
+
+using namespace zipper;
+
+namespace
+{
+       class PlainFile : public CompressedFile
+       {
+       public:
+               PlainFile(const ReaderPtr& reader) :
+                       m_reader(reader)
+               {}
+
+               virtual bool isDecompressSupported() const { return true; }
+               virtual const std::string& getPath() const
+               {
+                       return m_reader->getSourceName();
+               }
+               virtual zsize_t getCompressedSize() const
+               {
+                       return m_reader->getSize();
+               }
+               virtual zsize_t getUncompressedSize() const
+               {
+                       return m_reader->getSize();
+               }
+
+               virtual void decompress(Writer& writer)
+               {
+                       enum Constants
+                       {
+                               ChunkSize = 64*1024
+                       };
+                       zsize_t end(m_reader->getSize());
+
+                       for (zsize_t pos(0); pos < end; pos += ChunkSize)
+                       {
+                               uint8_t buf[ChunkSize];
+                               size_t bytes(
+                                       std::min(zsize_t(ChunkSize), end - pos)
+                                       );
+                               m_reader->readData(pos, bytes, &buf[0]);
+                               writer.writeData(pos, bytes, &buf[0]);
+                       }
+               }
+
+               virtual const timeval& getModificationTime() const
+               {
+                       return m_reader->getModTime();
+               }
+
+       private:
+               ReaderPtr m_reader;
+       };
+}
+
+class Decompressor::DecompressorImpl
+{
+public:
+       DecompressorImpl(const ReaderPtr& reader) :
+               m_reader(reader),
+               m_format(Container_none)
+       {
+               if (isZip(reader))
+               {
+                       m_format = Container_zip;
+                       m_entries = unzip(reader);
+               }
+               else if (isGzip(reader))
+               {
+                       m_format = Container_gzip;
+                       m_entries = ungzip(reader);
+               }
+               else
+               {
+                       m_format = Container_none;
+                       m_entries.push_back(
+                               CompressedFilePtr(new PlainFile(reader))
+                               );
+               }
+       }
+
+       ContainerFormat getContainerFormat() const { return m_format; }
+
+       std::vector<CompressedFilePtr> getEntries() const { return m_entries; }
+
+private:
+       ReaderPtr m_reader;
+       ContainerFormat m_format;
+       std::vector<CompressedFilePtr> m_entries;
+};
+
+Decompressor::Decompressor(const ReaderPtr& reader) :
+       m_decompressor(new DecompressorImpl(reader))
+{
+}
+
+Decompressor::Decompressor(Reader& reader) :
+       m_decompressor(
+               new DecompressorImpl(ReaderPtr(&reader, dummy_delete<Reader>()))
+               )
+{
+}
+
+Decompressor::~Decompressor()
+{
+       delete m_decompressor;
+}
+
+ContainerFormat
+Decompressor::getContainerFormat() const
+{
+       return m_decompressor->getContainerFormat();
+}
+
+std::vector<CompressedFilePtr>
+Decompressor::getEntries() const
+{
+       return m_decompressor->getEntries();
+}
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/Doxyfile.in b/software/scsi2sd-util/libzipper-1.0.3/Doxyfile.in
new file mode 100644 (file)
index 0000000..9a489b7
--- /dev/null
@@ -0,0 +1,1661 @@
+# Doxyfile 1.7.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = libzipper
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = @libzipper_version@
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it 
+# parses. With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this 
+# tag. The format is ext=language, where ext is a file extension, and language 
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, 
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make 
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C 
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions 
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
+# will list include files with double quotes in the documentation 
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
+# will sort the (brief and detailed) documentation of class members so that 
+# constructors and destructors are listed first. If set to NO (the default) 
+# the constructors will appear in the respective orders defined by 
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
+# by doxygen. The layout file controls the global structure of the generated 
+# output files in an output format independent way. The create the layout file 
+# that represents doxygen's defaults, run doxygen with the -l option. 
+# You can optionally specify a file name after the option, if omitted 
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = @top_srcdir@/zipper.hh
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.vhd \
+                         *.vhdl
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
+# Doxygen will adjust the colors in the stylesheet and background images 
+# according to this color. Hue is specified as an angle on a colorwheel, 
+# see http://en.wikipedia.org/wiki/Hue for more information. 
+# For instance the value 0 represents red, 60 is yellow, 120 is green, 
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
+# the colors in the HTML output. For a value of 0 the output will use 
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
+# the luminance component of the colors in the HTML output. Values below 
+# 100 gradually make the output lighter, whereas values above 100 make 
+# the output darker. The value divided by 100 is the actual gamma applied, 
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
+# page will contain the date and time when the page was generated. Setting 
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 
+# the documentation publisher. This should be a reverse domain-name style 
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
+# that can be used as input for Qt's qhelpgenerator to generate a 
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
+# add. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
+# custom filter to add. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
+# project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
+# will be generated, which together with the HTML files, form an Eclipse help 
+# plugin. To install this plugin and make it available under the help contents 
+# menu in Eclipse, the contents of the directory containing the HTML and XML 
+# files needs to be copied into the plugins directory of eclipse. The name of 
+# the directory within the plugins directory should be the same as 
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin 
+# the directory name containing the HTML and XML files should also have 
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to YES, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
+# generated for formulas are transparent PNGs. Transparent PNGs are 
+# not supported properly for IE 6.0, but are supported on all modern browsers. 
+# Note that when changing this option you need to delete any form_*.png files 
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
+# for the HTML output. The underlying search engine uses javascript 
+# and DHTML and should work on any modern browser. Note that when using 
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
+# (GENERATE_DOCSET) there is already a search function so this one should 
+# typically be disabled. For large projects the javascript based search engine 
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
+# implemented using a PHP enabled web server instead of at the web client 
+# using Javascript. Doxygen will generate the search PHP script and index 
+# file to put on the web server. The advantage of the server 
+# based approach is that it scales better to large projects and allows 
+# full text search. The disadvances is that it is more difficult to setup 
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name. 
+# Note that when enabling USE_PDFLATEX this option is only used for 
+# generating bitmaps for formulas in the HTML output, but not in the 
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
+# source code with syntax highlighting in the LaTeX output. 
+# Note that which sources are shown also depends on other settings 
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = YES
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = YES
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
+# allowed to run in parallel. When set to 0 (the default) doxygen will 
+# base this on the number of processors available in the system. You can set it 
+# explicitly to a value larger than 0 to get control over the balance 
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans.ttf
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
diff --git a/software/scsi2sd-util/libzipper-1.0.3/Exception.cc b/software/scsi2sd-util/libzipper-1.0.3/Exception.cc
new file mode 100644 (file)
index 0000000..a5cf59c
--- /dev/null
@@ -0,0 +1,41 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+
+using namespace zipper;
+
+Exception::Exception(const std::string& what) :
+       std::runtime_error(what)
+{
+}
+
+FormatException::FormatException(const std::string& what) :
+       Exception(what)
+{
+}
+
+UnsupportedException::UnsupportedException(const std::string& what) :
+       Exception(what)
+{
+}
+
+IOException::IOException(const std::string& what) :
+       Exception(what)
+{
+}
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/FileReader.cc b/software/scsi2sd-util/libzipper-1.0.3/FileReader.cc
new file mode 100644 (file)
index 0000000..054c24e
--- /dev/null
@@ -0,0 +1,192 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+#include "strerror.hh"
+
+#include <cassert>
+#include <sstream>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+using namespace zipper;
+
+const timeval zipper::s_now = {0,0};
+
+
+class FileReader::FileReaderImpl
+{
+public:
+       FileReaderImpl(const std::string& filename) :
+               m_filename(filename),
+               m_fd(-1),
+               m_closeOnExit(true)
+       {
+               m_fd = ::open(filename.c_str(), O_RDONLY);
+
+               if (m_fd < 0)
+               {
+                       std::string errMsg(zipper::strerror(errno));
+
+                       std::stringstream message;
+                       message << "Could not open file \"" << filename << "\": " <<
+                               errMsg;
+                       throw IOException(message.str());
+               }
+               initStats();
+       }
+
+       FileReaderImpl(const std::string& filename, int fd, bool closeFd) :
+               m_filename(filename),
+               m_fd(fd),
+               m_closeOnExit(closeFd)
+       {
+               initStats();
+       }
+
+       ~FileReaderImpl()
+       {
+               close();
+       }
+
+       const std::string& getSourceName() const { return m_filename; }
+       const timeval& getModTime() const { return m_modTime; }
+
+       zsize_t getSize() const { return m_size; }
+
+       virtual void readData(
+               zsize_t offset, zsize_t bytes, uint8_t* dest
+               ) const
+       {
+               assert(m_fd >= 0);
+
+               zsize_t bytesRead(0);
+               while(bytesRead < bytes)
+               {
+                       ssize_t currentBytes(
+                               pread(
+                                       m_fd,
+                                       dest + bytesRead,
+                                       bytes - bytesRead,
+                                       offset + bytesRead)
+                               );
+
+                       if (currentBytes > 0)
+                       {
+                               bytesRead += static_cast<zsize_t>(currentBytes);
+                       }
+                       else if (currentBytes == 0)
+                       {
+                               throw FormatException("Unexpected end-of-file");
+                       }
+                       else if ((currentBytes < 0) && (errno != EINTR))
+                       {
+                               std::string errMsg(zipper::strerror(errno));
+                               throw IOException(errMsg);
+                       }
+               }
+       }
+
+private:
+       void initStats()
+       {
+               // If we fail here, we need to essentially run the dtor manually.
+               // initStats is called from the constructors, and so the dtor will
+               // NOT run if an exception is thrown.
+
+               struct stat buf;
+               int result(fstat(m_fd, &buf));
+               if (result != 0)
+               {
+                       int errnoLocal = errno;
+                       close();
+
+                       std::string errMsg(zipper::strerror(errnoLocal));
+
+                       std::stringstream message;
+                       message << "Could not get filesize for file " <<
+                               "\"" << m_filename << "\": " << errMsg;
+                       throw IOException(message.str());
+               }
+               else
+               {
+                       m_size = buf.st_size;
+                       m_modTime.tv_sec = buf.st_mtime;
+                       m_modTime.tv_usec = 0;
+               }
+       }
+
+       void close()
+       {
+               if ((m_fd >= 0) && m_closeOnExit)
+               {
+                       ::close(m_fd);
+                       m_fd = -1;
+               }
+       }
+       std::string m_filename;
+       int m_fd;
+       bool m_closeOnExit;
+       zsize_t m_size;
+       timeval m_modTime;
+};
+
+FileReader::FileReader(const std::string& filename) :
+       m_impl(new FileReaderImpl(filename))
+{
+}
+
+FileReader::FileReader(const std::string& filename, int fd, bool closeFd) :
+       m_impl(new FileReaderImpl(filename, fd, closeFd))
+{
+}
+
+FileReader::~FileReader()
+{
+       delete m_impl;
+}
+
+const std::string&
+FileReader::getSourceName() const
+{
+       return m_impl->getSourceName();
+}
+
+const timeval&
+FileReader::getModTime() const
+{
+       return m_impl->getModTime();
+}
+
+zsize_t
+FileReader::getSize() const
+{
+       return m_impl->getSize();
+}
+
+void
+FileReader::readData(
+       zsize_t offset, zsize_t bytes, uint8_t* dest
+       ) const
+{
+       return m_impl->readData(offset, bytes, dest);
+}
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/FileWriter.cc b/software/scsi2sd-util/libzipper-1.0.3/FileWriter.cc
new file mode 100644 (file)
index 0000000..53e7de7
--- /dev/null
@@ -0,0 +1,176 @@
+//     Copyright (C) 2011 Michael McMaster <michael@codesrc.com>
+//
+//     This file is part of libzipper.
+//
+//     libzipper is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     libzipper is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with libzipper.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "zipper.hh"
+#include "strerror.hh"
+
+#include <algorithm>
+#include <cassert>
+#include <sstream>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <utime.h>
+#include <errno.h>
+
+using namespace zipper;
+
+class FileWriter::FileWriterImpl
+{
+public:
+       FileWriterImpl(
+               const std::string& filename,
+               mode_t createPermissions,
+               const timeval& modTime
+               ) :
+               m_filename(filename),
+               m_modTime(modTime),
+               m_fd(-1),
+               m_closeOnExit(true),
+               m_setModTimeOnExit(true)
+       {
+               m_fd =
+                       ::open(
+                               filename.c_str(),
+                               O_WRONLY | O_TRUNC | O_CREAT,
+                               createPermissions);
+
+               if (m_fd < 0)
+               {
+                       std::string errMsg(zipper::strerror(errno));
+
+                       std::stringstream message;
+                       message << "Could not open file \"" << filename << "\": " <<
+                               errMsg;
+                       throw IOException(message.str());
+               }
+       }
+
+       FileWriterImpl(const std::string& filename, int fd, bool closeFd) :
+               m_filename(filename),
+               m_fd(fd),
+               m_closeOnExit(closeFd),
+               m_setModTimeOnExit(false)
+       {
+       }
+
+       ~FileWriterImpl()
+       {
+               close();
+
+               if (m_setModTimeOnExit)
+               {
+                       struct timeval times[2];
+                       if (s_now.tv_sec == m_modTime.tv_sec)
+                       {
+                               gettimeofday(&times[0], NULL);
+                               times[1] = times[0];
+                       }
+                       else
+                       {
+                               times[0] = m_modTime;
+                               times[1] = m_modTime;
+                       }
+                       utimes(m_filename.c_str(), times);
+               }
+       }
+
+       virtual void writeData(
+               zsize_t offset, zsize_t bytes, const uint8_t* data
+               ) const
+       {
+               assert(m_fd >= 0);
+
+               zsize_t bytesWritten(0);
+               while(bytesWritten < bytes)
+               {
+                       ssize_t currentBytes(
+                               pwrite(
+                                       m_fd,
+                                       data + bytesWritten,
+                                       bytes - bytesWritten,
+                                       offset + bytesWritten)
+                               );
+
+                       if (currentBytes >= 0)
+                       {
+                               bytesWritten += static_cast<zsize_t>(currentBytes);
+                       }
+                       else if ((currentBytes < 0) && (errno != EINTR))
+                       {
+                               std::string errMsg(zipper::strerror(errno));
+                               throw IOException(errMsg);
+                       }
+               }
+       }
+
+       zsize_t getSize() const
+       {
+               assert(m_fd >= 0);
+               zsize_t result(lseek(m_fd, 0, SEEK_END));
+               return result;
+       }
+
+private:
+       void close()
+       {
+               if ((m_fd >= 0) && m_closeOnExit)
+               {
+                       ::close(m_fd);
+                       m_fd = -1;
+               }
+       }
+
+       std::string m_filename;
+       timeval m_modTime;
+       int m_fd;
+       bool m_closeOnExit;
+       bool m_setModTimeOnExit;
+};
+
+FileWriter::FileWriter(
+       const std::string& filename,
+       mode_t createPermissions,
+       const timeval& modTime) :
+       m_impl(new FileWriterImpl(filename, createPermissions, modTime))
+{
+}
+
+FileWriter::FileWriter(const std::string& filename, int fd, bool closeFd) :
+       m_impl(new FileWriterImpl(filename, fd, closeFd))
+{
+}
+
+FileWriter::~FileWriter()
+{
+       delete m_impl;
+}
+
+void
+FileWriter::writeData(zsize_t offset, zsize_t bytes, const uint8_t* data)
+{
+       m_impl->writeData(offset, bytes, data);
+}
+
+zsize_t
+FileWriter::getSize() const
+{
+       return m_impl->getSize();
+}
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/INSTALL b/software/scsi2sd-util/libzipper-1.0.3/INSTALL
new file mode 100644 (file)
index 0000000..91ff44f
--- /dev/null
@@ -0,0 +1,49 @@
+libzipper
+Michael McMaster <michael@codesrc.com>
+
+* Refer to INSTALL.Android for Google Android NDK compilation information.
+
+Pre-Requisites
+       g++  (4.5.3)
+       make (GNU make 3.81)
+       zlib (1.2.3)
+       doxygen (1.7.4)
+
+Optional
+       automake (1.11), autoconf (2.68), libtool (2.4)
+               (Required if building from git)
+
+       graphviz (2.26.3) (for dependency diagrams in the generated docs)
+
+When building from sources obtained from the git repository, the configure
+script must be created first using the autoconf/automake/libtool packages.
+The supplied autogen.sh script automates this process.
+
+*NOTE: it is not necessary to run the autogen.sh script when using a
+source distribution release. ie. If you obtained the sources via
+libzipper-major.minor.patch.tar.gz, do not run autogen.sh
+
+       ./autogen.sh
+
+The configure script creates the makefiles specific to your host. eg. It
+allows the paths to dependant packages to be specified.
+
+       ./configure --prefix=/usr
+
+The --prefix option specifies the base installation directory, and defaults
+to /usr/local (in which case, the library would be installed in /usr/local/lib,
+and the zipper binary would be installed in /usr/local/bin).
+
+To obtain a complete listing of configure options, use the --help option.
+
+       ./configure --help
+
+Once the configure script is run, the software can be compiled.
+
+       make
+
+Now it's time to install the software. This step must be run by a user with
+write access to the installation directory (/usr/local by default).
+
+       make install
+
diff --git a/software/scsi2sd-util/libzipper-1.0.3/INSTALL.Android b/software/scsi2sd-util/libzipper-1.0.3/INSTALL.Android
new file mode 100644 (file)
index 0000000..e72f196
--- /dev/null
@@ -0,0 +1,40 @@
+libzipper
+Michael McMaster <michael@codesrc.com>
+
+Pre-Requisites
+       Android NDK (tested with android-ndk-r6)
+       Existing Android project
+
+NDK Limitations
+       * Your Application.mk file must enable C++ exceptions with:
+               APP_CPPFLAGS := -fexceptions -frtti
+       Although the NDK supports exceptions as of r5, they are disabled by
+       default for backwards compatibility.
+
+       * Your Application.mk file must specify a C++ STL implementation with
+       exception support. As of r6, only gnustl_static provides exception support.
+               APP_STL := gnustl_static
+
+Note that this port doesn't include any JNI interface code.  It is expected that
+libzipper will be called from other native code libraries, and not directly
+from Java.
+
+Including libzipper in your NDK project:
+1) Modify your Application.mk file to include the module, and
+       set APP_CPPFLAGS and APP_STL as stated under "NDK Limitations" above.
+
+       APP_CPPFLAGS += -fexceptions -frtti
+       APP_STL := gnustl_static
+       APP_MODULES += zipper
+
+2) Modify your applications Android.mk file to import the libzipper module:
+
+       LOCAL_STATIC_LIBRARIES += libzipper
+       $(call import-module,zipper)
+
+3) Set the NDK_MODULE_PATH variable to include the libzipper source directory
+       when calling ndk-build.
+       eg. If libzipper was extracted to /tmp/libzipper-1.0.3:
+
+               cd /path/to/your/ndk/application
+      &n