X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=devextras.h;h=a9366fdd2e79b182750938d655036f7928c99ceb;hp=2ba88a2b9c449f8e4def6a73d55dd83297937153;hb=cc0617d99eaa089a61ac49b21d07a16280638806;hpb=02d566cf1ffdd2d91d4abbaf106ef4fb3affbdc6 diff --git a/devextras.h b/devextras.h index 2ba88a2..a9366fd 100644 --- a/devextras.h +++ b/devextras.h @@ -1,5 +1,5 @@ /* - * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. * * Copyright (C) 2002-2007 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -23,31 +23,35 @@ #ifndef __EXTRAS_H__ #define __EXTRAS_H__ -#if defined WIN32 -#define __inline__ __inline -#define new newHack -#endif -#if !(defined __KERNEL__) || (defined WIN32) +#if !(defined __KERNEL__) /* Definition of types */ typedef unsigned char __u8; typedef unsigned short __u16; typedef unsigned __u32; +#endif + /* * This is a simple doubly linked list implementation that matches the * way the Linux kernel doubly linked list implementation works. */ -struct list_head { - struct list_head *next; /* next in chain */ - struct list_head *prev; /* previous in chain */ +struct ylist_head { + struct ylist_head *next; /* next in chain */ + struct ylist_head *prev; /* previous in chain */ }; +/* Initialise a static list */ +#define YLIST_HEAD(name) \ +struct ylist_head name = { &(name),&(name)} + + + /* Initialise a list head to an empty list */ -#define INIT_LIST_HEAD(p) \ +#define YINIT_LIST_HEAD(p) \ do { \ (p)->next = (p);\ (p)->prev = (p); \ @@ -55,76 +59,99 @@ do { \ /* Add an element to a list */ -static __inline__ void list_add(struct list_head *newEntry, - struct list_head *list) +static __inline__ void ylist_add(struct ylist_head *newEntry, + struct ylist_head *list) { - struct list_head *listNext = list->next; - - list->next = newEntry; - newEntry->prev = list; + struct ylist_head *listNext = list->next; + + list->next = newEntry; + newEntry->prev = list; newEntry->next = listNext; listNext->prev = newEntry; } +static __inline__ void ylist_add_tail(struct ylist_head *newEntry, + struct ylist_head *list) +{ + struct ylist_head *listPrev = list->prev; + + list->prev = newEntry; + newEntry->next = list; + newEntry->prev = listPrev; + listPrev->next = newEntry; + +} + /* Take an element out of its current list, with or without * reinitialising the links.of the entry*/ -static __inline__ void list_del(struct list_head *entry) +static __inline__ void ylist_del(struct ylist_head *entry) { - struct list_head *listNext = entry->next; - struct list_head *listPrev = entry->prev; - - listNext->prev = listPrev; - listPrev->next = listNext; - + struct ylist_head *listNext = entry->next; + struct ylist_head *listPrev = entry->prev; + + listNext->prev = listPrev; + listPrev->next = listNext; + } -static __inline__ void list_del_init(struct list_head *entry) +static __inline__ void ylist_del_init(struct ylist_head *entry) { - list_del(entry); - entry->next = entry->prev = entry; + ylist_del(entry); + entry->next = entry->prev = entry; } /* Test if the list is empty */ -static __inline__ int list_empty(struct list_head *entry) +static __inline__ int ylist_empty(struct ylist_head *entry) { - return (entry->next == entry); + return (entry->next == entry); } -/* list_entry takes a pointer to a list entry and offsets it to that +/* ylist_entry takes a pointer to a list entry and offsets it to that * we can find a pointer to the object it is embedded in. */ -#define list_entry(entry, type, member) \ - ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member))) +#define ylist_entry(entry, type, member) \ + ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member))) -/* list_for_each and list_for_each_safe iterate over lists. - * list_for_each_safe uses temporary storage to make the list delete safe +/* ylist_for_each and list_for_each_safe iterate over lists. + * ylist_for_each_safe uses temporary storage to make the list delete safe */ -#define list_for_each(itervar, list) \ - for (itervar = (list)->next; itervar != (list); itervar = itervar->next ) +#define ylist_for_each(itervar, list) \ + for (itervar = (list)->next; itervar != (list); itervar = itervar->next ) + +#define ylist_for_each_safe(itervar,saveVar, list) \ + for (itervar = (list)->next, saveVar = (list)->next->next; itervar != (list); \ + itervar = saveVar, saveVar = saveVar->next) -#define list_for_each_safe(itervar,saveVar, list) \ - for (itervar = (list)->next, saveVar = (list)->next->next; itervar != (list); \ - itervar = saveVar, saveVar = saveVar->next) +#if !(defined __KERNEL__) + + +#ifndef WIN32 +#include +#endif + + +#ifdef CONFIG_YAFFS_PROVIDE_DEFS /* File types */ -#define DT_UNKNOWN 0 -#define DT_FIFO 1 -#define DT_CHR 2 + +#define DT_UNKNOWN 0 +#define DT_FIFO 1 +#define DT_CHR 2 #define DT_DIR 4 #define DT_BLK 6 -#define DT_REG 8 -#define DT_LNK 10 -#define DT_SOCK 12 -#define DR_WHT 14 +#define DT_REG 8 +#define DT_LNK 10 +#define DT_SOCK 12 +#define DT_WHT 14 #ifndef WIN32 @@ -132,17 +159,17 @@ static __inline__ int list_empty(struct list_head *entry) #endif /* - * Attribute flags. + * Attribute flags. These should be or-ed together to figure out what + * has been changed! */ -#define ATTR_MODE 1 -#define ATTR_UID 2 +#define ATTR_MODE 1 +#define ATTR_UID 2 #define ATTR_GID 4 #define ATTR_SIZE 8 #define ATTR_ATIME 16 #define ATTR_MTIME 32 #define ATTR_CTIME 64 - struct iattr { unsigned int ia_valid; unsigned ia_mode; @@ -152,24 +179,21 @@ struct iattr { unsigned ia_atime; unsigned ia_mtime; unsigned ia_ctime; - unsigned int ia_attr_flags; + unsigned int ia_attr_flags; }; +#endif + + #define KERN_DEBUG #else -#ifndef WIN32 #include -#include #include #include -#endif #endif -#if defined WIN32 -#undef new -#endif #endif