From 3c13afb51057896ebc8ae1968b616d58275690d5 Mon Sep 17 00:00:00 2001 From: Timothy Manning Date: Tue, 26 Oct 2010 12:17:53 +1300 Subject: [PATCH] yaffs Normalized headers for release branch. Signed-off-by: Timothy Manning --- direct/basic-test/ynorsim.c | 13 ++++++++++++- direct/basic-test/ynorsim.h | 14 ++++++++++++++ direct/basic-test/yramsim.c | 17 ++++++++++++++++- direct/python/examples.py | 14 ++++++++++++++ direct/python/yaffs_python_helper.c | 1 - direct/python/yaffsfs.py | 13 +++++++++++++ direct/tests/fuzzer.c | 4 +++- direct/tests/nor_stress.h | 5 +++-- direct/yaffs_nandif.c | 2 +- direct/yaffs_nandif.h | 2 +- linux-tests/xattrtest.c | 15 +++++++++++++++ mtdemul/nandemul2k.c | 2 +- patches/yaffs_mtdif2.c | 2 +- utils/mkyaffs2image.c | 2 +- utils/mkyaffsimage.c | 2 +- yaffs_allocator.c | 7 +++---- yaffs_bitmap.h | 6 ++++-- yaffs_guts.c | 1 + yaffs_linux_allocator.c | 4 +++- yaffs_mtdif1.c | 3 ++- yaffs_nameval.h | 1 + yaffs_verify.h | 6 ++++-- yaffs_yaffs1.c | 1 + yaffs_yaffs2.h | 6 ++++-- 24 files changed, 119 insertions(+), 24 deletions(-) diff --git a/direct/basic-test/ynorsim.c b/direct/basic-test/ynorsim.c index 0c691a6..f190b6b 100644 --- a/direct/basic-test/ynorsim.c +++ b/direct/basic-test/ynorsim.c @@ -1,4 +1,15 @@ - +/* + * 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 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ #include "ynorsim.h" diff --git a/direct/basic-test/ynorsim.h b/direct/basic-test/ynorsim.h index 2c70ad9..12f2fdc 100644 --- a/direct/basic-test/ynorsim.h +++ b/direct/basic-test/ynorsim.h @@ -1,3 +1,17 @@ +/* + * 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 + * + * 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 __Y_NORSIM_H__ #define __Y_NORSIM_H__ diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c index caa1aac..6c80ef9 100644 --- a/direct/basic-test/yramsim.c +++ b/direct/basic-test/yramsim.c @@ -1,4 +1,19 @@ -// NAND Simulator for testing YAFFS +/* + * 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 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * NAND Simulator for testing YAFFS + */ #include diff --git a/direct/python/examples.py b/direct/python/examples.py index 6b0c045..51835da 100644 --- a/direct/python/examples.py +++ b/direct/python/examples.py @@ -1,3 +1,17 @@ +## +## 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 +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License version 2 as +## published by the Free Software Foundation. +## + + from yaffsfs import * def yaffs_ls(dname): diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c index 425bcda..e9e04f6 100644 --- a/direct/python/yaffs_python_helper.c +++ b/direct/python/yaffs_python_helper.c @@ -1,4 +1,3 @@ - /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * diff --git a/direct/python/yaffsfs.py b/direct/python/yaffsfs.py index 4d0e5db..2b52466 100644 --- a/direct/python/yaffsfs.py +++ b/direct/python/yaffsfs.py @@ -1,3 +1,16 @@ +## +## 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 +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License version 2 as +## published by the Free Software Foundation. +## + from ctypes import * cdll.LoadLibrary("./libyaffsfs.so") ylib = CDLL("./libyaffsfs.so") diff --git a/direct/tests/fuzzer.c b/direct/tests/fuzzer.c index 64d307f..2eedbfa 100644 --- a/direct/tests/fuzzer.c +++ b/direct/tests/fuzzer.c @@ -9,7 +9,9 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * + */ + +/* * Fuzzer to fuzz a file */ diff --git a/direct/tests/nor_stress.h b/direct/tests/nor_stress.h index 7ebef78..69c335d 100644 --- a/direct/tests/nor_stress.h +++ b/direct/tests/nor_stress.h @@ -1,5 +1,5 @@ /* - * YAFFS: Yet another FFS. A NAND-flash specific file system. + * 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 @@ -7,9 +7,10 @@ * Created by Charles Manning * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * 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 __NOR_STRESS_H__ diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c index 26d4f69..a428949 100644 --- a/direct/yaffs_nandif.c +++ b/direct/yaffs_nandif.c @@ -1,7 +1,7 @@ /* * 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 diff --git a/direct/yaffs_nandif.h b/direct/yaffs_nandif.h index cf4562c..9549824 100644 --- a/direct/yaffs_nandif.h +++ b/direct/yaffs_nandif.h @@ -1,7 +1,7 @@ /* * 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 diff --git a/linux-tests/xattrtest.c b/linux-tests/xattrtest.c index 14df34a..d1e5cf0 100644 --- a/linux-tests/xattrtest.c +++ b/linux-tests/xattrtest.c @@ -1,3 +1,18 @@ +/* + * 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 + * + * 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. + */ + #include #include #include diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c index 7efa8d4..69c7b95 100644 --- a/mtdemul/nandemul2k.c +++ b/mtdemul/nandemul2k.c @@ -1,7 +1,7 @@ /* * 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 diff --git a/patches/yaffs_mtdif2.c b/patches/yaffs_mtdif2.c index 8f73ac4..85be701 100644 --- a/patches/yaffs_mtdif2.c +++ b/patches/yaffs_mtdif2.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet another FFS. A NAND-flash specific file system. * - * Copyright (C) 2002 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c index b5f9606..3548681 100644 --- a/utils/mkyaffs2image.c +++ b/utils/mkyaffs2image.c @@ -1,7 +1,7 @@ /* * 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 diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c index e8434e8..dcf7706 100644 --- a/utils/mkyaffsimage.c +++ b/utils/mkyaffsimage.c @@ -1,7 +1,7 @@ /* * 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 diff --git a/yaffs_allocator.c b/yaffs_allocator.c index ab44bc7..a284439 100644 --- a/yaffs_allocator.c +++ b/yaffs_allocator.c @@ -1,5 +1,5 @@ /* - * 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-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -7,13 +7,12 @@ * 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 + * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * - * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. */ + #include "yaffs_allocator.h" #include "yaffs_guts.h" #include "yaffs_trace.h" diff --git a/yaffs_bitmap.h b/yaffs_bitmap.h index a0ad130..00cca2c 100644 --- a/yaffs_bitmap.h +++ b/yaffs_bitmap.h @@ -1,5 +1,5 @@ /* - * 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-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -7,8 +7,10 @@ * Created by Charles Manning * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * 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. */ /* diff --git a/yaffs_guts.c b/yaffs_guts.c index 7e97a5f..ebe7e77 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -10,6 +10,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include "yportenv.h" #include "yaffs_trace.h" diff --git a/yaffs_linux_allocator.c b/yaffs_linux_allocator.c index d4205fa..e91782a 100644 --- a/yaffs_linux_allocator.c +++ b/yaffs_linux_allocator.c @@ -11,7 +11,9 @@ * published by the Free Software Foundation. * * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. - * + */ + +/* * Note: Tis code is currently unused. Being checked in in case it becomes useful. */ diff --git a/yaffs_mtdif1.c b/yaffs_mtdif1.c index b14a254..3e2a10a 100644 --- a/yaffs_mtdif1.c +++ b/yaffs_mtdif1.c @@ -1,10 +1,11 @@ /* * YAFFS: Yet another FFS. A NAND-flash specific file system. - * yaffs_mtdif1.c NAND mtd interface functions for small-page NAND. * * Copyright (C) 2002-2010 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 General Public License version 2 as * published by the Free Software Foundation. diff --git a/yaffs_nameval.h b/yaffs_nameval.h index 4255f3b..bd80859 100644 --- a/yaffs_nameval.h +++ b/yaffs_nameval.h @@ -12,6 +12,7 @@ * * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. */ + #ifndef __NAMEVAL_H__ #define __NAMEVAL_H__ diff --git a/yaffs_verify.h b/yaffs_verify.h index 8a6f751..3dbcefd 100644 --- a/yaffs_verify.h +++ b/yaffs_verify.h @@ -1,5 +1,5 @@ /* - * 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-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -7,8 +7,10 @@ * Created by Charles Manning * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * 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 __YAFFS_VERIFY_H__ diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c index 78cc819..642fd5a 100644 --- a/yaffs_yaffs1.c +++ b/yaffs_yaffs1.c @@ -10,6 +10,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include "yaffs_yaffs1.h" #include "yportenv.h" #include "yaffs_trace.h" diff --git a/yaffs_yaffs2.h b/yaffs_yaffs2.h index 67dc8f1..08ba363 100644 --- a/yaffs_yaffs2.h +++ b/yaffs_yaffs2.h @@ -1,5 +1,5 @@ /* - * 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-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -7,8 +7,10 @@ * Created by Charles Manning * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * 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 __YAFFS_YAFFS2_H__ -- 2.30.2