Index: uspace/srv/fs/exfat/Makefile =================================================================== --- uspace/srv/fs/exfat/Makefile (revision 5f0e16e4af4b7c7ee7140d63355b4d75dd166d5d) +++ uspace/srv/fs/exfat/Makefile (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -36,4 +36,5 @@ exfat.c \ exfat_fat.c \ + exfat_bitmap.c \ exfat_ops.c \ exfat_idx.c \ Index: uspace/srv/fs/exfat/exfat.h =================================================================== --- uspace/srv/fs/exfat/exfat.h (revision 5f0e16e4af4b7c7ee7140d63355b4d75dd166d5d) +++ uspace/srv/fs/exfat/exfat.h (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -62,4 +62,7 @@ #define VOL_FLAGS(bs) uint16_t_le2host(bs->volume_flags) +#define EXFAT_NODE(node) ((node) ? (exfat_node_t *) (node)->data : NULL) +#define FS_NODE(node) ((node) ? (node)->bp : NULL) +#define DPS(bs) (BPS((bs)) / sizeof(exfat_dentry_t)) typedef struct exfat_bs { @@ -178,4 +181,11 @@ extern void exfat_idx_fini_by_devmap_handle(devmap_handle_t); +extern int exfat_node_put(fs_node_t *); +extern int exfat_bitmap_get(fs_node_t **, devmap_handle_t); +/* +static int exfat_uctable_get(fs_node_t **, devmap_handle_t); +*/ + + #endif Index: uspace/srv/fs/exfat/exfat_bitmap.c =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.c (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) +++ uspace/srv/fs/exfat/exfat_bitmap.c (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2011 Oleg Romanenko + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup fs + * @{ + */ + +/** + * @file exfat_bitmap.c + * @brief Functions that manipulate the Bitmap Table. + */ + +#include "exfat_bitmap.h" +#include "../../vfs/vfs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +int bitmap_is_free(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t clst) +{ + /* TODO */ + return EOK; +} + +int bitmap_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc) +{ + fs_node_t *fn; + block_t *b=NULL; + exfat_node_t *bitmapp; + uint8_t *bitmap; + int rc; + + firstc -= EXFAT_CLST_FIRST; + + /* rc = exfat_node_get(&fn, devmap_handle, EXFAT_BITMAP_IDX); */ + rc = exfat_bitmap_get(&fn, devmap_handle); + if (rc != EOK) + return rc; + bitmapp = EXFAT_NODE(fn); + + aoff64_t offset = firstc / 8; + rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE); + if (rc != EOK) { + (void) exfat_node_put(fn); + return rc; + } + bitmap = (uint8_t *)b->data; + bitmap[offset % BPS(bs)] |= (1 << (firstc % 8)); + + b->dirty = true; + rc = block_put(b); + if (rc != EOK) { + (void) exfat_node_put(fn); + return rc; + } + + return exfat_node_put(fn); +} + +int bitmap_clear_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc) +{ + /* TODO */ + return EOK; +} + +int bitmap_set_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc, exfat_cluster_t count) +{ + int rc; + exfat_cluster_t clst; + clst = firstc; + + while (clst < firstc+count ) { + rc = bitmap_set_cluster(bs, devmap_handle, clst); + if (rc != EOK) { + if ((clst-firstc) > 0) + (void) bitmap_clear_clusters(bs, devmap_handle, firstc, clst-firstc); + return rc; + } + clst++; + } + return EOK; +} + +int bitmap_clear_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc, exfat_cluster_t count) +{ + int rc; + exfat_cluster_t clst; + clst = firstc; + + while (clst < firstc+count ) { + rc = bitmap_clear_cluster(bs, devmap_handle, clst); + if (rc != EOK) + return rc; + clst++; + } + return EOK; +} + +int bitmap_alloc_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, + exfat_cluster_t *firstc, exfat_cluster_t count) +{ + exfat_cluster_t startc, endc; + startc = EXFAT_CLST_FIRST; + + while (startc < DATA_CNT(bs)+2) { + if (bitmap_is_free(bs, devmap_handle, startc) == EOK) { + endc = startc+1; + while (bitmap_is_free(bs, devmap_handle, endc) == EOK) { + if ((endc - startc)+1 == count){ + *firstc = startc; + return bitmap_set_clusters(bs, devmap_handle, startc, count); + } + else + endc++; + } + startc = endc+1; + } + else + startc++; + } + return ENOSPC; +} + + +int bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, + exfat_cluster_t count) +{ + if (nodep->firstc == 0) { + return bitmap_alloc_clusters(bs, nodep->idx->devmap_handle, + &nodep->firstc, count); + } else { + exfat_cluster_t lastc, clst; + lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; + + clst = lastc+1; + while (bitmap_is_free(bs, nodep->idx->devmap_handle, clst) == EOK) { + if ((clst - lastc) == count){ + return bitmap_set_clusters(bs, nodep->idx->devmap_handle, + lastc+1, count); + } + else + clst++; + } + return ENOSPC; + } +} + + +int bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, + exfat_cluster_t count) +{ + exfat_cluster_t lastc; + lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; + lastc -= count; + + return bitmap_clear_clusters(bs, nodep->idx->devmap_handle, lastc+1, count); +} + + +int bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep) +{ + int rc; + exfat_cluster_t lastc, clst; + devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; + + for (clst = nodep->firstc; clst < lastc; clst++) { + rc = exfat_set_cluster(bs, devmap_handle, clst, clst+1); + if (rc != EOK) + return rc; + } + + return exfat_set_cluster(bs, devmap_handle, lastc, EXFAT_CLST_EOF); +} + + + +/** + * @} + */ Index: uspace/srv/fs/exfat/exfat_bitmap.h =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.h (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) +++ uspace/srv/fs/exfat/exfat_bitmap.h (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011 Oleg Romanenko + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup fs + * @{ + */ + +#ifndef EXFAT_EXFAT_BITMAP_H_ +#define EXFAT_EXFAT_BITMAP_H_ + +#include +#include "exfat.h" +#include "exfat_fat.h" + +/* forward declarations */ +struct exfat_node; +struct exfat_bs; + +extern int bitmap_alloc_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t *firstc, exfat_cluster_t count); +extern int bitmap_append_clusters(struct exfat_bs *bs, struct exfat_node *nodep, + exfat_cluster_t count); +extern int bitmap_free_clusters(struct exfat_bs *bs, struct exfat_node *nodep, + exfat_cluster_t count); +extern int bitmap_replicate_clusters(struct exfat_bs *bs, struct exfat_node *nodep); + +extern int bitmap_is_free(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t clst); +extern int bitmap_set_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc); +extern int bitmap_clear_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc); +extern int bitmap_set_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc, exfat_cluster_t count); +extern int bitmap_clear_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, + exfat_cluster_t firstc, exfat_cluster_t count); + + +#endif + +/** + * @} + */ Index: uspace/srv/fs/exfat/exfat_fat.c =================================================================== --- uspace/srv/fs/exfat/exfat_fat.c (revision 5f0e16e4af4b7c7ee7140d63355b4d75dd166d5d) +++ uspace/srv/fs/exfat/exfat_fat.c (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -34,5 +34,5 @@ /** * @file exfat_fat.c - * @brief Functions that manipulate the File Allocation Tables. + * @brief Functions that manipulate the File Allocation Table. */ @@ -169,5 +169,5 @@ } -/** Read block from file located on a FAT file system. +/** Read block from file located on a exFAT file system. * * @param block Pointer to a block pointer for storing result. @@ -476,139 +476,4 @@ } -int bitmap_is_free(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t clst) -{ - /* TODO */ - return EOK; -} - -int bitmap_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc) -{ - /* TODO */ - return EOK; -} - -int bitmap_clear_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc) -{ - /* TODO */ - return EOK; -} - -int bitmap_set_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc, exfat_cluster_t count) -{ - int rc; - exfat_cluster_t clst; - clst = firstc; - - while (clst < firstc+count ) { - rc = bitmap_set_cluster(bs, devmap_handle, clst); - if (rc != EOK) { - if ((clst-firstc) > 0) - (void) bitmap_clear_clusters(bs, devmap_handle, firstc, clst-firstc); - return rc; - } - clst++; - } - return EOK; -} - -int bitmap_clear_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc, exfat_cluster_t count) -{ - int rc; - exfat_cluster_t clst; - clst = firstc; - - while (clst < firstc+count ) { - rc = bitmap_clear_cluster(bs, devmap_handle, clst); - if (rc != EOK) - return rc; - clst++; - } - return EOK; -} - -int bitmap_alloc_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, - exfat_cluster_t *firstc, exfat_cluster_t count) -{ - exfat_cluster_t startc, endc; - startc = EXFAT_CLST_FIRST; - - while (startc < DATA_CNT(bs)+2) { - if (bitmap_is_free(bs, devmap_handle, startc) == EOK) { - endc = startc+1; - while (bitmap_is_free(bs, devmap_handle, endc) == EOK) { - if ((endc - startc)+1 == count){ - *firstc = startc; - return bitmap_set_clusters(bs, devmap_handle, startc, count); - } - else - endc++; - } - startc = endc+1; - } - else - startc++; - } - return ENOSPC; -} - - -int bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, - exfat_cluster_t count) -{ - if (nodep->firstc == 0) { - return bitmap_alloc_clusters(bs, nodep->idx->devmap_handle, - &nodep->firstc, count); - } else { - exfat_cluster_t lastc, clst; - lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; - - clst = lastc+1; - while (bitmap_is_free(bs, nodep->idx->devmap_handle, clst) == EOK) { - if ((clst - lastc) == count){ - return bitmap_set_clusters(bs, nodep->idx->devmap_handle, - lastc+1, count); - } - else - clst++; - } - return ENOSPC; - } -} - - -int bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, - exfat_cluster_t count) -{ - exfat_cluster_t lastc; - lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; - lastc -= count; - - return bitmap_clear_clusters(bs, nodep->idx->devmap_handle, lastc+1, count); -} - - -int bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep) -{ - int rc; - exfat_cluster_t lastc, clst; - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; - lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; - - for (clst = nodep->firstc; clst < lastc; clst++) { - rc = exfat_set_cluster(bs, devmap_handle, clst, clst+1); - if (rc != EOK) - return rc; - } - - return exfat_set_cluster(bs, devmap_handle, lastc, EXFAT_CLST_EOF); -} - - - /** Perform basic sanity checks on the file system. * @@ -619,4 +484,5 @@ int exfat_sanity_check(exfat_bs_t *bs, devmap_handle_t devmap_handle) { + /* TODO */ return EOK; } Index: uspace/srv/fs/exfat/exfat_fat.h =================================================================== --- uspace/srv/fs/exfat/exfat_fat.h (revision 5f0e16e4af4b7c7ee7140d63355b4d75dd166d5d) +++ uspace/srv/fs/exfat/exfat_fat.h (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -76,23 +76,4 @@ extern int exfat_sanity_check(struct exfat_bs *, devmap_handle_t); -extern int bitmap_alloc_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t *firstc, exfat_cluster_t count); -extern int bitmap_append_clusters(struct exfat_bs *bs, struct exfat_node *nodep, - exfat_cluster_t count); -extern int bitmap_free_clusters(struct exfat_bs *bs, struct exfat_node *nodep, - exfat_cluster_t count); -extern int bitmap_replicate_clusters(struct exfat_bs *bs, struct exfat_node *nodep); - -extern int bitmap_is_free(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t clst); -extern int bitmap_set_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc); -extern int bitmap_clear_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc); -extern int bitmap_set_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc, exfat_cluster_t count); -extern int bitmap_clear_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, - exfat_cluster_t firstc, exfat_cluster_t count); - extern int exfat_append_clusters(struct exfat_bs *, struct exfat_node *, exfat_cluster_t, exfat_cluster_t); Index: uspace/srv/fs/exfat/exfat_ops.c =================================================================== --- uspace/srv/fs/exfat/exfat_ops.c (revision 5f0e16e4af4b7c7ee7140d63355b4d75dd166d5d) +++ uspace/srv/fs/exfat/exfat_ops.c (revision 5d5863ccd79dd1ce2ef86c5426aadb1dd94a98ea) @@ -41,4 +41,5 @@ #include "exfat_dentry.h" #include "exfat_directory.h" +#include "exfat_bitmap.h" #include "../../vfs/vfs.h" #include @@ -60,8 +61,4 @@ #include -#define EXFAT_NODE(node) ((node) ? (exfat_node_t *) (node)->data : NULL) -#define FS_NODE(node) ((node) ? (node)->bp : NULL) -#define DPS(bs) (BPS((bs)) / sizeof(exfat_dentry_t)) - /** Mutex protecting the list of cached free FAT nodes. */ static FIBRIL_MUTEX_INITIALIZE(ffn_mutex); @@ -73,13 +70,10 @@ * Forward declarations of FAT libfs operations. */ -/* -static int exfat_bitmap_get(fs_node_t **, devmap_handle_t); -static int exfat_uctable_get(fs_node_t **, devmap_handle_t); -*/ + static int exfat_root_get(fs_node_t **, devmap_handle_t); static int exfat_match(fs_node_t **, fs_node_t *, const char *); static int exfat_node_get(fs_node_t **, devmap_handle_t, fs_index_t); static int exfat_node_open(fs_node_t *); -static int exfat_node_put(fs_node_t *); +/* static int exfat_node_put(fs_node_t *); */ static int exfat_create_node(fs_node_t **, devmap_handle_t, int); static int exfat_destroy_node(fs_node_t *); @@ -459,10 +453,9 @@ } -/* int exfat_bitmap_get(fs_node_t **rfn, devmap_handle_t devmap_handle) { return exfat_node_get(rfn, devmap_handle, EXFAT_BITMAP_IDX); } -*/ + /* int exfat_uctable_get(fs_node_t **rfn, devmap_handle_t devmap_handle)