From: charles Date: Wed, 3 Nov 2004 08:35:48 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: pre-name-change~485 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=66ced3a339159f9fc2f928ca7e63240186ee89bd *** empty log message *** --- diff --git a/direct/Makefile b/direct/Makefile index 1033e04..4fc1c23 100644 --- a/direct/Makefile +++ b/direct/Makefile @@ -10,7 +10,7 @@ # # NB Warning this Makefile does not include header dependencies. # -# $Id: Makefile,v 1.1 2004-11-03 08:29:28 charles Exp $ +# $Id: Makefile,v 1.2 2004-11-03 08:35:48 charles Exp $ CFLAGS = -Wall -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DYAFFS2_DEFINES -g #CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations @@ -23,7 +23,7 @@ BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o ALLOBJS = dtest.o nand_ecc.o yaffscfg.o yaffs_fileem.o yaffsfs.o yaffs_ramdisk.o bootldtst.o yboot.o -SYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h +SYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h yportenv.h all: directtest boottest diff --git a/yportenv.h b/yportenv.h index c3c6aeb..8a58ae2 100644 --- a/yportenv.h +++ b/yportenv.h @@ -1,252 +1,273 @@ -/* - * YAFFS: Yet another FFS. A NAND-flash specific file system. - * yportenv.h: Portable services used by yaffs. This is done to allow - * simple migration from kernel space into app space for testing. - * - * Copyright (C) 2002 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering - * - * Created by Charles Manning - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2.1 as - * published by the Free Software Foundation. - * - * - * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. - * - * $Id: yportenv.h,v 1.1 2004-11-03 08:14:07 charles Exp $ - * - */ - -#ifndef __YPORTENV_H__ -#define __YPORTENV_H__ - - -#if defined CONFIG_YAFFS_WINCE - -// CONFIG_YAFFS_WINCE -#include "stdlib.h" -#include "stdio.h" -#include "string.h" - -#define CONFIG_YAFFS_CASE_INSENSITIVE -#define CONFIG_YAFFS_UNICODE - -#define YMALLOC(x) malloc(x) -#define YFREE(x) free(x) - - -#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -#define YALERT(s) YINFO(s) - -#include - -#define YPRINTF(x) RETAILMSG(1,x) - -// Always pass the sum compare to overcome the case insensitivity issue -#define yaffs_SumCompare(x,y) ((x) == (y)) - -#ifdef CONFIG_YAFFS_UNICODE -#define YCHAR WCHAR -#define YUCHAR WCHAR -#define _Y(a) L##a -#define yaffs_toupper(a) towupper(a) -#define yaffs_strcmp(a,b) _wcsicmp(a,b) -#define yaffs_strcpy(a,b) wcscpy(a,b) -#define yaffs_strncpy(a,b,c) wcsncpy(a,b,c) -#define yaffs_strlen(s) wcslen(s) -#define yaffs_sprintf swprintf -#else -#define YCHAR CHAR -#define YUCHAR UCHAR -#define _Y(a) a -#define yaffs_toupper(a) toupper(a) -#define yaffs_strcmp(a,b) _stricmp(a,b) -#define yaffs_strcpy(a,b) strcpy(a,b) -#define yaffs_strncpy(a,b,c) strncpy(a,b,c) -#define yaffs_strlen(s) strlen(s) -#define yaffs_sprintf sprintf -#endif - -#define YAFFS_LOSTNFOUND_NAME _Y("Lost Clusters") -#define YAFFS_LOSTNFOUND_PREFIX _Y("OBJ") - - -#define u_char unsigned char -#define loff_t int -#define S_IFDIR 04000 - -#define S_ISFIFO(x) 0 -#define S_ISCHR(x) 0 -#define S_ISBLK(x) 0 -#define S_ISSOCK(x) 0 - -extern unsigned yfsd_U32FileTimeNow(void); - -#define CURRENT_TIME yfsd_U32FileTimeNow() -#define YAFFS_ROOT_MODE FILE_ATTRIBUTE_ARCHIVE -#define YAFFS_LOSTNFOUND_MODE FILE_ATTRIBUTE_HIDDEN - - -#define TENDSTR L"\r\n" -#define TSTR(x) TEXT(x) -#define TOUT(x) RETAILMSG(1, x) - - -#elif defined __KERNEL__ - - - -// Linux kernel -#include "linux/kernel.h" -#include "linux/mm.h" -#include "linux/string.h" -#include "linux/slab.h" - - -#define YAFFS_LOSTNFOUND_NAME "lost+found" -#define YAFFS_LOSTNFOUND_PREFIX "obj" - -//#define YPRINTF(x) printk x -#define YMALLOC(x) kmalloc(x,GFP_KERNEL) -#define YFREE(x) kfree(x) - -#define YAFFS_ROOT_MODE 0666 -#define YAFFS_LOSTNFOUND_MODE 0666 - - -#define yaffs_SumCompare(x,y) ((x) == (y)) -#define YCHAR char -#define YUCHAR unsigned char -#define _Y(a) a -#define yaffs_toupper(a) toupper(a) -#define yaffs_strcmp(a,b) strcmp(a,b) -#define yaffs_strcpy(a,b) strcpy(a,b) -#define yaffs_strncpy(a,b,c) strncpy(a,b,c) -#define yaffs_strlen(s) strlen(s) -#define yaffs_sprintf sprintf - -#define TENDSTR "\n" -#define TSTR(x) KERN_DEBUG x -#define TOUT(p) printk p - - -#elif defined CONFIG_YAFFS_DIRECT - -// Direct interface - -#include "stdlib.h" -#include "stdio.h" -#include "string.h" - -#define YMALLOC(x) malloc(x) -#define YFREE(x) free(x) - - -//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -//#define YALERT(s) YINFO(s) - - -#define TENDSTR "\n" -#define TSTR(x) x -#define TOUT(p) printf p - - -#define YAFFS_LOSTNFOUND_NAME "lost+found" -#define YAFFS_LOSTNFOUND_PREFIX "obj" -//#define YPRINTF(x) printf x - -#include "yaffscfg.h" - -#define CURRENT_TIME yaffsfs_CurrentTime() -#define YAFFS_ROOT_MODE 0666 -#define YAFFS_LOSTNFOUND_MODE 0666 - -#define yaffs_SumCompare(x,y) ((x) == (y)) -#define YCHAR char -#define YUCHAR unsigned char -#define _Y(a) a -#define yaffs_toupper(a) toupper(a) -#define yaffs_strcmp(a,b) strcmp(a,b) -#define yaffs_strcpy(a,b) strcpy(a,b) -#define yaffs_strncpy(a,b,c) strncpy(a,b,c) -#define yaffs_strlen(s) strlen(s) -#define yaffs_sprintf sprintf - -#elif defined CONFIG_YAFFS_UTIL - -// Stuff for YAFFS utilities - -#include "stdlib.h" -#include "stdio.h" -#include "string.h" - -#define YMALLOC(x) malloc(x) -#define YFREE(x) free(x) - - -//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -//#define YALERT(s) YINFO(s) - - -#define TENDSTR "\n" -#define TSTR(x) x -#define TOUT(p) printf p - - -#define YAFFS_LOSTNFOUND_NAME "lost+found" -#define YAFFS_LOSTNFOUND_PREFIX "obj" -//#define YPRINTF(x) printf x - - -#define CURRENT_TIME 0 -#define YAFFS_ROOT_MODE 0666 -#define YAFFS_LOSTNFOUND_MODE 0666 - -#define yaffs_SumCompare(x,y) ((x) == (y)) -#define YCHAR char -#define YUCHAR unsigned char -#define _Y(a) a -#define yaffs_toupper(a) toupper(a) -#define yaffs_strcmp(a,b) strcmp(a,b) -#define yaffs_strcpy(a,b) strcpy(a,b) -#define yaffs_strncpy(a,b,c) strncpy(a,b,c) -#define yaffs_strlen(s) strlen(s) -#define yaffs_sprintf sprintf - -#else -// Should have specified a configuration type -#error Unknown configuration - -#endif - - -extern unsigned yaffs_traceMask; - -#define YAFFS_TRACE_ERROR 0x0001 -#define YAFFS_TRACE_OS 0x0002 -#define YAFFS_TRACE_ALLOCATE 0x0004 -#define YAFFS_TRACE_SCAN 0x0008 -#define YAFFS_TRACE_BAD_BLOCKS 0x0010 -#define YAFFS_TRACE_ERASE 0x0020 -#define YAFFS_TRACE_GC 0x0040 -#define YAFFS_TRACE_DELETION 0x0080 -#define YAFFS_TRACE_TRACING 0x0100 -#define YAFFS_TRACE_ALWAYS 0x0200 -#define YAFFS_TRACE_WRITE 0x0400 -#define YAFFS_TRACE_BUG 0x8000 - -#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) - -//#undef YINFO - - -//#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s)) -//#define YALERT(s) YINFO(s) -#ifdef CONFIG_YAFFS_WINCE -#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__)) -#else -#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__)) -#endif -#endif +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. + * yportenv.h: Portable services used by yaffs. This is done to allow + * simple migration from kernel space into app space for testing. + * + * Copyright (C) 2002 Aleph One Ltd. + * for Toby Churchill Ltd and Brightstar Engineering + * + * Created by Charles Manning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 as + * published by the Free Software Foundation. + * + * + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + * + * $Id: yportenv.h,v 1.2 2004-11-03 08:35:48 charles Exp $ + * + */ + +#ifndef __YPORTENV_H__ +#define __YPORTENV_H__ + + +#if defined CONFIG_YAFFS_WINCE + +// CONFIG_YAFFS_WINCE +#include "stdlib.h" +#include "stdio.h" +#include "string.h" + +#define Y_INLINE + +#define CONFIG_YAFFS_CASE_INSENSITIVE +#define CONFIG_YAFFS_UNICODE + +#define YMALLOC(x) malloc(x) +#define YFREE(x) free(x) + + +#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) +#define YALERT(s) YINFO(s) + +#include + +#define YPRINTF(x) RETAILMSG(1,x) + +// Always pass the sum compare to overcome the case insensitivity issue +#define yaffs_SumCompare(x,y) ((x) == (y)) + +#ifdef CONFIG_YAFFS_UNICODE +#define YCHAR WCHAR +#define YUCHAR WCHAR +#define _Y(a) L##a +#define yaffs_toupper(a) towupper(a) +#define yaffs_strcmp(a,b) _wcsicmp(a,b) +#define yaffs_strcpy(a,b) wcscpy(a,b) +#define yaffs_strncpy(a,b,c) wcsncpy(a,b,c) +#define yaffs_strlen(s) wcslen(s) +#define yaffs_sprintf swprintf +#else +#define YCHAR CHAR +#define YUCHAR UCHAR +#define _Y(a) a +#define yaffs_toupper(a) toupper(a) +#define yaffs_strcmp(a,b) _stricmp(a,b) +#define yaffs_strcpy(a,b) strcpy(a,b) +#define yaffs_strncpy(a,b,c) strncpy(a,b,c) +#define yaffs_strlen(s) strlen(s) +#define yaffs_sprintf sprintf +#endif + +#define YAFFS_LOSTNFOUND_NAME _Y("Lost Clusters") +#define YAFFS_LOSTNFOUND_PREFIX _Y("OBJ") + + +#define u_char unsigned char +#define loff_t int +#define S_IFDIR 04000 + +#define S_ISFIFO(x) 0 +#define S_ISCHR(x) 0 +#define S_ISBLK(x) 0 +#define S_ISSOCK(x) 0 + +extern unsigned yfsd_U32FileTimeNow(void); + +#define CURRENT_TIME yfsd_U32FileTimeNow() +#define YAFFS_ROOT_MODE FILE_ATTRIBUTE_ARCHIVE +#define YAFFS_LOSTNFOUND_MODE FILE_ATTRIBUTE_HIDDEN + + +#define TENDSTR L"\r\n" +#define TSTR(x) TEXT(x) +#define TOUT(x) RETAILMSG(1, x) + + +#elif defined __KERNEL__ + + + +// Linux kernel +#include "linux/kernel.h" +#include "linux/mm.h" +#include "linux/string.h" +#include "linux/slab.h" + +#define Y_INLINE + + +#define YAFFS_LOSTNFOUND_NAME "lost+found" +#define YAFFS_LOSTNFOUND_PREFIX "obj" + +//#define YPRINTF(x) printk x +#define YMALLOC(x) kmalloc(x,GFP_KERNEL) +#define YFREE(x) kfree(x) + +#define YAFFS_ROOT_MODE 0666 +#define YAFFS_LOSTNFOUND_MODE 0666 + + +#define yaffs_SumCompare(x,y) ((x) == (y)) +#define YCHAR char +#define YUCHAR unsigned char +#define _Y(a) a +#define yaffs_toupper(a) toupper(a) +#define yaffs_strcmp(a,b) strcmp(a,b) +#define yaffs_strcpy(a,b) strcpy(a,b) +#define yaffs_strncpy(a,b,c) strncpy(a,b,c) +#define yaffs_strlen(s) strlen(s) +#define yaffs_sprintf sprintf + +#define TENDSTR "\n" +#define TSTR(x) KERN_DEBUG x +#define TOUT(p) printk p + + +#elif defined CONFIG_YAFFS_DIRECT + +// Direct interface + +#include "stdlib.h" +#include "stdio.h" +#include "string.h" + +#define Y_INLINE + +#define YMALLOC(x) malloc(x) +#define YFREE(x) free(x) + + +//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) +//#define YALERT(s) YINFO(s) + + +#define TENDSTR "\n" +#define TSTR(x) x +#define TOUT(p) printf p + + +#define YAFFS_LOSTNFOUND_NAME "lost+found" +#define YAFFS_LOSTNFOUND_PREFIX "obj" +//#define YPRINTF(x) printf x + +#include "yaffscfg.h" + +#define CURRENT_TIME yaffsfs_CurrentTime() +#define YAFFS_ROOT_MODE 0666 +#define YAFFS_LOSTNFOUND_MODE 0666 + +#define yaffs_SumCompare(x,y) ((x) == (y)) +#define YCHAR char +#define YUCHAR unsigned char +#define _Y(a) a +#define yaffs_toupper(a) toupper(a) +#define yaffs_strcmp(a,b) strcmp(a,b) +#define yaffs_strcpy(a,b) strcpy(a,b) +#define yaffs_strncpy(a,b,c) strncpy(a,b,c) +#define yaffs_strlen(s) strlen(s) +#define yaffs_sprintf sprintf + +#elif defined CONFIG_YAFFS_UTIL + +// Stuff for YAFFS utilities + +#include "stdlib.h" +#include "stdio.h" +#include "string.h" + +#define YMALLOC(x) malloc(x) +#define YFREE(x) free(x) + +#define Y_INLINE + + +//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) +//#define YALERT(s) YINFO(s) + + +#define TENDSTR "\n" +#define TSTR(x) x +#define TOUT(p) printf p + + +#define YAFFS_LOSTNFOUND_NAME "lost+found" +#define YAFFS_LOSTNFOUND_PREFIX "obj" +//#define YPRINTF(x) printf x + + +#define CURRENT_TIME 0 +#define YAFFS_ROOT_MODE 0666 +#define YAFFS_LOSTNFOUND_MODE 0666 + +#define yaffs_SumCompare(x,y) ((x) == (y)) +#define YCHAR char +#define YUCHAR unsigned char +#define _Y(a) a +#define yaffs_toupper(a) toupper(a) +#define yaffs_strcmp(a,b) strcmp(a,b) +#define yaffs_strcpy(a,b) strcpy(a,b) +#define yaffs_strncpy(a,b,c) strncpy(a,b,c) +#define yaffs_strlen(s) strlen(s) +#define yaffs_sprintf sprintf + +#else +// Should have specified a configuration type +#error Unknown configuration + +#endif + + +extern unsigned yaffs_traceMask; + +#define YAFFS_TRACE_ERROR 0x0001 +#define YAFFS_TRACE_OS 0x0002 +#define YAFFS_TRACE_ALLOCATE 0x0004 +#define YAFFS_TRACE_SCAN 0x0008 +#define YAFFS_TRACE_BAD_BLOCKS 0x0010 +#define YAFFS_TRACE_ERASE 0x0020 +#define YAFFS_TRACE_GC 0x0040 +#define YAFFS_TRACE_DELETION 0x0080 +#define YAFFS_TRACE_TRACING 0x0100 +#define YAFFS_TRACE_ALWAYS 0x0200 +#define YAFFS_TRACE_WRITE 0x0400 +#define YAFFS_TRACE_BUFFERS 0x0800 +#define YAFFS_TRACE_NANDACCESS 0x1000 +#define YAFFS_TRACE_DELETE 0x2000 +#define YAFFS_TRACE_GC_DETAIL 0x4000 +#define YAFFS_TRACE_BUG 0x800000 + +#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) + +//#undef YINFO + + +//#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s)) +//#define YALERT(s) YINFO(s) +#ifdef CONFIG_YAFFS_WINCE +#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__)) +#else +#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__)) +#endif + +#ifndef YCHAR +#define YCHAR char +#endif + +#ifndef YUCHAR +#define YUCHAR unsigned char +#endif + +#endif