u8 shareWrite:1;
int inodeId:12; /* Index to corresponding yaffsfs_Inode */
int handleCount:10; /* Number of handles for this fd */
- loff_t position; /* current position in file */
+ Y_LOFF_T position; /* current position in file */
};
struct yaffsfs_Handle {
return a;
}
-int yaffsfs_Match(YCHAR a, YCHAR b)
+static int yaffsfs_Match(YCHAR a, YCHAR b)
{
return (yaffs_toupper(a) == yaffs_toupper(b));
}
#else
-int yaffsfs_Match(YCHAR a, YCHAR b)
+static int yaffsfs_Match(YCHAR a, YCHAR b)
{
/* case sensitive */
return (a == b);
}
#endif
-int yaffsfs_IsPathDivider(YCHAR ch)
+static int yaffsfs_IsPathDivider(YCHAR ch)
{
const YCHAR *str = YAFFS_PATH_DIVIDERS;
return 0;
}
-int yaffsfs_CheckNameLength(const char *name)
+static int yaffsfs_CheckNameLength(const char *name)
{
int retVal = 0;
YAFFS_SHARE_READ | YAFFS_SHARE_WRITE);
}
-int yaffs_Dofsync(int handle, int datasync)
+static int yaffs_Dofsync(int handle, int datasync)
{
int retVal = -1;
struct yaffs_obj *obj;
return retVal;
}
-int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
+static int yaffsfs_do_read(int handle, void *vbuf, unsigned int nbyte,
- int isPread, loff_t offset)
+ int isPread, Y_LOFF_T offset)
{
struct yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- loff_t pos = 0;
- loff_t startPos = 0;
- loff_t endPos = 0;
+ Y_LOFF_T pos = 0;
+ Y_LOFF_T startPos = 0;
+ Y_LOFF_T endPos = 0;
int nRead = 0;
int nToRead = 0;
int totalRead = 0;
- loff_t maxRead;
+ Y_LOFF_T maxRead;
u8 *buf = (u8 *) vbuf;
if (!vbuf) {
return yaffsfs_do_read(handle, buf, nbyte, 0, 0);
}
- int yaffs_pread(int handle, void *buf, unsigned int nbyte, loff_t offset)
+ int yaffs_pread(int handle, void *buf, unsigned int nbyte, Y_LOFF_T offset)
{
return yaffsfs_do_read(handle, buf, nbyte, 1, offset);
}
-int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
+static int yaffsfs_do_write(int handle, const void *vbuf, unsigned int nbyte,
- int isPwrite, loff_t offset)
+ int isPwrite, Y_LOFF_T offset)
{
struct yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- loff_t pos = 0;
- loff_t startPos = 0;
- loff_t endPos;
+ Y_LOFF_T pos = 0;
+ Y_LOFF_T startPos = 0;
+ Y_LOFF_T endPos;
int nWritten = 0;
int totalWritten = 0;
int write_trhrough = 0;
return yaffsfs_do_write(fd, buf, nbyte, 0, 0);
}
- int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, loff_t offset)
+ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, Y_LOFF_T offset)
{
return yaffsfs_do_write(fd, buf, nbyte, 1, offset);
}
- int yaffs_truncate(const YCHAR *path, loff_t new_size)
+ int yaffs_truncate(const YCHAR *path, Y_LOFF_T new_size)
{
struct yaffs_obj *obj = NULL;
struct yaffs_obj *dir = NULL;
return (result) ? 0 : -1;
}
- int yaffs_ftruncate(int handle, loff_t new_size)
+ int yaffs_ftruncate(int handle, Y_LOFF_T new_size)
{
struct yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
}
- loff_t yaffs_lseek(int handle, loff_t offset, int whence)
+ Y_LOFF_T yaffs_lseek(int handle, Y_LOFF_T offset, int whence)
{
struct yaffsfs_FileDes *fd = NULL;
struct yaffs_obj *obj = NULL;
- loff_t pos = -1;
- loff_t fSize = -1;
+ Y_LOFF_T pos = -1;
+ Y_LOFF_T fSize = -1;
yaffsfs_Lock();
fd = yaffsfs_HandleToFileDes(handle);
return pos;
}
-int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
+static int yaffsfs_DoUnlink(const YCHAR *path, int isDirectory)
{
struct yaffs_obj *dir = NULL;
struct yaffs_obj *obj = NULL;
return yaffs_unmount2(path, 0);
}
- loff_t yaffs_freespace(const YCHAR *path)
+ Y_LOFF_T yaffs_freespace(const YCHAR *path)
{
- loff_t retVal = -1;
+ Y_LOFF_T retVal = -1;
struct yaffs_dev *dev = NULL;
YCHAR *dummy;
return retVal;
}
- loff_t yaffs_totalspace(const YCHAR *path)
+ Y_LOFF_T yaffs_totalspace(const YCHAR *path)
{
- loff_t retVal = -1;
+ Y_LOFF_T retVal = -1;
struct yaffs_dev *dev = NULL;
YCHAR *dummy;
int yaffs_inodecount(const YCHAR *path)
{
- loff_t retVal = -1;
+ Y_LOFF_T retVal = -1;
struct yaffs_dev *dev = NULL;
YCHAR *dummy;
int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev)
{
- pathname = pathname;
- mode = mode;
- dev = dev;
+ (void) pathname;
+ (void) mode;
+ (void) dev;
yaffsfs_SetError(-EINVAL);
return -1;
int yaffs_dump_dev(const YCHAR *path)
{
#if 1
- path = path;
+ (void) path;
#else
YCHAR *rest;
}
-/*
- * Determine if we have a managed buffer.
- */
-int yaffs_is_managed_tmp_buffer(struct yaffs_dev *dev, const u8 *buffer)
-{
- int i;
-
- for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
- if (dev->temp_buffer[i].buffer == buffer)
- return 1;
- }
-
- for (i = 0; i < dev->param.n_caches; i++) {
- if (dev->cache[i].data == buffer)
- return 1;
- }
-
- if (buffer == dev->checkpt_buffer)
- return 1;
-
- yaffs_trace(YAFFS_TRACE_ALWAYS,
- "yaffs: unmaged buffer detected.");
- return 0;
-}
-
/*
* Functions for robustisizing TODO
*
const u8 *data,
const struct yaffs_ext_tags *tags)
{
- dev = dev;
- nand_chunk = nand_chunk;
- data = data;
- tags = tags;
+ (void) dev;
+ (void) nand_chunk;
+ (void) data;
+ (void) tags;
}
static void yaffs_handle_chunk_update(struct yaffs_dev *dev, int nand_chunk,
const struct yaffs_ext_tags *tags)
{
- dev = dev;
- nand_chunk = nand_chunk;
- tags = tags;
+ (void) dev;
+ (void) nand_chunk;
+ (void) tags;
}
void yaffs_handle_chunk_error(struct yaffs_dev *dev,
loff_t yaffs_max_file_size(struct yaffs_dev *dev)
{
- return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
+ if(sizeof(loff_t) < 8)
+ return YAFFS_MAX_FILE_SIZE_32;
+ else
+ return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk;
}
/*-------------------- TNODES -------------------
dev->n_tnodes = 0;
}
-void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
+static void yaffs_load_tnode_0(struct yaffs_dev *dev, struct yaffs_tnode *tn,
unsigned pos, unsigned val)
{
u32 *map = (u32 *) tn;
int required_depth;
int level = file_struct->top_level;
- dev = dev;
+ (void) dev;
/* Check sane level and chunk Id */
if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
return NULL;
}
-struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
+static struct yaffs_obj *yaffs_new_obj(struct yaffs_dev *dev, int number,
enum yaffs_obj_type type)
{
struct yaffs_obj *the_obj = NULL;
}
} else {
#else
- dev = dev;
+ (void) dev;
{
#endif
strncpy(name, oh_name, buff_size - 1);
return ret_val;
}
-int yaffs_del_file(struct yaffs_obj *in)
+static int yaffs_del_file(struct yaffs_obj *in)
{
int ret_val = YAFFS_OK;
int deleted; /* Need to cache value on stack if in is freed */
return n_free;
}
- /*\
- * Marshalling functions to get loff_t file sizes into aand out of
+ /*
+ * Marshalling functions to get loff_t file sizes into and out of
* object headers.
*/
void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize)
{
loff_t retval;
- if (~(oh->file_size_high))
+ if (sizeof(loff_t) >= 8 && ~(oh->file_size_high))
retval = (((loff_t) oh->file_size_high) << 32) |
(((loff_t) oh->file_size_low) & 0xFFFFFFFF);
else