Commit yaboot 1.3.4-pre1

[yaboot.git] / include / fs.h

diff --git a/include/fs.h b/include/fs.h
index 3ec59281bfbbb76ed65c7d2a21ad38eae441a7ed..647c37a02d412ab3c13961a962a06d69d79f8a07 100644 (file)
--- a/include/fs.h
+++ b/include/fs.h
@@ -24,6 +24,8 @@
 #include "partition.h"
 #include "file.h"
 
+int fserrorno;
+
 struct fs_t {
        const char* name;
 
@@ -45,26 +47,33 @@ struct fs_t {
 extern const struct fs_t *fs_of;
 extern const struct fs_t *fs_of_netboot;
 
-const struct fs_t *fs_open( struct boot_file_t *file, const char *dev_name,
-                            struct partition_t *part, const char *file_name );
+const struct fs_t *fs_open(struct boot_file_t *file, const char *dev_name,
+                         struct partition_t *part, const char *file_name);
 
 #if DEBUG
-# define DEBUG_ENTER prom_printf( "--> %s\n", __PRETTY_FUNCTION__ );
+# define DEBUG_ENTER prom_printf( "--> %s\n", __PRETTY_FUNCTION__ )
 # define DEBUG_LEAVE(str) \
-    prom_printf( "<-- %s - %s\n", __PRETTY_FUNCTION__, #str );
+    prom_printf( "<-- %s - %s\n", __PRETTY_FUNCTION__, #str )
+# define DEBUG_LEAVE_F(args...)\
+{\
+    prom_printf( "<-- %s - %d\n", __PRETTY_FUNCTION__, ## args );\
+}
 # define DEBUG_F(fmt, args...)\
 {\
     prom_printf( "    %s - ", __PRETTY_FUNCTION__ );\
     prom_printf( fmt, ## args );\
 }
-# define DEBUG_OPEN DEBUG_F( "dev=%s, part=0x%08lx (%d), file_name=%s\n",\
+# define DEBUG_OPEN DEBUG_F( "dev=%s, part=0x%p (%d), file_name=%s\n",\
                              dev_name, part, part ? part->part_number : -1,\
-                             file_name);
+                             file_name)
+# define DEBUG_SLEEP prom_sleep(3)
 #else
 #define DEBUG_ENTER
 #define DEBUG_LEAVE(x)
+#define DEBUG_LEAVE_F(args...)
 #define DEBUG_F(fmt, args...)
 #define DEBUG_OPEN
+#define DEBUG_SLEEP
 #endif
 
 #endif