On 12/06/2010 10:20 AM, Charles Manning wrote: > On Friday 03 December 2010 09:00:18 Ryan Mallon wrote: >> On 12/01/2010 10:57 AM, Charles Manning wrote: >>> Signed-off-by: Charles Manning <cdhmanning@xxxxxxxxx> >>> --- >> >> <snip> >> >>> diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h >>> new file mode 100644 >>> index 0000000..8fd0da5 >>> --- /dev/null >>> +++ b/fs/yaffs2/yportenv.h >>> @@ -0,0 +1,91 @@ >>> +/* >>> + * YAFFS: Yet another Flash File System . A NAND-flash specific file >>> system. + * >>> + * Copyright (C) 2002-2010 Aleph One Ltd. >>> + * for Toby Churchill Ltd and Brightstar Engineering >>> + * >>> + * Created by Charles Manning <charles@xxxxxxxxxxxx> >>> + * >>> + * 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. >>> + */ >>> + >>> +#ifndef __YPORTENV_LINUX_H__ >>> +#define __YPORTENV_LINUX_H__ >>> + >>> +#include <linux/version.h> >>> +#include <linux/kernel.h> >>> +#include <linux/mm.h> >>> +#include <linux/sched.h> >>> +#include <linux/string.h> >>> +#include <linux/slab.h> >>> +#include <linux/vmalloc.h> >>> +#include <linux/xattr.h> >>> +#include <linux/list.h> >>> +#include <linux/types.h> >>> +#include <linux/fs.h> >>> +#include <linux/stat.h> >>> +#include <linux/sort.h> >>> +#include <linux/bitops.h> >>> + >>> +#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 yaffs_sort(base, n, sz, cmp_fn) sort(base, n, sz, cmp_fn, NULL) >>> + >>> +#define Y_INLINE __inline__ >>> + >>> +#define YAFFS_LOSTNFOUND_NAME "lost+found" >>> +#define YAFFS_LOSTNFOUND_PREFIX "obj" >>> + >>> +#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 YYIELD() schedule() >>> +#define Y_DUMP_STACK() dump_stack() >>> + >>> +#define YAFFS_ROOT_MODE 0755 >>> +#define YAFFS_LOSTNFOUND_MODE 0700 >>> + >>> +#define Y_CURRENT_TIME CURRENT_TIME.tv_sec >>> +#define Y_TIME_CONVERT(x) (x).tv_sec >>> + >>> +#define yaffs_sum_cmp(x, y) ((x) == (y)) >>> +#define yaffs_strcmp(a, b) strcmp(a, b) >> >> You should try and remove the wrappers for as many of these as possible. >> I know the wrappers are there for portability to other operating >> systems, but for mainlining in Linux it makes the code more complex. > > Thus far I have tried to keep all the code directly compilable for WinCE and > Linux. > > I did some investigation over the weekend and I am pretty sure that if I > preserve just a few of these macros, YCHAR in particular, I can eliminate > almost everything else and just run the code through a sed script to generate > the WiNCE version. Could YCHAR and YUCHAR be replaced by s8 and u8? ~Ryan -- Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St ryan@xxxxxxxxxxxxxxxx PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
