X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=devextras.h;h=ce30c820d938818ccce765fbe7cfe517dabc84cc;hp=2ba88a2b9c449f8e4def6a73d55dd83297937153;hb=4c78eb9aa16a108e258ab6185f37a51c3b413cb8;hpb=02d566cf1ffdd2d91d4abbaf106ef4fb3affbdc6

diff --git a/devextras.h b/devextras.h
index 2ba88a2..ce30c82 100644
--- a/devextras.h
+++ b/devextras.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -23,99 +23,31 @@
 #ifndef __EXTRAS_H__
 #define __EXTRAS_H__
 
-#if defined WIN32
-#define __inline__ __inline
-#define new newHack
-#endif
 
-#if !(defined __KERNEL__) || (defined WIN32)
+#include "yportenv.h"
+
+#if !(defined __KERNEL__)
 
 /* Definition of types */
 typedef unsigned char __u8;
 typedef unsigned short __u16;
 typedef unsigned __u32;
 
-/*
- * 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 */
-};
+#endif
 
 
-/* Initialise a list head to an empty list */
-#define INIT_LIST_HEAD(p) \
-do { \
- (p)->next = (p);\
- (p)->prev = (p); \
-} while(0)
-
-
-/* Add an element to a list */
-static __inline__ void list_add(struct list_head *newEntry, 
-				struct list_head *list)
-{
-	struct list_head *listNext = list->next;
-	
-	list->next = newEntry;
-	newEntry->prev = list;
-	newEntry->next = listNext;
-	listNext->prev = 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)
-{
-	struct list_head *listNext = entry->next;
-	struct list_head *listPrev = entry->prev;
-	
-	listNext->prev = listPrev;
-	listPrev->next = listNext;
-	
-}
-
-static __inline__ void list_del_init(struct list_head *entry)
-{
-	list_del(entry);
-	entry->next = entry->prev = entry;
-}
-
-
-/* Test if the list is empty */
-static __inline__ int list_empty(struct list_head *entry)
-{
-	return (entry->next == entry);
-}
-
-
-/* list_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)))
+#if !(defined __KERNEL__)
 
 
-/* list_for_each and list_for_each_safe  iterate over lists.
- * list_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 )
+#ifndef WIN32
+#include <sys/stat.h>
+#endif
 
-#define list_for_each_safe(itervar,saveVar, list) \
-	for (itervar = (list)->next, saveVar = (list)->next->next; itervar != (list); \
-	 itervar = saveVar, saveVar = saveVar->next)
 
+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
 /* File types */
 
+
 #define DT_UNKNOWN	0
 #define DT_FIFO		1
 #define DT_CHR		2
@@ -124,7 +56,7 @@ static __inline__ int list_empty(struct list_head *entry)
 #define DT_REG		8
 #define DT_LNK		10
 #define DT_SOCK		12
-#define DR_WHT		14
+#define DT_WHT		14
 
 
 #ifndef WIN32
@@ -132,7 +64,8 @@ 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
@@ -142,7 +75,6 @@ static __inline__ int list_empty(struct list_head *entry)
 #define ATTR_MTIME	32
 #define ATTR_CTIME	64
 
-
 struct iattr {
 	unsigned int ia_valid;
 	unsigned ia_mode;
@@ -155,21 +87,15 @@ struct iattr {
 	unsigned int ia_attr_flags;
 };
 
-#define KERN_DEBUG
+#endif
 
 #else
 
-#ifndef WIN32
 #include <linux/types.h>
-#include <linux/list.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
-#endif
 
 #endif
 
-#if defined WIN32
-#undef new
-#endif
 
 #endif