diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8794dbf --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Peter Andersson + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/build/linux_spiffs_test b/build/linux_spiffs_test deleted file mode 100755 index 181b292..0000000 Binary files a/build/linux_spiffs_test and /dev/null differ diff --git a/build/main.d b/build/main.d deleted file mode 100644 index 6be1ada..0000000 --- a/build/main.d +++ /dev/null @@ -1,36 +0,0 @@ - build/main.o build/main.d : src/main.c /usr/include/stdio.h /usr/include/features.h \ - /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/stypes.h src/spiffs.h \ - src/default/spiffs_config.h src/stypes.h src/spiffs_nucleus.h \ - src/testrunner.h /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/fcntl.h \ - /usr/include/x86_64-linux-gnu/bits/fcntl.h /usr/include/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ - /usr/include/x86_64-linux-gnu/bits/local_lim.h \ - /usr/include/linux/limits.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h diff --git a/build/main.o b/build/main.o deleted file mode 100644 index adba66d..0000000 Binary files a/build/main.o and /dev/null differ diff --git a/build/spiffs_cache.d b/build/spiffs_cache.d deleted file mode 100644 index d3a682c..0000000 --- a/build/spiffs_cache.d +++ /dev/null @@ -1,26 +0,0 @@ - build/spiffs_cache.o build/spiffs_cache.d : src/spiffs_cache.c src/spiffs.h \ - src/default/spiffs_config.h src/stypes.h /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/spiffs_nucleus.h diff --git a/build/spiffs_cache.o b/build/spiffs_cache.o deleted file mode 100644 index 28e0f4f..0000000 Binary files a/build/spiffs_cache.o and /dev/null differ diff --git a/build/spiffs_hydrogen.d b/build/spiffs_hydrogen.d deleted file mode 100644 index 816b12f..0000000 --- a/build/spiffs_hydrogen.d +++ /dev/null @@ -1,26 +0,0 @@ - build/spiffs_hydrogen.o build/spiffs_hydrogen.d : src/spiffs_hydrogen.c src/spiffs.h \ - src/default/spiffs_config.h src/stypes.h /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/spiffs_nucleus.h diff --git a/build/spiffs_hydrogen.o b/build/spiffs_hydrogen.o deleted file mode 100644 index f91f2f2..0000000 Binary files a/build/spiffs_hydrogen.o and /dev/null differ diff --git a/build/spiffs_nucleus.d b/build/spiffs_nucleus.d deleted file mode 100644 index 7f5c122..0000000 --- a/build/spiffs_nucleus.d +++ /dev/null @@ -1,26 +0,0 @@ - build/spiffs_nucleus.o build/spiffs_nucleus.d : src/spiffs_nucleus.c src/spiffs.h \ - src/default/spiffs_config.h src/stypes.h /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/spiffs_nucleus.h diff --git a/build/spiffs_nucleus.o b/build/spiffs_nucleus.o deleted file mode 100644 index 293a353..0000000 Binary files a/build/spiffs_nucleus.o and /dev/null differ diff --git a/build/test_hydrogen.d b/build/test_hydrogen.d deleted file mode 100644 index 4bdcf9c..0000000 --- a/build/test_hydrogen.d +++ /dev/null @@ -1,37 +0,0 @@ - build/test_hydrogen.o build/test_hydrogen.d : src/test_hydrogen.c src/testrunner.h src/test_spiffs.h \ - src/spiffs.h src/default/spiffs_config.h src/stypes.h \ - /usr/include/stdio.h /usr/include/features.h \ - /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/spiffs_nucleus.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/fcntl.h \ - /usr/include/x86_64-linux-gnu/bits/fcntl.h /usr/include/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ - /usr/include/x86_64-linux-gnu/bits/local_lim.h \ - /usr/include/linux/limits.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h diff --git a/build/test_hydrogen.o b/build/test_hydrogen.o deleted file mode 100644 index cb55cec..0000000 Binary files a/build/test_hydrogen.o and /dev/null differ diff --git a/build/test_spiffs.d b/build/test_spiffs.d deleted file mode 100644 index d29fe3e..0000000 --- a/build/test_spiffs.d +++ /dev/null @@ -1,37 +0,0 @@ - build/test_spiffs.o build/test_spiffs.d : src/test_spiffs.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/stypes.h src/spiffs.h \ - src/default/spiffs_config.h src/stypes.h src/spiffs_nucleus.h \ - src/testrunner.h src/test_spiffs.h \ - /usr/include/x86_64-linux-gnu/sys/stat.h \ - /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/fcntl.h \ - /usr/include/x86_64-linux-gnu/bits/fcntl.h /usr/include/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/dirent.h \ - /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \ - /usr/include/x86_64-linux-gnu/bits/local_lim.h \ - /usr/include/linux/limits.h /usr/include/unistd.h \ - /usr/include/x86_64-linux-gnu/bits/posix_opt.h \ - /usr/include/x86_64-linux-gnu/bits/environments.h \ - /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h diff --git a/build/test_spiffs.o b/build/test_spiffs.o deleted file mode 100644 index 13e3d6a..0000000 Binary files a/build/test_spiffs.o and /dev/null differ diff --git a/build/testrunner.d b/build/testrunner.d deleted file mode 100644 index 5ef6745..0000000 --- a/build/testrunner.d +++ /dev/null @@ -1,25 +0,0 @@ - build/testrunner.o build/testrunner.d : src/testrunner.c /usr/include/stdio.h \ - /usr/include/features.h /usr/include/x86_64-linux-gnu/bits/predefs.h \ - /usr/include/x86_64-linux-gnu/sys/cdefs.h \ - /usr/include/x86_64-linux-gnu/bits/wordsize.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs.h \ - /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stddef.h \ - /usr/include/x86_64-linux-gnu/bits/types.h \ - /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-linux-gnu/4.6/include/stdarg.h \ - /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \ - /usr/include/x86_64-linux-gnu/bits/sys_errlist.h /usr/include/stdlib.h \ - /usr/include/x86_64-linux-gnu/bits/waitflags.h \ - /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \ - /usr/include/x86_64-linux-gnu/bits/endian.h \ - /usr/include/x86_64-linux-gnu/bits/byteswap.h \ - /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \ - /usr/include/x86_64-linux-gnu/sys/select.h \ - /usr/include/x86_64-linux-gnu/bits/select.h \ - /usr/include/x86_64-linux-gnu/bits/sigset.h \ - /usr/include/x86_64-linux-gnu/bits/time.h \ - /usr/include/x86_64-linux-gnu/sys/sysmacros.h \ - /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \ - /usr/include/string.h /usr/include/xlocale.h src/testrunner.h diff --git a/build/testrunner.o b/build/testrunner.o deleted file mode 100644 index 6d415a6..0000000 Binary files a/build/testrunner.o and /dev/null differ diff --git a/build/testsuites.d b/build/testsuites.d deleted file mode 100644 index ae9197f..0000000 --- a/build/testsuites.d +++ /dev/null @@ -1 +0,0 @@ - build/testsuites.o build/testsuites.d : src/testsuites.c src/testrunner.h diff --git a/build/testsuites.o b/build/testsuites.o deleted file mode 100644 index 8459e04..0000000 Binary files a/build/testsuites.o and /dev/null differ diff --git a/makefile b/makefile index f30f538..259a9a0 100644 --- a/makefile +++ b/makefile @@ -81,6 +81,9 @@ all: mkdirs $(BINARY) mkdirs: -@${MKDIR} ${builddir} + +test: all + ./build/$(BINARY) clean: @echo ... removing build files in ${builddir} diff --git a/src/test_spiffs.c b/src/test_spiffs.c index 0f55862..e159230 100644 --- a/src/test_spiffs.c +++ b/src/test_spiffs.c @@ -31,7 +31,7 @@ #define LOG_BLOCK 1*65536 #define LOG_PAGE 1*PAGE_SIZE -static unsigned char area[8*1024*1024]; +static unsigned char area[2*1024*1024]; static int erases[sizeof(area)/SECTOR_SIZE]; static char _path[256]; @@ -43,7 +43,7 @@ static u8_t _cache[LOG_PAGE*5]; static int check_valid_flash = 1; -#define TEST_PATH "../test_data/" +#define TEST_PATH "test_data/" char *make_test_fname(const char *name) { sprintf(_path, "%s%s", TEST_PATH, name);