X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yportenv.h;h=e1f61f49fab59c2b85e64f49b65ebd0f7fbc36a3;hp=8a58ae21600bbce4e2c80f71aef9e00dedebd284;hb=f37d0b9ff0c87c1e22a5f708dbb4b455da7af59f;hpb=66ced3a339159f9fc2f928ca7e63240186ee89bd diff --git a/yportenv.h b/yportenv.h index 8a58ae2..e1f61f4 100644 --- a/yportenv.h +++ b/yportenv.h @@ -1,9 +1,7 @@ /* - * 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. + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. * - * Copyright (C) 2002 Aleph One Ltd. + * Copyright (C) 2002-2007 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -12,262 +10,157 @@ * 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" +#ifndef __YPORTENV_H__ +#define __YPORTENV_H__ -#define Y_INLINE +/* + * Define the MTD version in terms of Linux Kernel versions + * This allows yaffs to be used independantly of the kernel + * as well as with it. + */ -#define CONFIG_YAFFS_CASE_INSENSITIVE -#define CONFIG_YAFFS_UNICODE +#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) -#define YMALLOC(x) malloc(x) -#define YFREE(x) free(x) +#if defined CONFIG_YAFFS_WINCE +#include "ywinceenv.h" -#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -#define YALERT(s) YINFO(s) +#elif defined __KERNEL__ -#include +#include "moduleconfig.h" -#define YPRINTF(x) RETAILMSG(1,x) +/* Linux kernel */ -// Always pass the sum compare to overcome the case insensitivity issue -#define yaffs_SumCompare(x,y) ((x) == (y)) +#include +#define MTD_VERSION_CODE LINUX_VERSION_CODE -#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 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) +#include #endif +#include +#include +#include +#include +#include +#include -#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 YCHAR char +#define YUCHAR unsigned char +#define _Y(x) x +#define yaffs_strcat(a, b) strcat(a, b) +#define yaffs_strcpy(a, b) strcpy(a, b) +#define yaffs_strncpy(a, b, c) strncpy(a, b, c) +#define yaffs_strncmp(a, b, c) strncmp(a, b, c) +#define yaffs_strnlen(s,m) strnlen(s,m) +#define yaffs_sprintf sprintf +#define yaffs_toupper(a) toupper(a) +#define Y_INLINE 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 YPRINTF(x) printk x */ +#define YMALLOC(x) kmalloc(x, GFP_NOFS) #define YFREE(x) kfree(x) +#define YMALLOC_ALT(x) vmalloc(x) +#define YFREE_ALT(x) vfree(x) +#define YMALLOC_DMA(x) YMALLOC(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 +/* KR - added for use in scan so processes aren't blocked indefinitely. */ +#define YYIELD() schedule() +#define YAFFS_ROOT_MODE 0755 +#define YAFFS_LOSTNFOUND_MODE 0700 -#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) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +#define Y_CURRENT_TIME CURRENT_TIME.tv_sec +#define Y_TIME_CONVERT(x) (x).tv_sec +#else +#define Y_CURRENT_TIME CURRENT_TIME +#define Y_TIME_CONVERT(x) (x) +#endif +#define yaffs_SumCompare(x, y) ((x) == (y)) +#define yaffs_strcmp(a, b) strcmp(a, b) #define TENDSTR "\n" -#define TSTR(x) x -#define TOUT(p) printf p +#define TSTR(x) KERN_WARNING x +#define TCONT(x) x +#define TOUT(p) printk p +#define yaffs_trace(mask, fmt, args...) \ + do { if ((mask) & (yaffs_traceMask| YAFFS_TRACE_ALWAYS)) \ + printk(KERN_WARNING "yaffs: " fmt, ## args); \ + } while (0) -#define YAFFS_LOSTNFOUND_NAME "lost+found" -#define YAFFS_LOSTNFOUND_PREFIX "obj" -//#define YPRINTF(x) printf x +#define compile_time_assertion(assertion) \ + ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; }) -#include "yaffscfg.h" +#elif defined CONFIG_YAFFS_DIRECT -#define CURRENT_TIME yaffsfs_CurrentTime() -#define YAFFS_ROOT_MODE 0666 -#define YAFFS_LOSTNFOUND_MODE 0666 +#define MTD_VERSION_CODE MTD_VERSION(2, 6, 22) -#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 +/* Direct interface */ +#include "ydirectenv.h" #elif defined CONFIG_YAFFS_UTIL -// Stuff for YAFFS utilities +/* Stuff for YAFFS utilities */ #include "stdlib.h" #include "stdio.h" #include "string.h" +#include "devextras.h" + #define YMALLOC(x) malloc(x) #define YFREE(x) free(x) +#define YMALLOC_ALT(x) malloc(x) +#define YFREE_ALT(x) free(x) -#define Y_INLINE - +#define YCHAR char +#define YUCHAR unsigned char +#define _Y(x) x +#define yaffs_strcat(a, b) strcat(a, b) +#define yaffs_strcpy(a, b) strcpy(a, b) +#define yaffs_strncpy(a, b, c) strncpy(a, b, c) +#define yaffs_strnlen(s,m) strnlen(s,m) +#define yaffs_sprintf sprintf +#define yaffs_toupper(a) toupper(a) -//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -//#define YALERT(s) YINFO(s) +#define Y_INLINE 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 YPRINTF(x) printf x */ -#define CURRENT_TIME 0 -#define YAFFS_ROOT_MODE 0666 -#define YAFFS_LOSTNFOUND_MODE 0666 +#define YAFFS_ROOT_MODE 0755 +#define YAFFS_LOSTNFOUND_MODE 0700 -#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 yaffs_SumCompare(x, y) ((x) == (y)) +#define yaffs_strcmp(a, b) strcmp(a, b) #else -// Should have specified a configuration type +/* 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 +#ifndef YBUG +#define YBUG() do {T(YAFFS_TRACE_BUG, (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR), __LINE__)); } while (0) #endif #endif