projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
fs
/
battfs_test.c
diff --git
a/bertos/fs/battfs_test.c
b/bertos/fs/battfs_test.c
index b12d3f8a24bacaaee77af1dcaad7651e33414b28..559bb1945272e77d2e73ad87eced389165772a33 100644
(file)
--- a/
bertos/fs/battfs_test.c
+++ b/
bertos/fs/battfs_test.c
@@
-31,12
+31,11
@@
*
* \brief BattFS Test.
*
*
* \brief BattFS Test.
*
- * \version $Id$
* \author Francesco Sacchi <batt@develer.com>
*/
#include <fs/battfs.h>
* \author Francesco Sacchi <batt@develer.com>
*/
#include <fs/battfs.h>
-#include <io/kblock_
file
.h>
+#include <io/kblock_
posix
.h>
#include <cfg/debug.h>
#include <cfg/test.h>
#include <cfg/debug.h>
#include <cfg/test.h>
@@
-51,6
+50,7
@@
#define DATA_SIZE (PAGE_SIZE - BATTFS_HEADER_LEN)
#define PAGE_COUNT (FILE_SIZE / PAGE_SIZE)
#define DATA_SIZE (PAGE_SIZE - BATTFS_HEADER_LEN)
#define PAGE_COUNT (FILE_SIZE / PAGE_SIZE)
+#define HW_PAGEBUF true
#if UNIT_TEST
const char test_filename[]="battfs_disk.bin";
#if UNIT_TEST
const char test_filename[]="battfs_disk.bin";
@@
-105,8
+105,8
@@
static void diskNew(BattFsSuper *disk)
for (int i = 0; i < PAGE_COUNT; i++)
ref[i] = i;
for (int i = 0; i < PAGE_COUNT; i++)
ref[i] = i;
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
battfs_mount(disk, &f.b, page_array, sizeof(page_array));
testCheck(disk, ref);
@@
-122,8
+122,8
@@
static void disk1File(BattFsSuper *disk)
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fp);
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
for (int i = 0; i < PAGE_COUNT; i++)
{
for (int i = 0; i < PAGE_COUNT; i++)
{
@@
-148,8
+148,8
@@
static void diskHalfFile(BattFsSuper *disk)
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fp);
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
for (int i = 0; i < PAGE_COUNT / 2; i++)
{
for (int i = 0; i < PAGE_COUNT / 2; i++)
{
@@
-180,8
+180,8
@@
static void oldSeq1(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 4);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 4);
// page, inode, seq, fill, pgoff
battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
// page, inode, seq, fill, pgoff
battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
@@
-208,8
+208,8
@@
static void oldSeq2(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 4);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 4);
// page, inode, seq, fill, pgoff
battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
// page, inode, seq, fill, pgoff
battfs_writeTestBlock(&f.b, 0, 0, 0, DATA_SIZE, 0);
@@
-236,8
+236,8
@@
static void oldSeq3(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 4);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 4);
// page, inode, seq, fill, pgoff
battfs_eraseBlock(&f.b, 0);
// page, inode, seq, fill, pgoff
battfs_eraseBlock(&f.b, 0);
@@
-264,8
+264,8
@@
static void oldSeq2File(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
// page, inode, seq, fill, pgoff
battfs_eraseBlock(&f.b, 0);
// page, inode, seq, fill, pgoff
battfs_eraseBlock(&f.b, 0);
@@
-301,8
+301,8
@@
static void openFile(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
@@
-375,8
+375,8
@@
static void readFile(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
@@
-418,8
+418,8
@@
static void readAcross(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
@@
-484,8
+484,8
@@
static void writeFile(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
@@
-535,8
+535,8
@@
static void writeAcross(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
const unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
@@
-608,8
+608,8
@@
static void createFile(BattFsSuper *disk)
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
BattFs fd1;
inode_t INODE = 0;
BattFs fd1;
inode_t INODE = 0;
@@
-629,7
+629,7
@@
static void createFile(BattFsSuper *disk)
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
@@
-661,8
+661,8
@@
static void multipleWrite(BattFsSuper *disk)
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
BattFs fd1;
BattFs fd1;
@@
-698,7
+698,7
@@
static void multipleWrite(BattFsSuper *disk)
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
@@
-726,8
+726,8
@@
static void increaseFile(BattFsSuper *disk)
for (int i = 0; i < FILE_SIZE / 10; i++)
fputc(0xff, fpt);
for (int i = 0; i < FILE_SIZE / 10; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT / 10);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT / 10);
BattFs fd1,fd2;
BattFs fd1,fd2;
@@
-778,8
+778,8
@@
static void readEOF(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 8; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 8);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 8);
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
@@
-818,8
+818,8
@@
static void writeEOF(BattFsSuper *disk)
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE / 5; i++)
fputc(0xff, fpt);
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE / 5; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT / 5);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT / 5);
BattFs fd1;
inode_t INODE = 0;
BattFs fd1;
inode_t INODE = 0;
@@
-902,8
+902,8
@@
static void endOfSpace(BattFsSuper *disk)
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
FILE *fp = fopen(test_filename, "w+");
for (int i = 0; i < PAGE_SIZE * 4; i++)
fputc(0xff, fp);
- KBlock
File
f;
- kblock
file_init(&f, fp
, page_buffer, PAGE_SIZE, 4);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fp, HW_PAGEBUF
, page_buffer, PAGE_SIZE, 4);
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
inode_t INODE = 0;
@@
-938,8
+938,8
@@
static void multipleFilesRW(BattFsSuper *disk)
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
#define N_FILES 10
BattFs fd[N_FILES];
#define N_FILES 10
BattFs fd[N_FILES];
@@
-985,7
+985,7
@@
static void multipleFilesRW(BattFsSuper *disk)
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
ASSERT(battfs_umount(disk));
fpt = fopen(test_filename, "r+");
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
@@
-1024,8
+1024,8
@@
static void openAllFiles(BattFsSuper *disk)
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
FILE *fpt = fopen(test_filename, "w+");
for (int i = 0; i < FILE_SIZE; i++)
fputc(0xff, fpt);
- KBlock
File
f;
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ KBlock
Posix
f;
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
BattFs fd[BATTFS_MAX_FILES];
unsigned int MODE = BATTFS_CREATE;
BattFs fd[BATTFS_MAX_FILES];
unsigned int MODE = BATTFS_CREATE;
@@
-1048,7
+1048,7
@@
static void openAllFiles(BattFsSuper *disk)
fpt = fopen(test_filename, "r+");
fpt = fopen(test_filename, "r+");
- kblock
file_init(&f, fpt
, page_buffer, PAGE_SIZE, PAGE_COUNT);
+ kblock
posix_init(&f, fpt, HW_PAGEBUF
, page_buffer, PAGE_SIZE, PAGE_COUNT);
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));
ASSERT(battfs_mount(disk, &f.b, page_array, sizeof(page_array)));
ASSERT(battfs_fsck(disk));