changeset 1836:9ad253729c53

* tests/fileio1.c: Start the test using cyg_user_start so that it can be used without the kernel. * tests/testfs.c (testfs_time): If we don't have a kernel return 0 as the time rather than the current time. 2004-11-14 Jani Monoses <jani@iv.ro> * src/devfs.cxx: Removed unneeded header files so the package can be compiled without the kernel.
author asl
date Sun, 14 Nov 2004 14:03:44 +0000
parents dca80ff444df
children c5816fa4e2ad
files packages/io/fileio/current/ChangeLog packages/io/fileio/current/src/devfs.cxx packages/io/fileio/current/tests/fileio1.c packages/io/fileio/current/tests/testfs.c
diffstat 4 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/fileio/current/ChangeLog
+++ b/packages/io/fileio/current/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-14  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* tests/fileio1.c: Start the test using cyg_user_start so that
+	it can be used without the kernel.	
+	* tests/testfs.c (testfs_time): If we don't have a kernel return 0
+	as the time rather than the current time.
+
+2004-11-14  Jani Monoses <jani@iv.ro>
+
+	* src/devfs.cxx: Removed unneeded header files so the package can
+	be compiled without the kernel.
+
 2004-10-13  David Brennan  <eCos@brennanhome.com>
 
 	* include/fileio.h: 
--- a/packages/io/fileio/current/src/devfs.cxx
+++ b/packages/io/fileio/current/src/devfs.cxx
@@ -56,10 +56,8 @@
 //==========================================================================
 
 #include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
 #include <pkgconf/io_fileio.h>
 
-#include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/infra/cyg_trac.h>        // tracing macros
 #include <cyg/infra/cyg_ass.h>         // assertion macros
 
--- a/packages/io/fileio/current/tests/fileio1.c
+++ b/packages/io/fileio/current/tests/fileio1.c
@@ -58,10 +58,8 @@
 //==========================================================================
 
 #include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
 #include <pkgconf/io_fileio.h>
 
-#include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/infra/cyg_trac.h>        // tracing macros
 #include <cyg/infra/cyg_ass.h>         // assertion macros
 
@@ -357,7 +355,7 @@ static void comparefiles( char *name2, c
 //==========================================================================
 // main
 
-int main( int argc, char **argv )
+int cyg_user_start(void)
 {
     int err;
 
--- a/packages/io/fileio/current/tests/testfs.c
+++ b/packages/io/fileio/current/tests/testfs.c
@@ -58,10 +58,8 @@
 //==========================================================================
 
 #include <pkgconf/hal.h>
-#include <pkgconf/kernel.h>
 #include <pkgconf/io_fileio.h>
 
-#include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/infra/cyg_trac.h>        // tracing macros
 #include <cyg/infra/cyg_ass.h>         // assertion macros
 
@@ -73,7 +71,6 @@
 
 #include <cyg/fileio/fileio.h>
 
-#include <cyg/kernel/kapi.h>
 #include <cyg/infra/diag.h>
 
 //==========================================================================
@@ -351,8 +348,11 @@ static int testfs_find( testfs_node *dir
 
 static time_t testfs_time(void)
 {
-    // FIXME: !!!!Temporary!!!!
+#ifdef CYGPKG_KERNEL
     return cyg_current_time();
+#else
+    return 0;
+#endif
 }
 
 // -------------------------------------------------------------------------