X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yportenv.h;h=1fc2272f8fb1c8a6aacc47e20f35d5e28f58c232;hp=b5e043423e14277d53ae0d662c1fdf559db91c1c;hb=84699e12e914cb78ae3a1da48c99ed679b934153;hpb=9f361d87ca8c3d331ed1a4ffea53dd9a8d55ee88 diff --git a/yportenv.h b/yportenv.h index b5e0434..1fc2272 100644 --- a/yportenv.h +++ b/yportenv.h @@ -15,23 +15,20 @@ * * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. * - * $Id: yportenv.h,v 1.6 2005-07-31 00:26:57 charles Exp $ + * $Id: yportenv.h,v 1.7 2005-08-11 02:33:03 marty Exp $ * */ - + #ifndef __YPORTENV_H__ #define __YPORTENV_H__ - #if defined CONFIG_YAFFS_WINCE #include "ywinceenv.h" #elif defined __KERNEL__ - - -// Linux kernel +/* Linux kernel */ #include #include #include @@ -53,7 +50,7 @@ #define YAFFS_LOSTNFOUND_NAME "lost+found" #define YAFFS_LOSTNFOUND_PREFIX "obj" -//#define YPRINTF(x) printk x +/* #define YPRINTF(x) printk x */ #define YMALLOC(x) kmalloc(x,GFP_KERNEL) #define YFREE(x) kfree(x) @@ -75,15 +72,14 @@ #define TSTR(x) KERN_WARNING x #define TOUT(p) printk p - #elif defined CONFIG_YAFFS_DIRECT -// Direct interface +/* Direct interface */ #include "ydirectenv.h" #elif defined CONFIG_YAFFS_UTIL -// Stuff for YAFFS utilities +/* Stuff for YAFFS utilities */ #include "stdlib.h" #include "stdio.h" @@ -94,7 +90,6 @@ #define YMALLOC(x) malloc(x) #define YFREE(x) free(x) - #define YCHAR char #define YUCHAR unsigned char #define _Y(x) x @@ -106,19 +101,16 @@ #define Y_INLINE inline -//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) -//#define YALERT(s) YINFO(s) - +/* #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 YAFFS_ROOT_MODE 0666 #define YAFFS_LOSTNFOUND_MODE 0666 @@ -127,11 +119,10 @@ #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 - +#endif extern unsigned yaffs_traceMask; @@ -153,13 +144,10 @@ extern unsigned yaffs_traceMask; #define YAFFS_TRACE_ALWAYS 0x40000000 #define YAFFS_TRACE_BUG 0x80000000 -#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) - +#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) #ifndef CONFIG_YAFFS_WINCE #define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__)) #endif #endif - -