mirror of
https://github.com/apache/nuttx.git
synced 2026-05-21 13:13:08 +08:00
Support for open of FAT fs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@230 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
@@ -63,9 +63,9 @@
|
||||
static int up_open(FAR struct inode *inode);
|
||||
static int up_close(FAR struct inode *inode);
|
||||
static ssize_t up_read(FAR struct inode *inode, unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors);
|
||||
size_t start_sector, unsigned int nsectors);
|
||||
static ssize_t up_write(FAR struct inode *inode, const unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors);
|
||||
size_t start_sector, unsigned int nsectors);
|
||||
static int up_geometry(FAR struct inode *inode, struct geometry *geometry);
|
||||
|
||||
/****************************************************************************
|
||||
@@ -117,7 +117,7 @@ static int up_close(FAR struct inode *inode)
|
||||
****************************************************************************/
|
||||
|
||||
static ssize_t up_read(FAR struct inode *inode, unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors)
|
||||
size_t start_sector, unsigned int nsectors)
|
||||
{
|
||||
if (inode)
|
||||
{
|
||||
@@ -143,7 +143,7 @@ static ssize_t up_read(FAR struct inode *inode, unsigned char *buffer,
|
||||
****************************************************************************/
|
||||
|
||||
static ssize_t up_write(FAR struct inode *inode, const unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors)
|
||||
size_t start_sector, unsigned int nsectors)
|
||||
{
|
||||
if (inode)
|
||||
{
|
||||
|
||||
+96
-126
@@ -75,8 +75,8 @@
|
||||
* /sbin/mkdosfs -C -F 32 -I -n "NuttXTestVol" -S 512 -v nuttx-test.vfat 1024
|
||||
* sudo mkdir /mnt/loop
|
||||
* sudo mount -o loop nuttx-test.vfat /mnt/loop
|
||||
* mkdir /mnt/loop/nuttx-test
|
||||
* echo "This is a test" >/mnt/loop/nuttx-test/test-file.txt
|
||||
* mkdir /mnt/loop/TestDir
|
||||
* echo "This is a test" >/mnt/loop/TestDir/TestFile.txt
|
||||
* sudo umount /mnt/loop
|
||||
* gzip nuttx-test.vfat
|
||||
* xxd -g 1 nuttx-test.vfat.gz >some-file
|
||||
@@ -87,126 +87,96 @@
|
||||
|
||||
static const unsigned char g_vfatdata[] =
|
||||
{
|
||||
0x08, 0x1d, 0xed, 0xdd, 0x4d, 0x6b, 0x13, 0x41, 0x18, 0x00, 0xe0, 0x69,
|
||||
0x2d, 0xb6, 0x54, 0xfa, 0x71, 0x12, 0x3c, 0x39, 0x78, 0x53, 0x48, 0xa0,
|
||||
0x55, 0x7a, 0x36, 0x07, 0xab, 0xa7, 0x22, 0x75, 0x5b, 0x72, 0x12, 0x52,
|
||||
0x92, 0x6a, 0x68, 0x4c, 0x4a, 0x76, 0x8b, 0x2d, 0x48, 0x6f, 0xbd, 0xfb,
|
||||
0x2f, 0xc4, 0x62, 0x4f, 0x7a, 0x13, 0xc5, 0x3f, 0x90, 0x7f, 0xe1, 0x2d,
|
||||
0x97, 0x1e, 0x7b, 0x32, 0x6e, 0x4c, 0x53, 0x2c, 0x22, 0x7e, 0x80, 0x44,
|
||||
0xf1, 0x79, 0x76, 0x67, 0x66, 0xd9, 0x97, 0x81, 0x59, 0xe6, 0x65, 0x19,
|
||||
0xd8, 0x85, 0xe9, 0x96, 0x9f, 0x3f, 0xd9, 0xaa, 0xb6, 0xd2, 0xcd, 0x34,
|
||||
0x84, 0xf1, 0xb1, 0x18, 0xc6, 0x43, 0x08, 0x53, 0x27, 0x21, 0xc4, 0x70,
|
||||
0x3b, 0x0c, 0xcd, 0x9f, 0xb6, 0xfd, 0xd8, 0x58, 0xb8, 0x18, 0xce, 0xbb,
|
||||
0x7e, 0xfc, 0xfa, 0xee, 0xf2, 0xca, 0x4e, 0x96, 0x95, 0x93, 0x5a, 0x9a,
|
||||
0xad, 0xb7, 0x96, 0x4b, 0xc9, 0xcd, 0xc5, 0x18, 0xe3, 0xec, 0xd5, 0xf7,
|
||||
0x4f, 0x9f, 0xbd, 0xba, 0xf6, 0x21, 0xbb, 0xb4, 0xfe, 0x66, 0xf6, 0xed,
|
||||
0x64, 0xe8, 0xcc, 0x3f, 0xec, 0x1e, 0x2f, 0x7e, 0xec, 0x5c, 0xee, 0x5c,
|
||||
0xe9, 0x7e, 0x4a, 0x1e, 0xd7, 0xd3, 0x98, 0x9f, 0xcd, 0x56, 0x16, 0x2b,
|
||||
0x71, 0xa3, 0xd5, 0xca, 0x2a, 0x1b, 0x8d, 0x5a, 0xac, 0xd6, 0xd3, 0xad,
|
||||
0x62, 0x8c, 0xf7, 0x1b, 0xb5, 0x4a, 0x5a, 0x8b, 0xf5, 0x66, 0x5a, 0x6b,
|
||||
0x9f, 0x8b, 0x6f, 0x36, 0x5a, 0xdb, 0xdb, 0x7b, 0xb1, 0xd2, 0xac, 0xce,
|
||||
0x4c, 0x6f, 0xb7, 0x6b, 0x69, 0x9a, 0x5f, 0xee, 0xc5, 0xad, 0xda, 0x5e,
|
||||
0xcc, 0x5a, 0x31, 0x6b, 0xe7, 0x91, 0x47, 0x95, 0x7a, 0x33, 0x16, 0x8b,
|
||||
0xc5, 0x38, 0x33, 0x1d, 0xf8, 0x91, 0xb5, 0xc3, 0xd5, 0xd5, 0x4a, 0x69,
|
||||
0xd4, 0xa3, 0xe0, 0xcf, 0x6a, 0xb7, 0x4b, 0x95, 0x77, 0x93, 0x21, 0x4c,
|
||||
0x7c, 0x13, 0x59, 0x3b, 0x1c, 0xc1, 0x70, 0x00, 0x80, 0x11, 0xeb, 0x5a,
|
||||
0xff, 0xff, 0xc7, 0xac, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x76, 0x27, 0xbd, 0xde, 0x5c, 0x2f,
|
||||
0x2f, 0xc3, 0xb6, 0x5f, 0x46, 0x3d, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xe0, 0xd7, 0xf8, 0xfe, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xff, 0xbe, 0xaf, 0x36, 0xee, 0x9c, 0x0a, 0xe1, 0xc6, 0x8b,
|
||||
0xa3, 0xa5, 0xa3, 0xa5, 0x41, 0x3b, 0x88, 0x97, 0x9a, 0x61, 0x27, 0x64,
|
||||
0xf9, 0xb1, 0x1b, 0xe6, 0xc2, 0xbd, 0x42, 0x7e, 0x51, 0x0b, 0x69, 0x5e,
|
||||
0xf7, 0xf5, 0x72, 0x2b, 0x6b, 0x49, 0x52, 0x2e, 0xec, 0x2f, 0xc4, 0x18,
|
||||
0xe7, 0x43, 0xb5, 0xf3, 0x72, 0xd0, 0xbf, 0xdf, 0x5e, 0x18, 0xe1, 0x53,
|
||||
0xf1, 0xb3, 0x8a, 0xf1, 0xcc, 0x7c, 0x08, 0x07, 0xa7, 0xf3, 0x77, 0x70,
|
||||
0x36, 0x7f, 0xc5, 0xe2, 0xf7, 0xe2, 0x83, 0xfe, 0xa5, 0x61, 0x42, 0x14,
|
||||
0xf2, 0xfc, 0xb8, 0xb5, 0x19, 0xea, 0xa1, 0x91, 0xdf, 0x28, 0x7e, 0xc9,
|
||||
0x90, 0xdd, 0xbc, 0x4e, 0xee, 0x3c, 0x48, 0x0a, 0xcb, 0xfb, 0x0b, 0x49,
|
||||
0x39, 0x89, 0xe7, 0xf3, 0x63, 0x22, 0xf8, 0xd1, 0x64, 0xf4, 0x86, 0x1b,
|
||||
0xf1, 0x56, 0x62, 0x96, 0xbf, 0x04, 0xec, 0x99, 0x0b, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xbb, 0x3e, 0x03
|
||||
0x08, 0x1d, 0xed, 0xdd, 0xcf, 0x6a, 0x13, 0x41, 0x18, 0x00, 0xf0, 0xa9, 0x16, 0x5b, 0x2a, 0x6d,
|
||||
0x73, 0x12, 0x3c, 0x39, 0x78, 0xf3, 0xb2, 0x87, 0x0a, 0x3d, 0x78, 0x32, 0xd0, 0x06, 0x0a, 0xa2,
|
||||
0xa5, 0xa6, 0xa5, 0x17, 0x95, 0x2d, 0xd9, 0x6a, 0x68, 0x4c, 0xda, 0xec, 0x8a, 0x2d, 0x78, 0xf3,
|
||||
0x01, 0xf4, 0x39, 0x8a, 0xb7, 0x7a, 0x13, 0xc5, 0x17, 0xe8, 0x5b, 0x78, 0xcb, 0xc5, 0x63, 0x4f,
|
||||
0xc6, 0x8d, 0x69, 0x8b, 0x45, 0xc4, 0x3f, 0x20, 0x51, 0xfc, 0xfd, 0xd8, 0xe1, 0xdb, 0xd9, 0x8f,
|
||||
0x81, 0x59, 0xe6, 0x63, 0x59, 0xd8, 0x85, 0xe9, 0xad, 0xbf, 0x7c, 0xbc, 0xd5, 0xe8, 0xe4, 0x9b,
|
||||
0x79, 0x08, 0xe7, 0xc6, 0x62, 0x38, 0x17, 0x42, 0x98, 0x3c, 0x0a, 0x21, 0x86, 0x9b, 0xe1, 0x44,
|
||||
0xe5, 0x38, 0x0e, 0x72, 0x63, 0xe1, 0x42, 0x38, 0xeb, 0xda, 0xf2, 0xbd, 0x3b, 0xb5, 0xdb, 0x4f,
|
||||
0x8a, 0x62, 0xbd, 0x9e, 0xe5, 0xc5, 0x5a, 0xa7, 0x56, 0xad, 0x5f, 0x9f, 0x8b, 0x31, 0xce, 0x5c,
|
||||
0x79, 0xf7, 0xf4, 0xd9, 0xab, 0xab, 0xef, 0x8b, 0x8b, 0x6b, 0xaf, 0x67, 0xde, 0x4c, 0x84, 0xc3,
|
||||
0xca, 0xfd, 0xde, 0xc7, 0xb9, 0x0f, 0x87, 0x97, 0x0e, 0x2f, 0xf7, 0x3e, 0xd5, 0x1f, 0x35, 0xf3,
|
||||
0x58, 0x1e, 0xed, 0x4e, 0x11, 0xd3, 0xb8, 0xd1, 0xe9, 0x14, 0xe9, 0x46, 0x2b, 0x8b, 0x8d, 0x66,
|
||||
0xbe, 0x95, 0xc4, 0xb8, 0xdc, 0xca, 0xd2, 0x3c, 0x8b, 0xcd, 0x76, 0x9e, 0x75, 0xcf, 0xe4, 0x37,
|
||||
0x5b, 0x9d, 0xed, 0xed, 0xbd, 0x98, 0xb6, 0x1b, 0xd3, 0x53, 0xdb, 0xdd, 0x2c, 0xcf, 0xcb, 0xd3,
|
||||
0xbd, 0xb8, 0x95, 0xed, 0xc5, 0xa2, 0x13, 0x8b, 0x6e, 0x99, 0x79, 0x98, 0x36, 0xdb, 0x31, 0x49,
|
||||
0x92, 0x38, 0x3d, 0x15, 0xf8, 0x91, 0xd5, 0xfd, 0x95, 0x95, 0xb4, 0x3a, 0xea, 0x59, 0xf0, 0x67,
|
||||
0x75, 0xbb, 0xd5, 0xf4, 0xed, 0x44, 0x08, 0xe3, 0xdf, 0x64, 0x56, 0xf7, 0x47, 0x30, 0x1d, 0x00,
|
||||
0x60, 0xc4, 0x7a, 0xde, 0xff, 0xff, 0x63, 0xde, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x76, 0x47, 0xfd, 0xfe, 0x6c, 0xbf, 0x6c, 0x27, 0x71, 0xd0,
|
||||
0x46, 0x3d, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xd7, 0xf8, 0xfe, 0x0f, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xbe, 0xaf, 0x36, 0xee, 0x9c, 0x0c, 0xe1, 0xc6, 0xf3,
|
||||
0x83, 0xf9, 0x83, 0xf9, 0x61, 0x1c, 0xe6, 0xab, 0xf5, 0x90, 0x85, 0x3c, 0x14, 0x61, 0x21, 0xcc,
|
||||
0x86, 0x07, 0xcd, 0xd0, 0x2d, 0xaf, 0xf5, 0xbf, 0x18, 0xc6, 0xfa, 0xe2, 0xdd, 0xfa, 0xc2, 0xd2,
|
||||
0x4a, 0x2c, 0x55, 0x42, 0xe3, 0xc5, 0xf1, 0xf8, 0x41, 0x3c, 0x3f, 0xd2, 0xfb, 0xe2, 0xe7, 0x24,
|
||||
0xf1, 0x54, 0x25, 0x84, 0x9d, 0xe3, 0xf5, 0xdb, 0x39, 0x5d, 0xbf, 0x24, 0xf9, 0x5e, 0x7e, 0x38,
|
||||
0xfe, 0xb4, 0x3e, 0x6a, 0x65, 0x7d, 0xec, 0x36, 0x43, 0xab, 0xec, 0x26, 0x65, 0x77, 0xb7, 0xcc,
|
||||
0x15, 0x65, 0x1b, 0xd4, 0x47, 0x6d, 0xe9, 0xd6, 0x62, 0x7d, 0xbd, 0x1e, 0xcf, 0xd6, 0xc7, 0x78,
|
||||
0xf0, 0xa3, 0xc9, 0xe8, 0x9d, 0x6c, 0xc4, 0x9b, 0xc6, 0xa2, 0x7c, 0x08, 0xd8, 0x33, 0x17, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x7d, 0x06
|
||||
};
|
||||
|
||||
|
||||
@@ -369,15 +339,15 @@ int main(int argc, char **argv, char **envp)
|
||||
|
||||
deviceimage = up_deviceimage();
|
||||
if (deviceimage)
|
||||
{
|
||||
{
|
||||
printf("Inflate SUCCEEDED\n");
|
||||
free(deviceimage);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
printf("Inflate FAILED\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -63,8 +63,8 @@ static const char g_source[] = "/dev/blkdev";
|
||||
static const char g_target[] = "/mnt/fs";
|
||||
static const char g_filesystemtype[] = "vfat";
|
||||
|
||||
static const char g_testfile1[] = "/mnt/fs/nuttx-test/test-file.txt";
|
||||
static const char g_testfile2[] = "/mnt/fs/nuttx-test/write-test.txt";
|
||||
static const char g_testfile1[] = "/mnt/fs/TestDir/TestFile.txt";
|
||||
static const char g_testfile2[] = "/mnt/fs/TestDir/WriteTest.txt";
|
||||
static const char g_testmsg[] = "This is a write test";
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ CSRCS = fs_open.c fs_close.c fs_read.c fs_write.c fs_ioctl.c fs_dup.c \
|
||||
fs_registerblockdriver.c fs_unregisterblockdriver.c \
|
||||
fs_mount.c fs_umount.c fs_inodeaddref.c fs_inoderelease.c
|
||||
ifeq ($(CONFIG_FS_FAT),y)
|
||||
CSRCS += fs_fat32.c
|
||||
CSRCS += fs_fat32.c fs_fat32util.c
|
||||
endif
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
|
||||
|
||||
+230
-714
File diff suppressed because it is too large
Load Diff
+314
-37
@@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* fs_fat.h
|
||||
* fs_fat32.h
|
||||
*
|
||||
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
@@ -105,12 +105,65 @@
|
||||
|
||||
#define BS_SIGNATURE 510 /* 2@510: Valid MBRs have 0x55aa here */
|
||||
|
||||
/****************************************************************************
|
||||
* Each FAT directory entry is 32-bytes long. The following define offsets
|
||||
* relative to the beginning of a directory entry.
|
||||
*/
|
||||
|
||||
#define DIR_NAME 0 /* 11@ 0: NAME: 8 bytes + 3 byte extension */
|
||||
#define DIR_ATTRIBUTES 11 /* 1@11: File attibutes (see below) */
|
||||
#define DIR_NTRES 12 /* 1@12: Reserved for use by NT */
|
||||
#define DIR_CRTTIMETENTH 13 /* 1@13: Tenth sec creation timestamp */
|
||||
#define DIR_CRTIME 14 /* 2@14: Time file created */
|
||||
#define DIR_CRDATE 16 /* 2@16: Date file created */
|
||||
#define DIR_LASTACCDATE 18 /* 2@19: Last access date */
|
||||
#define DIR_FSTCLUSTHI 20 /* 2@20: MS first cluster number */
|
||||
#define DIR_WRTTIME 22 /* 2@22: Time of last write */
|
||||
#define DIR_WRTDATE 24 /* 2@24: Date of last write */
|
||||
#define DIR_FSTCLUSTLO 26 /* 2@26: LS first cluster number */
|
||||
#define DIR_FILESIZE 28 /* 4@28: File size in bytes */
|
||||
|
||||
/* First byte of the directory name has special meanings: */
|
||||
|
||||
#define DIR0_EMPTY 0xe5 /* The directory entry is empty */
|
||||
#define DIR0_ALLEMPTY 0x00 /* This entry and all following are empty */
|
||||
#define DIR0_E5 0x05 /* The actual value is 0xe5 */
|
||||
|
||||
/* NTRES flags in the FAT directory */
|
||||
|
||||
#define FATNTRES_LCNAME 0x08 /* Lower case in name */
|
||||
#define FATNTRES_LCEXT 0x10 /* Lower case in extension */
|
||||
|
||||
/* File attribute bits in FAT directory entry */
|
||||
|
||||
#define FATATTR_READONLY 0x01
|
||||
#define FATATTR_HIDDEN 0x02
|
||||
#define FATATTR_SYSTEM 0x04
|
||||
#define FATATTR_VOLUMEID 0x08
|
||||
#define FATATTR_DIRECTORY 0x10
|
||||
#define FATATTR_ARCHIVE 0x20
|
||||
|
||||
#define FATATTR_LONGNAME \
|
||||
(FATATTR_READONLY|FATATTR_HIDDEN|FATATTR_SYSTEM|FATATTR_VOLUMEID)
|
||||
|
||||
/* File system types */
|
||||
|
||||
#define FSTYPE_FAT12 0
|
||||
#define FSTYPE_FAT16 1
|
||||
#define FSTYPE_FAT32 2
|
||||
|
||||
/* Directory indexing helper. Each directory entry is 32-bytes in length.
|
||||
* The number of directory entries in a sector then varies with the size
|
||||
* of the sector supported in hardware.
|
||||
*/
|
||||
|
||||
#define DIRSEC_NDXMASK(f) (((f)->fs_hwsectorsize - 1) >> 5)
|
||||
#define DIRSEC_NDIRS(f) (((f)->fs_hwsectorsize) >> 5)
|
||||
#define DIRSEC_BYTENDX(f,i) (((i) & DIRSEC_NDXMASK(fs)) << 5)
|
||||
|
||||
#define SEC_NDXMASK(f) ((f)->fs_hwsectorsize - 1)
|
||||
#define SEC_NSECTORS(f,n) ((n) / (f)->fs_hwsectorsize)
|
||||
|
||||
/****************************************************************************
|
||||
* These offset describe the FSINFO sector
|
||||
*/
|
||||
@@ -123,39 +176,225 @@
|
||||
/* 12@496: Reserved (zero) */
|
||||
#define FSI_TRAILSIG 508 /* 4@508: 0xaa550000 */
|
||||
|
||||
/****************************************************************************
|
||||
* Access to data in raw sector data */
|
||||
|
||||
#define UBYTE_VAL(p,o) (((ubyte*)(p))[o])
|
||||
#define UBYTE_PTR(p,o) &UBYTE_VAL(p,o)
|
||||
#define UBYTE_PUT(p,o,v) (UBYTE_VAL(p,o)=(ubyte)(v))
|
||||
|
||||
#define UINT16_PTR(p,o) ((uint16*)UBYTE_PTR(p,o))
|
||||
#define UINT16_VAL(p,o) (*UINT16_PTR(p,o))
|
||||
#define UINT16_PUT(p,o,v) (UINT16_VAL(p,o)=(uint16)(v))
|
||||
|
||||
#define UINT32_PTR(p,o) ((uint32*)UBYTE_PTR(p,o))
|
||||
#define UINT32_VAL(p,o) (*UINT32_PTR(p,o))
|
||||
#define UINT32_PUT(p,o,v) (UINT32_VAL(p,o)=(uint32)(v))
|
||||
|
||||
/* Regardless of the endian-ness of the target or alignment of the data, no
|
||||
* special operations are required for byte, string or byte array accesses.
|
||||
* The FAT data stream is little endian so multiple byte values must be
|
||||
* accessed byte-by-byte for big-endian targets.
|
||||
*/
|
||||
|
||||
#define MBR_GETSECPERCLUS(p) UBYTE_VAL(p,BS_SECPERCLUS)
|
||||
#define MBR_GETNUMFATS(p) UBYTE_VAL(p,BS_NUMFATS)
|
||||
#define MBR_GETMEDIA(p) UBYTE_VAL(p,BS_MEDIA)
|
||||
#define MBR_GETDRVNUM16(p) UBYTE_VAL(p,BS16_DRVNUM)
|
||||
#define MBR_GETDRVNUM32(p) UBYTE_VAL(p,BS32_DRVNUM)
|
||||
#define MBR_GETBOOTSIG16(p) UBYTE_VAL(p,BS16_BOOTSIG)
|
||||
#define MBR_GETBOOTSIG32(p) UBYTE_VAL(p,BS32_BOOTSIG)
|
||||
|
||||
#define DIR_GETATTRIBUTES(p) UBYTE_VAL(p,DIR_ATTRIBUTES)
|
||||
#define DIR_GETNTRES(p) UBYTE_VAL(p,DIR_NTRES)
|
||||
#define DIR_GETCRTTIMETENTH(p) UBYTE_VAL(p,DIR_CRTTIMETENTH)
|
||||
|
||||
#define MBR_PUTSECPERCLUS(p,v) UBYTE_PUT(p,BS_SECPERCLUS),v)
|
||||
#define MBR_PUTNUMFATS(p,v) UBYTE_PUT(p,BS_NUMFATS,v)
|
||||
#define MBR_PUTMEDIA(p,v) UBYTE_PUT(p,BS_MEDIA,v)
|
||||
#define MBR_PUTDRVNUM16(p,v) UBYTE_PUT(p,BS16_DRVNUM,v)
|
||||
#define MBR_PUTDRVNUM32(p,v) UBYTE_PUT(p,BS32_DRVNUM,v)
|
||||
#define MBR_PUTBOOTSIG16(p,v) UBYTE_PUT(p,BS16_BOOTSIG,v)
|
||||
#define MBR_PUTBOOTSIG32(p,v) UBYTE_PUT(p,BS32_BOOTSIG,v)
|
||||
|
||||
#define DIR_PUTATTRIBUTES(p,v) UBYTE_PUT(p,DIR_ATTRIBUTES,v)
|
||||
#define DIR_PUTNTRES(p,v) UBYTE_PUT(p,DIR_NTRES,v)
|
||||
#define DIR_PUTCRTTIMETENTH(p,v) UBYTE_PUT(p,DIR_CRTTIMETENTH,v)
|
||||
|
||||
/* For the all targets, unaligned values need to be accessed byte-by-byte.
|
||||
* Some architectures may handle unaligned accesses with special interrupt
|
||||
* handlers. But even in that case, it is more efficient to avoid the traps.
|
||||
*/
|
||||
|
||||
/* Unaligned multi-byte access macros */
|
||||
|
||||
#define MBR_GETBYTESPERSEC(p) fat_getuint16(UBYTE_PTR(p,BS_BYTESPERSEC))
|
||||
#define MBR_GETROOTENTCNT(p) fat_getuint16(UBYTE_PTR(p,BS_ROOTENTCNT))
|
||||
#define MBR_GETTOTSEC16(p) fat_getuint16(UBYTE_PTR(p,BS_TOTSEC16))
|
||||
#define MBR_GETVOLID16(p) fat_getuint32(UBYTE_PTR(p,BS16_VOLID))
|
||||
#define MBR_GETVOLID32(p) fat_getuint32(UBYTE_PTR(p,BS32_VOLID))
|
||||
|
||||
#define MBR_PUTBYTESPERSEC(p,v) fat_putuint16(UBYTE_PTR(p,BS_BYTESPERSEC),v)
|
||||
#define MBR_PUTROOTENTCNT(p,v) fat_putuint16(UBYTE_PTR(p,BS_ROOTENTCNT),v)
|
||||
#define MBR_PUTTOTSEC16(p,v) fat_putuint16(UBYTE_PTR(p,BS_TOTSEC16),v)
|
||||
#define MBR_PUTVOLID16(p,v) fat_putuint32(UBYTE_PTR(p,BS16_VOLID),v)
|
||||
#define MBR_PUTVOLID32(p,v) fat_putuint32(UBYTE_PTR(p,BS32_VOLID),v)
|
||||
|
||||
/* But for multi-byte values, the endian-ness of the target vs. the little
|
||||
* endian order of the byte stream or alignment of the data within the byte
|
||||
* stream can force special, byte-by-byte accesses.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_ARCH_BIGENDIAN
|
||||
|
||||
/* If the target is big-endian, then even aligned multi-byte values must be
|
||||
* accessed byte-by-byte.
|
||||
*/
|
||||
|
||||
# define MBR_GETRESVDSECCOUNT(p) fat_getuint16(UBYTE_PTR(p,BS_RESVDSECCOUNT))
|
||||
# define MBR_GETFATSZ16(p) fat_getuint16(UBYTE_PTR(p,BS_FATSZ16))
|
||||
# define MBR_GETSECPERTRK(p) fat_getuint16(UBYTE_PTR(p,BS_SECPERTRK))
|
||||
# define MBR_GETNUMHEADS(p) fat_getuint16(UBYTE_PTR(p,BS_NUMHEADS))
|
||||
# define MBR_GETHIDSEC(p) fat_getuint32(UBYTE_PTR(p,BS_HIDSEC))
|
||||
# define MBR_GETTOTSEC32(p) fat_getuint32(UBYTE_PTR(p,BS_TOTSEC32))
|
||||
# define MBR_GETFATSZ32(p) fat_getuint32(UBYTE_PTR(p,BS32_FATSZ32))
|
||||
# define MBR_GETEXTFLAGS(p) fat_getuint16(UBYTE_PTR(p,BS32_EXTFLAGS))
|
||||
# define MBR_GETFSVER(p) fat_getuint16(UBYTE_PTR(p,BS32_FSVER))
|
||||
# define MBR_GETROOTCLUS(p) fat_getuint32(UBYTE_PTR(p,BS32_ROOTCLUS))
|
||||
# define MBR_GETFSINFO(p) fat_getuint16(UBYTE_PTR(p,BS32_FSINFO))
|
||||
# define MBR_GETBKBOOTSEC(p) fat_getuint16(UBYTE_PTR(p,BS32_BKBOOTSEC))
|
||||
# define MBR_GETSIGNATURE(p) fat_getuint16(UBYTE_PTR(p,BS_SIGNATURE))
|
||||
|
||||
# define MBR_GETPARTSECTOR(s) fat_getuint32(s)
|
||||
|
||||
# define FSI_GETLEADSIG(p) fat_getuint32(UBYTE_PTR(p,FSI_LEADSIG))
|
||||
# define FSI_GETSTRUCTSIG(p) fat_getuint32(UBYTE_PTR(p,FSI_STRUCTSIG))
|
||||
# define FSI_GETFREECOUNT(p) fat_getuint32(UBYTE_PTR(p,FSI_FREECOUNT))
|
||||
# define FSI_GETNXTFREE(p) fat_getuint32(UBYTE_PTR(p,FSI_NXTFREE))
|
||||
# define FSI_GETTRAILSIG(p) fat_getuint32(UBYTE_PTR(p,FSI_TRAILSIG))
|
||||
|
||||
# define DIR_GETCRTIME(p) fat_getuint16(UBYTE_PTR(p,DIR_CRTIME))
|
||||
# define DIR_GETCRDATE(p) fat_getuint16(UBYTE_PTR(p,DIR_CRDATE))
|
||||
# define DIR_GETLASTACCDATE(p) fat_getuint16(UBYTE_PTR(p,DIR_LASTACCDTE))
|
||||
# define DIR_GETFSTCLUSTHI(p) fat_getuint16(UBYTE_PTR(p,DIR_FSTCLUSTHI))
|
||||
# define DIR_GETWRTTIME(p) fat_getuint16(UBYTE_PTR(p,DIR_WRTTIME))
|
||||
# define DIR_GETWRTDATE(p) fat_getuint16(UBYTE_PTR(p,DIR_WRTDATE))
|
||||
# define DIR_GETFSTCLUSTLO(p) fat_getuint16(UBYTE_PTR(p,DIR_FSTCLUSTLO))
|
||||
# define DIR_GETFILESIZE(p) fat_getuint32(UBYTE_PTR(p,DIR_FILESIZE))
|
||||
|
||||
# define FAT_GETFAT16(p,i) fat_getuint16(UBYTE_PTR(p,i))
|
||||
# define FAT_GETFAT32(p,i) fat_getuint32(UBYTE_PTR(p,i))
|
||||
|
||||
# define MBR_PUTRESVDSECCOUNT(p,v) fat_putuint16(UBYTE_PTR(p,BS_RESVDSECCOUNT,v))
|
||||
# define MBR_PUTFATSZ16(p,v) fat_putuint16(UBYTE_PTR(p,BS_FATSZ16,v))
|
||||
# define MBR_PUTSECPERTRK(p,v) fat_putuint16(UBYTE_PTR(p,BS_SECPERTRK,v))
|
||||
# define MBR_PUTNUMHEADS(p,v) fat_putuint16(UBYTE_PTR(p,BS_NUMHEADS,v))
|
||||
# define MBR_PUTHIDSEC(p,v) fat_putuint32(UBYTE_PTR(p,BS_HIDSEC,v))
|
||||
# define MBR_PUTTOTSEC32(p,v) fat_putuint32(UBYTE_PTR(p,BS_TOTSEC32,v))
|
||||
# define MBR_PUTFATSZ32(p,v) fat_putuint32(UBYTE_PTR(p,BS32_FATSZ32,v))
|
||||
# define MBR_PUTEXTFLAGS(p,v) fat_putuint16(UBYTE_PTR(p,BS32_EXTFLAGS,v))
|
||||
# define MBR_PUTFSVER(p,v) fat_putuint16(UBYTE_PTR(p,BS32_FSVER,v))
|
||||
# define MBR_PUTROOTCLUS(p,v) fat_putuint32(UBYTE_PTR(p,BS32_ROOTCLUS,v))
|
||||
# define MBR_PUTFSINFO(p,v) fat_putuint16(UBYTE_PTR(p,BS32_FSINFO,v))
|
||||
# define MBR_PUTBKBOOTSEC(p,v) fat_putuint16(UBYTE_PTR(p,BS32_BKBOOTSEC,v))
|
||||
# define MBR_PUTSIGNATURE(p,v) fat_getuint16(UBYTE_PTR(p,BS_SIGNATURE),v)
|
||||
|
||||
# define FSI_PUTLEADSIG(p,v) fat_putuint32(UBYTE_PTR(p,FSI_LEADSIG),v)
|
||||
# define FSI_PUTSTRUCTSIG(p,v) fat_putuint32(UBYTE_PTR(p,FSI_STRUCTSIG),v)
|
||||
# define FSI_PUTFREECOUNT(p,v) fat_putuint32(UBYTE_PTR(p,FSI_FREECOUNT),v)
|
||||
# define FSI_PUTNXTFREE(p,v) fat_putuint32(UBYTE_PTR(p,FSI_NXTFREE),v)
|
||||
# define FSI_PUTTRAILSIG(p,v) fat_putuint32(UBYTE_PTR(p,FSI_TRAILSIG),v)
|
||||
|
||||
# define DIR_PUTCRTIME(p,v) fat_putuint16(UBYTE_PTR(p,DIR_CRTIME),v)
|
||||
# define DIR_PUTCRDATE(p,v) fat_putuint16(UBYTE_PTR(p,DIR_CRDATE),v)
|
||||
# define DIR_PUTLASTACCDATE(p,v) fat_putuint16(UBYTE_PTR(p,DIR_LASTACCDTE),v)
|
||||
# define DIR_PUTFSTCLUSTHI(p,v) fat_putuint16(UBYTE_PTR(p,DIR_FSTCLUSTHI),v)
|
||||
# define DIR_PUTWRTTIME(p,v) fat_putuint16(UBYTE_PTR(p,DIR_WRTTIME),v)
|
||||
# define DIR_PUTWRTDATE(p,v) fat_putuint16(UBYTE_PTR(p,DIR_WRTDATE),v)
|
||||
# define DIR_PUTFSTCLUSTLO(p,v) fat_putuint16(UBYTE_PTR(p,DIR_FSTCLUSTLO),v)
|
||||
# define DIR_PUTFILESIZE(p,v) fat_putuint32(UBYTE_PTR(p,DIR_FILESIZE),v)
|
||||
|
||||
# define FAT_PUTFAT16(p,i,v) fat_putuint16(UBYTE_PTR(p,i),v)
|
||||
# define FAT_PUTFAT32(p,i,v) fat_putuint32(UBYTE_PTR(p,i),v)
|
||||
|
||||
#else
|
||||
|
||||
/* But nothing special has to be done for the little endian-case for access
|
||||
* to aligned mulitbyte values.
|
||||
*/
|
||||
|
||||
# define MBR_GETRESVDSECCOUNT(p) UINT16_VAL(p,BS_RESVDSECCOUNT)
|
||||
# define MBR_GETFATSZ16(p) UINT16_VAL(p,BS_FATSZ16)
|
||||
# define MBR_GETSECPERTRK(p) UINT16_VAL(p,BS_SECPERTRK)
|
||||
# define MBR_GETNUMHEADS(p) UINT16_VAL(p,BS_NUMHEADS)
|
||||
# define MBR_GETHIDSEC(p) UINT32_VAL(p,BS_HIDSEC)
|
||||
# define MBR_GETTOTSEC32(p) UINT32_VAL(p,BS_TOTSEC32)
|
||||
# define MBR_GETFATSZ32(p) UINT32_VAL(p,BS32_FATSZ32)
|
||||
# define MBR_GETEXTFLAGS(p) UINT16_VAL(p,BS32_EXTFLAGS)
|
||||
# define MBR_GETFSVER(p) UINT16_VAL(p,BS32_FSVER)
|
||||
# define MBR_GETROOTCLUS(p) UINT32_VAL(p,BS32_ROOTCLUS)
|
||||
# define MBR_GETFSINFO(p) UINT16_VAL(p,BS32_FSINFO)
|
||||
# define MBR_GETBKBOOTSEC(p) UINT16_VAL(p,BS32_BKBOOTSEC)
|
||||
# define MBR_GETSIGNATURE(p) UINT16_VAL(p,BS_SIGNATURE)
|
||||
|
||||
# define MBR_GETPARTSECTOR(s) (*((uint32*)(s)))
|
||||
|
||||
# define FSI_GETLEADSIG(p) UINT32_VAL(p,FSI_LEADSIG)
|
||||
# define FSI_GETSTRUCTSIG(p) UINT32_VAL(p,FSI_STRUCTSIG)
|
||||
# define FSI_GETFREECOUNT(p) UINT32_VAL(p,FSI_FREECOUNT)
|
||||
# define FSI_GETNXTFREE(p) UINT32_VAL(p,FSI_NXTFREE)
|
||||
# define FSI_GETTRAILSIG(p) UINT32_VAL(p,FSI_TRAILSIG)
|
||||
|
||||
# define DIR_GETCRTIME(p) UINT16_VAL(p,DIR_CRTIME)
|
||||
# define DIR_GETCRDATE(p) UINT16_VAL(p,DIR_CRDATE)
|
||||
# define DIR_GETLASTACCDATE(p) UINT16_VAL(p,DIR_LASTACCDTE)
|
||||
# define DIR_GETFSTCLUSTHI(p) UINT16_VAL(p,DIR_FSTCLUSTHI)
|
||||
# define DIR_GETWRTTIME(p) UINT16_VAL(p,DIR_WRTTIME)
|
||||
# define DIR_GETWRTDATE(p) UINT16_VAL(p,DIR_WRTDATE)
|
||||
# define DIR_GETFSTCLUSTLO(p) UINT16_VAL(p,DIR_FSTCLUSTLO)
|
||||
# define DIR_GETFILESIZE(p) UINT32_VAL(p,DIR_FILESIZE)
|
||||
|
||||
# define FAT_GETFAT16(p,i) UINT16_VAL(p,i)
|
||||
# define FAT_GETFAT32(p,i) UINT32_VAL(p,i)
|
||||
|
||||
# define MBR_PUTRESVDSECCOUNT(p,v) UINT16_PUT(p,BS_RESVDSECCOUNT,v)
|
||||
# define MBR_PUTFATSZ16(p,v) UINT16_PUT(p,BS_FATSZ16,v)
|
||||
# define MBR_PUTSECPERTRK(p,v) UINT16_PUT(p,BS_SECPERTRK,v)
|
||||
# define MBR_PUTNUMHEADS(p,v) UINT16_PUT(p,BS_NUMHEADS,v)
|
||||
# define MBR_PUTHIDSEC(p,v) UINT32_PUT(p,BS_HIDSEC,v)
|
||||
# define MBR_PUTTOTSEC32(p,v) UINT32_PUT(p,BS_TOTSEC32,v)
|
||||
# define MBR_PUTFATSZ32(p,v) UINT32_PUT(p,BS32_FATSZ32,v)
|
||||
# define MBR_PUTEXTFLAGS(p,v) UINT16_PUT(p,BS32_EXTFLAGS,v)
|
||||
# define MBR_PUTFSVER(p,v) UINT16_PUT(p,BS32_FSVER,v)
|
||||
# define MBR_PUTROOTCLUS(p,v) UINT32_PUT(p,BS32_ROOTCLUS,v)
|
||||
# define MBR_PUTFSINFO(p,v) UINT16_PUT(p,BS32_FSINFO,v)
|
||||
# define MBR_PUTBKBOOTSEC(p,v) UINT16_PUT(p,BS32_BKBOOTSEC,v)
|
||||
# define MBR_PUTSIGNATURE(p,v) UINT16_PUT(p,BS_SIGNATURE,v)
|
||||
|
||||
# define FSI_PUTLEADSIG(p,v) UINT32_PUT(p,FSI_LEADSIG,v)
|
||||
# define FSI_PUTSTRUCTSIG(p,v) UINT32_PUT(p,FSI_STRUCTSIG,v)
|
||||
# define FSI_PUTFREECOUNT(p,v) UINT32_PUT(p,FSI_FREECOUNT,v)
|
||||
# define FSI_PUTNXTFREE(p,v) UINT32_PUT(p,FSI_NXTFREE,v)
|
||||
# define FSI_PUTTRAILSIG(p,v) UINT32_PUT(p,FSI_TRAILSIG,v)
|
||||
|
||||
# define DIR_PUTCRTIME(p,v) UINT16_PUT(p,DIR_CRTIME,v)
|
||||
# define DIR_PUTCRDATE(p,v) UINT16_PUT(p,DIR_CRDATE,v)
|
||||
# define DIR_PUTLASTACCDATE(p,v) UINT16_PUT(p,DIR_LASTACCDTE,v)
|
||||
# define DIR_PUTFSTCLUSTHI(p,v) UINT16_PUT(p,DIR_FSTCLUSTHI,v)
|
||||
# define DIR_PUTWRTTIME(p,v) UINT16_PUT(p,DIR_WRTTIME,v)
|
||||
# define DIR_PUTWRTDATE(p,v) UINT16_PUT(p,DIR_WRTDATE,v)
|
||||
# define DIR_PUTFSTCLUSTLO(p,v) UINT16_PUT(p,DIR_FSTCLUSTLO,v)
|
||||
# define DIR_PUTFILESIZE(p,v) UINT32_PUT(p,DIR_FILESIZE,v)
|
||||
|
||||
# define FAT_PUTFAT16(p,i,v) UINT16_PUT(p,i,v)
|
||||
# define FAT_PUTFAT32(p,i,v) UINT32_PUT(p,i,v)
|
||||
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
struct fat_direntry_s
|
||||
{
|
||||
ubyte fde_name[8]; /* name */
|
||||
ubyte fde_ext[3]; /* name and extension */
|
||||
ubyte fde_attr; /* attribute bits */
|
||||
ubyte fde_lcase; /* Case for base and extension */
|
||||
ubyte fde_ctimecs; /* Creation time, centiseconds (0-199) */
|
||||
ubyte fde_ctime[2]; /* Creation time */
|
||||
ubyte fde_cdate[2]; /* Creation date */
|
||||
ubyte fde_adate[2]; /* Last access date */
|
||||
ubyte fde_starthi[2]; /* High 16 bits of cluster in FAT32 */
|
||||
ubyte fde_time[2]; /* Date */
|
||||
ubyte fde_date[2]; /* Time */
|
||||
ubyte fde_start[2]; /* First cluster */
|
||||
ubyte fde_size[4]; /* file size (in bytes) */
|
||||
};
|
||||
|
||||
struct fat_dirslot_s
|
||||
{
|
||||
ubyte fds_id; /* sequence number for slot */
|
||||
ubyte fds_name0_4[10]; /* first 5 characters in name */
|
||||
ubyte fds_attr; /* attribute byte */
|
||||
ubyte fds_reserved; /* always 0 */
|
||||
ubyte fds_alias_checksum; /* checksum for 8.3 alias */
|
||||
ubyte fds_name5_10[12]; /* 6 more characters in name */
|
||||
ubyte fds_start[2]; /* starting cluster number, 0 in long slots */
|
||||
ubyte fds_name11_12[4]; /* last 2 characters in name */
|
||||
};
|
||||
|
||||
/* This structure represents the overall mountpoint state. An instance of this
|
||||
* structure is retained as inode private data on each mountpoint that is
|
||||
* mounted with a fat32 filesystem.
|
||||
@@ -167,7 +406,6 @@ struct fat_mountpt_s
|
||||
struct inode *fs_blkdriver; /* The block driver inode that hosts the FAT32 fs */
|
||||
struct fat_file_s *fs_head; /* A list to all files opened on this mountpoint */
|
||||
|
||||
boolean fs_mounted; /* TRUE: The file system is ready */
|
||||
sem_t fs_sem; /* Used to assume thread-safe access */
|
||||
size_t fs_hwsectorsize; /* HW: Sector size reported by block driver*/
|
||||
size_t fs_hwnsectors; /* HW: The number of sectors reported by the hardware */
|
||||
@@ -175,6 +413,7 @@ struct fat_mountpt_s
|
||||
size_t fs_rootbase; /* MBR: Cluster no. of 1st cluster of root dir */
|
||||
size_t fs_database; /* Logical block of start data sectors */
|
||||
size_t fs_fsinfo; /* MBR: Sector number of FSINFO sector */
|
||||
size_t fs_sector; /* The sector number buffered in fs_buffer */
|
||||
uint32 fs_nclusters; /* Maximum number of data clusters */
|
||||
uint32 fs_fatsize; /* MBR: Count of sectors occupied by one fat */
|
||||
uint32 fs_fattotsec; /* MBR: Total count of sectors on the volume */
|
||||
@@ -182,6 +421,8 @@ struct fat_mountpt_s
|
||||
uint32 fs_fsinextfree; /* FSI: Cluster number of 1st free cluster */
|
||||
uint16 fs_fatresvdseccount; /* MBR: The total number of reserved sectors */
|
||||
uint16 fs_rootentcnt; /* MBR: Count of 32-bit root directory entries */
|
||||
boolean fs_mounted; /* TRUE: The file system is ready */
|
||||
boolean fs_dirty; /* TRUE: fs_buffer is dirty */
|
||||
ubyte fs_type; /* FSTYPE_FAT12, FSTYPE_FAT16, or FSTYPE_FAT32 */
|
||||
ubyte fs_fatnumfats; /* MBR: Number of FATs (probably 2) */
|
||||
ubyte fs_fatsecperclus; /* MBR: Sectors per allocation unit: 2**n, n=0..7 */
|
||||
@@ -189,15 +430,38 @@ struct fat_mountpt_s
|
||||
* from the device */
|
||||
};
|
||||
|
||||
/* This structure represents on open file under the mountpoint. An instance of this
|
||||
* structure is retained as struct file specific information on each opened file.
|
||||
/* This structure represents on open file under the mountpoint. An instance
|
||||
* of this structure is retained as struct file specific information on each
|
||||
* opened file.
|
||||
*/
|
||||
|
||||
struct fat_file_s
|
||||
{
|
||||
struct fat_file_s *ff_next; /* File structures are retained in a singly linked list */
|
||||
struct fat_mountpt_s *ff_parent;
|
||||
boolean ff_open; /* TRUE: The file is (still) open */
|
||||
struct fat_file_s *ff_next; /* Retained in a singly linked list */
|
||||
boolean ff_open; /* TRUE: The file is (still) open */
|
||||
ubyte ff_oflags; /* Flags provided when file was opened */
|
||||
ubyte ff_sectorsincluster; /* Sectors remaining in cluster */
|
||||
uint16 ff_dirindex; /* Index into ff_dirsector to directory entry */
|
||||
size_t ff_dirsector; /* Sector containing the directory entry */
|
||||
size_t ff_position; /* File position for read/write/seek in bytes */
|
||||
size_t ff_size; /* Size of the file in bytes */
|
||||
size_t ff_startcluster; /* Start cluster of file on media */
|
||||
};
|
||||
|
||||
/* This structure is used internally for describing directory entries */
|
||||
|
||||
struct fat_dirinfo_s
|
||||
{
|
||||
struct fat_mountpt_s *fs; /* Pointer to the parent mountpoint */
|
||||
ubyte fd_name[8+3]; /* Filename -- directory format*/
|
||||
#ifdef CONFIG_FAT_LCNAMES
|
||||
ubyte fd_ntflags; /* NTRes lower case flags */
|
||||
#endif
|
||||
uint16 fd_index; /* Current index */
|
||||
size_t fd_startcluster; /* Start cluster number */
|
||||
size_t fd_currcluster; /* Current cluster number */
|
||||
size_t fd_currsector; /* Current sector */
|
||||
ubyte *fd_entry; /* A pointer to the raw 32-byte entry */
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
@@ -216,9 +480,22 @@ extern "C" {
|
||||
#define EXTERN extern
|
||||
#endif
|
||||
|
||||
EXTERN uint16 fat_getuint16(ubyte *ptr);
|
||||
EXTERN uint32 fat_getuint32(ubyte *ptr);
|
||||
EXTERN void fat_putuint16(ubyte *ptr, uint16 value16);
|
||||
EXTERN void fat_putuint32(ubyte *ptr, uint32 value32);
|
||||
EXTERN void fat_semtake(struct fat_mountpt_s *fs);
|
||||
EXTERN void fat_semgive(struct fat_mountpt_s *fs);
|
||||
EXTERN int fat_mount(struct fat_mountpt_s *fs, boolean writeable);
|
||||
EXTERN int fat_checkmount(struct fat_mountpt_s *fs);
|
||||
EXTERN int fat_nextdirentry(struct fat_dirinfo_s *dirinfo);
|
||||
EXTERN int fat_finddirentry(struct fat_dirinfo_s *dirinfo, const char *path);
|
||||
EXTERN int fat_dirtruncate(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo);
|
||||
EXTERN int fat_dircreate(struct fat_mountpt_s *fs, struct fat_dirinfo_s *dirinfo);
|
||||
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __FS_FAT_H */
|
||||
#endif /* __FS_FAT32_H */
|
||||
|
||||
+1543
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -154,7 +154,7 @@ int open(const char *path, int oflags, ...)
|
||||
if (INODE_IS_MOUNTPT(inode))
|
||||
{
|
||||
status = inode->u.i_mops->open((FAR struct file*)&list->fl_files[fd],
|
||||
inode, relpath, oflags, mode);
|
||||
relpath, oflags, mode);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
+6
-6
@@ -100,9 +100,9 @@ struct block_operations
|
||||
int (*open)(FAR struct inode *inode);
|
||||
int (*close)(FAR struct inode *inode);
|
||||
ssize_t (*read)(FAR struct inode *inode, unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors);
|
||||
size_t start_sector, unsigned int nsectors);
|
||||
ssize_t (*write)(FAR struct inode *inode, const unsigned char *buffer,
|
||||
size_t start_sector, size_t nsectors);
|
||||
size_t start_sector, unsigned int nsectors);
|
||||
int (*geometry)(FAR struct inode *inode, struct geometry *geometry);
|
||||
int (*ioctl)(FAR struct inode *inode, int cmd, unsigned long arg);
|
||||
};
|
||||
@@ -122,8 +122,8 @@ struct mountpt_operations
|
||||
* information to manage privileges.
|
||||
*/
|
||||
|
||||
int (*open)(FAR struct file *filp, FAR struct inode *inode,
|
||||
const char *rel_path, int oflags, mode_t mode);
|
||||
int (*open)(FAR struct file *filp, const char *rel_path,
|
||||
int oflags, mode_t mode);
|
||||
|
||||
/* The following methods must be identical in signature and position because
|
||||
* the struct file_operations and struct mountp_operations are treated like
|
||||
@@ -189,8 +189,8 @@ struct file
|
||||
#if CONFIG_NFILE_DESCRIPTORS > 0
|
||||
struct filelist
|
||||
{
|
||||
sem_t fl_sem; /* Manage access to the file list */
|
||||
sint16 fl_crefs; /* Reference count */
|
||||
sem_t fl_sem; /* Manage access to the file list */
|
||||
sint16 fl_crefs; /* Reference count */
|
||||
struct file fl_files[CONFIG_NFILE_DESCRIPTORS];
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
/************************************************************
|
||||
* stat.h
|
||||
*
|
||||
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
************************************************************/
|
||||
|
||||
#ifndef __SYS_STAT_H
|
||||
#define __SYS_STAT_H
|
||||
|
||||
/************************************************************
|
||||
* Included Files
|
||||
************************************************************/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
/************************************************************
|
||||
* Type Definitions
|
||||
************************************************************/
|
||||
|
||||
#endif /* __SYS_STAT_H */
|
||||
Reference in New Issue
Block a user