X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs_test.c;h=e3996cab78a21894c35149c6ff486937229ce41f;hb=739757a2b118bb2cad650cd2848b471560dc5b8f;hp=4d252b435681386db0fb3739458ece6c5c0891d7;hpb=4ce77ecc12cbc60cdb8717755006f6f461e6f6ad;p=bertos.git

diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c
index 4d252b43..e3996cab 100644
--- a/bertos/fs/battfs_test.c
+++ b/bertos/fs/battfs_test.c
@@ -126,7 +126,7 @@ static bool disk_close(struct BattFsSuper *d)
 
 static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 {
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 
 	for (int i = 0; i < disk->page_count; i++)
@@ -149,12 +149,12 @@ static void testCheck(BattFsSuper *disk, pgcnt_t *reference)
 				kprintf("%04d ", reference[i]);
 			}
 			kputchar('\n');
-			battfs_close(disk);
+			battfs_umount(disk);
 			exit(2);
 		}
 	}
 	ASSERT(battfs_fsck(disk));
-	battfs_close(disk);
+	battfs_umount(disk);
 }
 
 static void diskNew(BattFsSuper *disk)
@@ -354,7 +354,7 @@ static void openFile(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(!battfs_fileExists(disk, INEXISTENT_INODE));
 
@@ -391,7 +391,7 @@ static void openFile(BattFsSuper *disk)
 	ASSERT(kfile_close(&fd2.fd) == 0);
 	ASSERT(LIST_EMPTY(&disk->file_opened_list));
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("10: passed\n");
 }
@@ -421,7 +421,7 @@ static void readFile(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
@@ -431,7 +431,7 @@ static void readFile(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("11: passed\n");
 }
@@ -460,7 +460,7 @@ static void readAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
@@ -492,7 +492,7 @@ static void readAcross(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("12: passed\n");
 }
@@ -526,7 +526,7 @@ static void writeFile(BattFsSuper *disk)
 	for (size_t i = 0; i < sizeof(buf); i++)
 		buf[i] = i;
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == sizeof(buf));
@@ -541,7 +541,7 @@ static void writeFile(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("13: passed\n");
 }
@@ -570,7 +570,7 @@ static void writeAcross(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
@@ -613,7 +613,7 @@ static void writeAcross(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("14: passed\n");
 }
@@ -632,7 +632,7 @@ static void createFile(BattFsSuper *disk)
 	inode_t INODE = 0;
 	unsigned int MODE = BATTFS_CREATE;
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	for (int i = 0; i < FILE_SIZE / 2; i++)
@@ -642,9 +642,9 @@ static void createFile(BattFsSuper *disk)
 	ASSERT(fd1.fd.size == FILE_SIZE / 2);
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
 	ASSERT(fd1.fd.size == FILE_SIZE / 2);
@@ -660,7 +660,7 @@ static void createFile(BattFsSuper *disk)
 	ASSERT(fd1.fd.seek_pos == FILE_SIZE / 2);
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 
 	TRACEMSG("15: passed\n");
@@ -681,7 +681,7 @@ static void multipleWrite(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 
@@ -705,9 +705,9 @@ static void multipleWrite(BattFsSuper *disk)
 	}
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(disk->free_bytes == disk->disk_size - sizeof(buf));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, 0));
@@ -718,7 +718,7 @@ static void multipleWrite(BattFsSuper *disk)
 			ASSERT(buf[i] == ((j-1+i) & 0xff));
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 
 	TRACEMSG("16: passed\n");
@@ -739,7 +739,7 @@ static void increaseFile(BattFsSuper *disk)
 	unsigned int MODE = BATTFS_CREATE;
 	uint8_t buf[1000];
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE1, MODE));
 	ASSERT(battfs_fileopen(disk, &fd2, INODE2, MODE));
@@ -765,7 +765,7 @@ static void increaseFile(BattFsSuper *disk)
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(kfile_close(&fd2.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("17: passed\n");
 }
@@ -795,7 +795,7 @@ static void readEOF(BattFsSuper *disk)
 
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
@@ -804,7 +804,7 @@ static void readEOF(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("18: passed\n");
 }
@@ -827,7 +827,7 @@ static void writeEOF(BattFsSuper *disk)
 	for (int i = 0; i < 2; i++)
 		buf[i] = i;
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	disk_size_t prev_free = disk->free_bytes;
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
@@ -884,7 +884,7 @@ static void writeEOF(BattFsSuper *disk)
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("19: passed\n");
 
@@ -908,17 +908,17 @@ static void endOfSpace(BattFsSuper *disk)
 	disk->erase(disk, 3);
 	fclose(fp);
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
 	ASSERT(kfile_write(&fd1.fd, buf, sizeof(buf)) == PAGE_FILL * 4);
-	ASSERT(fd1.fd.size == PAGE_FILL * 4);
-	ASSERT(fd1.fd.seek_pos == PAGE_FILL * 4);
+	ASSERT(fd1.fd.size == (kfile_off_t)(PAGE_FILL * 4));
+	ASSERT(fd1.fd.seek_pos == (kfile_off_t)(PAGE_FILL * 4));
 	ASSERT(disk->free_bytes == 0);
 
 	ASSERT(kfile_close(&fd1.fd) == 0);
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
 	TRACEMSG("20: passed\n");
 }
@@ -936,11 +936,10 @@ static void multipleFilesRW(BattFsSuper *disk)
 
 	#define N_FILES 10
 	BattFs fd[N_FILES];
-	inode_t INODE = 0;
 	unsigned int MODE = BATTFS_CREATE;
 	uint32_t buf[FILE_SIZE / (4 * N_FILES * sizeof(uint32_t))];
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 	for (inode_t i = 0; i < N_FILES; i++)
 		ASSERT(battfs_fileopen(disk, &fd[i], i, MODE));
@@ -950,7 +949,7 @@ static void multipleFilesRW(BattFsSuper *disk)
 		for (uint32_t j = 0; j < countof(buf); j++)
 			buf[j] = j+i;
 
-		ASSERT(kfile_write(&fd[i], buf, sizeof(buf)) == sizeof(buf));
+		ASSERT(kfile_write(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
 		ASSERT(fd[i].fd.size == sizeof(buf));
 		ASSERT(fd[i].fd.seek_pos == sizeof(buf));
 		ASSERT(kfile_seek(&fd[i].fd, 0, SEEK_SET) == 0);
@@ -959,8 +958,7 @@ static void multipleFilesRW(BattFsSuper *disk)
 	for (inode_t i = 0; i < N_FILES; i++)
 	{
 		memset(buf, 0, sizeof(buf));
-		ASSERT(kfile_read(&fd[i], buf, sizeof(buf)) == sizeof(buf));
-
+		ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
 
 		for (uint32_t j = 0; j < countof(buf); j++)
 			ASSERT(buf[j] == j+i);
@@ -974,9 +972,9 @@ static void multipleFilesRW(BattFsSuper *disk)
 		ASSERT(kfile_close(&fd[i].fd) == 0);
 
 	ASSERT(battfs_fsck(disk));
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 
-	ASSERT(battfs_init(disk));
+	ASSERT(battfs_mount(disk));
 	ASSERT(battfs_fsck(disk));
 
 	for (inode_t i = 0; i < N_FILES; i++)
@@ -985,7 +983,7 @@ static void multipleFilesRW(BattFsSuper *disk)
 	for (inode_t i = 0; i < N_FILES; i++)
 	{
 		memset(buf, 0, sizeof(buf));
-		ASSERT(kfile_read(&fd[i], buf, sizeof(buf)) == sizeof(buf));
+		ASSERT(kfile_read(&fd[i].fd, buf, sizeof(buf)) == sizeof(buf));
 
 		for (uint32_t j = 0; j < countof(buf); j++)
 			ASSERT(buf[j] == j+i);
@@ -998,7 +996,7 @@ static void multipleFilesRW(BattFsSuper *disk)
 	for (inode_t i = 0; i < N_FILES; i++)
 		ASSERT(kfile_close(&fd[i].fd) == 0);
 
-	ASSERT(battfs_close(disk));
+	ASSERT(battfs_umount(disk));
 	TRACEMSG("21: passed\n");
 }