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

diff --git a/devextras.h b/devextras.h
index d2abbd5..ce30c82 100644
--- a/devextras.h
+++ b/devextras.h
@@ -1,7 +1,7 @@
 /*
- * 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.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11,107 +11,30 @@
  * published by the Free Software Foundation.
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
+ */
+
+/*
  * This file is just holds extra declarations of macros that would normally
  * be providesd in the Linux kernel. These macros have been written from
  * scratch but are functionally equivalent to the Linux ones.
- *
- */
-
-#ifndef __EXTRAS_H__
-#define __EXTRAS_H__
-
-
-#if !(defined __KERNEL__) 
-
+ *
+ */
+
+#ifndef __EXTRAS_H__
+#define __EXTRAS_H__
+
+
+#include "yportenv.h"
+
+#if !(defined __KERNEL__)
+
 /* Definition of types */
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned __u32;
-
+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 ylist_head {
-        struct ylist_head *next; /* next in chain */
-        struct ylist_head *prev; /* previous in chain */
-};
-
-
-/* Initialise a list head to an empty list */
-#define YINIT_LIST_HEAD(p) \
-do { \
- (p)->next = (p);\
- (p)->prev = (p); \
-} while(0)
-
-
-/* Add an element to a list */
-static __inline__ void ylist_add(struct ylist_head *newEntry, 
-                                 struct ylist_head *list)
-{
-        struct ylist_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 ylist_del(struct ylist_head *entry)
-{
-        struct ylist_head *listNext = entry->next;
-        struct ylist_head *listPrev = entry->prev;
-        
-        listNext->prev = listPrev;
-        listPrev->next = listNext;
-        
-}
-
-static __inline__ void ylist_del_init(struct ylist_head *entry)
-{
-        ylist_del(entry);
-        entry->next = entry->prev = entry;
-}
-
-
-/* Test if the list is empty */
-static __inline__ int ylist_empty(struct ylist_head *entry)
-{
-        return (entry->next == entry);
-}
-
-
-/* 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 ylist_entry(entry, type, member) \
-        ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
-
-
-/* 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 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)
-
+
 
 #if !(defined __KERNEL__)
 
@@ -122,30 +45,30 @@ static __inline__ int ylist_empty(struct ylist_head *entry)
 
 
 #ifdef CONFIG_YAFFS_PROVIDE_DEFS
-/* File types */
-
+/* 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 DT_WHT          14
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-/*
- * Attribute flags.  These should be or-ed together to figure out what
- * has been changed!
- */
-#define ATTR_MODE       1
-#define ATTR_UID        2
+#define DT_REG		8
+#define DT_LNK		10
+#define DT_SOCK		12
+#define DT_WHT		14
+
+
+#ifndef WIN32
+#include <sys/stat.h>
+#endif
+
+/*
+ * 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_GID	4
 #define ATTR_SIZE	8
 #define ATTR_ATIME	16
@@ -161,21 +84,18 @@ struct iattr {
 	unsigned ia_atime;
 	unsigned ia_mtime;
 	unsigned ia_ctime;
-        unsigned int ia_attr_flags;
-};
-
+	unsigned int ia_attr_flags;
+};
+
+#endif
+
+#else
+
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/stat.h>
+
 #endif
 
 
-#define KERN_DEBUG
-
-#else
-
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-
-#endif
-
-
-#endif
+#endif