X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Fexfat.h;h=e5fe625d77f1477f3cde3fd58f1dcb5ec6141dbf;hp=bca0d240f5496ee6baffa13e9be1e13100909cbc;hb=4efb596cee7f7cc961990f8dffc3b210e579e49c;hpb=9799d681703e3a63dbbf876c16c9bb51b20c8fab diff --git a/libexfat/exfat.h b/libexfat/exfat.h index bca0d24..e5fe625 100644 --- a/libexfat/exfat.h +++ b/libexfat/exfat.h @@ -3,7 +3,7 @@ Definitions of structures and constants used in exFAT file system implementation. - Copyright (C) 2009, 2010 Andrew Nayenko + Copyright (C) 2010-2013 Andrew Nayenko This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include "exfatfs.h" @@ -38,10 +39,13 @@ #define IS_CONTIGUOUS(node) (((node).flags & EXFAT_ATTRIB_CONTIGUOUS) != 0) #define SECTOR_SIZE(sb) (1 << (sb).sector_bits) #define CLUSTER_SIZE(sb) (SECTOR_SIZE(sb) << (sb).spc_bits) -#define CLUSTER_INVALID(c) ((c) == EXFAT_CLUSTER_BAD || (c) == EXFAT_CLUSTER_END) +#define CLUSTER_INVALID(c) \ + ((c) < EXFAT_FIRST_DATA_CLUSTER || (c) > EXFAT_LAST_DATA_CLUSTER) #define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define DIV_ROUND_UP(x, d) (((x) + (d) - 1) / (d)) +#define ROUND_UP(x, d) (DIV_ROUND_UP(x, d) * (d)) #define BMAP_GET(bitmap, index) \ (((uint8_t*) bitmap)[(index) / 8] & (1u << ((index) % 8))) @@ -69,6 +73,13 @@ struct exfat_node le16_t name[EXFAT_NAME_MAX + 1]; }; +enum exfat_mode +{ + EXFAT_MODE_RO, + EXFAT_MODE_RW, + EXFAT_MODE_ANY, +}; + struct exfat_dev; struct exfat @@ -84,7 +95,7 @@ struct exfat uint32_t size; /* in bits */ uint8_t* chunk; uint32_t chunk_size; /* in bits */ - int dirty; + bool dirty; } cmap; char label[EXFAT_ENAME_MAX * 6 + 1]; /* a character can occupy up to @@ -94,8 +105,7 @@ struct exfat uid_t uid; gid_t gid; int ro; - int ro_fallback; - int noatime; + bool noatime; }; /* in-core nodes iterator */ @@ -122,9 +132,11 @@ void exfat_warn(const char* format, ...) void exfat_debug(const char* format, ...) __attribute__((format(printf, 1, 2))); -struct exfat_dev* exfat_open(const char* spec, int ro); +struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode); int exfat_close(struct exfat_dev* dev); int exfat_fsync(struct exfat_dev* dev); +enum exfat_mode exfat_get_mode(const struct exfat_dev* dev); +off_t exfat_get_size(const struct exfat_dev* dev); off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence); ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size); ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size);