mtd/fs/jffs2/ecos/tests fileio1.c,1.1,1.2 romfileio1.c,1.1,1.2
David Woodhouse
dwmw2 at infradead.org
Wed Jan 22 13:08:15 EST 2003
Update of /home/cvs/mtd/fs/jffs2/ecos/tests
In directory phoenix.infradead.org:/tmp/cvs-serv2413
Modified Files:
fileio1.c romfileio1.c
Log Message:
Pull in latest test code from eCos tree
Index: fileio1.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/tests/fileio1.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fileio1.c 11 Jul 2002 10:55:30 -0000 1.1
+++ fileio1.c 22 Jan 2003 18:08:12 -0000 1.2
@@ -5,29 +5,38 @@
// Test fileio system
//
//==========================================================================
-//####COPYRIGHTBEGIN####
-//
-// -------------------------------------------
-// The contents of this file are subject to the Red Hat eCos Public License
-// Version 1.1 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at
-// http://www.redhat.com/
-//
-// Software distributed under the License is distributed on an "AS IS"
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-// License for the specific language governing rights and limitations under
-// the License.
-//
-// The Original Code is eCos - Embedded Configurable Operating System,
-// released September 30, 1998.
-//
-// The Initial Developer of the Original Code is Red Hat.
-// Portions created by Red Hat are
-// Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
-// All Rights Reserved.
-// -------------------------------------------
-//
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
Index: romfileio1.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/tests/romfileio1.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- romfileio1.c 11 Jul 2002 10:55:30 -0000 1.1
+++ romfileio1.c 22 Jan 2003 18:08:12 -0000 1.2
@@ -5,29 +5,38 @@
// Test fileio system
//
//==========================================================================
-//####COPYRIGHTBEGIN####
-//
-// -------------------------------------------
-// The contents of this file are subject to the Red Hat eCos Public License
-// Version 1.1 (the "License"); you may not use this file except in
-// compliance with the License. You may obtain a copy of the License at
-// http://www.redhat.com/
-//
-// Software distributed under the License is distributed on an "AS IS"
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-// License for the specific language governing rights and limitations under
-// the License.
-//
-// The Original Code is eCos - Embedded Configurable Operating System,
-// released September 30, 1998.
-//
-// The Initial Developer of the Original Code is Red Hat.
-// Portions created by Red Hat are
-// Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
-// All Rights Reserved.
-// -------------------------------------------
-//
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
//==========================================================================
//#####DESCRIPTIONBEGIN####
//
@@ -49,6 +58,7 @@
#include <cyg/kernel/ktypes.h> // base kernel types
#include <cyg/infra/cyg_trac.h> // tracing macros
#include <cyg/infra/cyg_ass.h> // assertion macros
+#include <cyg/io/flash.h>
#include <unistd.h>
#include <fcntl.h>
@@ -268,14 +278,15 @@
int main( int argc, char **argv )
{
int err;
- char address[16];
+ // char address[16];
CYG_TEST_INIT();
// --------------------------------------------------------------
- err = mount( "", "/", "jffs2" );
-
+ err = mount( CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1, "/", "jffs2" );
+ if ( err != ENOERR ) SHOW_RESULT( chdir, err );
+
diag_printf("<INFO>: JFFS2 root follows\n");
diag_printf("<INFO>: Note that dev cannot be stat()ed\n");
listdir( "/", true );
@@ -306,7 +317,7 @@
diag_printf("<INFO>: Mount JFFS2 again onto /mnt\n");
//sprintf( address, "%p", (void*)CYGNUM_FS_JFFS2_BASE_ADDRESS );
- err = mount( "", "/mnt", "jffs2" );
+ err = mount( CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1, "/mnt", "jffs2" );
if( err < 0 ) SHOW_RESULT( mount, err );
comparefiles( "/etc/passwd", "/mnt/etc/passwd" );
More information about the linux-mtd-cvs
mailing list