From: Timothy Manning <tfhmanning@gmail.com>
Date: Wed, 20 Oct 2010 00:42:58 +0000 (+1300)
Subject: yaffs: Merge branch 'python_play'
X-Git-Tag: linux-mainline-rc-01~8
X-Git-Url: http://aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=7396445d7d0d13469b9505791114b9dc6b76ffe4

yaffs: Merge branch 'python_play'

Fix conflict
---

7396445d7d0d13469b9505791114b9dc6b76ffe4
diff --cc direct/python/yaffsfs.py
index 1d0c8ff,7347687..03583fd
--- a/direct/python/yaffsfs.py
+++ b/direct/python/yaffsfs.py
@@@ -240,11 -240,26 +240,26 @@@ yaffs_n_handles = ylib.yaffs_n_handle
  yaffs_n_handles.argtypes = [c_char_p]
  yaffs_n_handles.restype = c_int
  
 -#int yaffs_StartUp(void)
 -yaffs_StartUp = ylib.yaffs_StartUp
 -yaffs_StartUp.argtypes = []
 -yaffs_StartUp.restype = c_int
 +#int yaffs_start_up(void)
 +yaffs_start_up = ylib.yaffs_start_up
 +yaffs_start_up.argtypes = []
 +yaffs_start_up.restype = c_int
  
+ #int yaffs_set_trace(unsigned int tm) { return yaffs_traceMask=tm; }
+ yaffs_set_trace=ylib.yaffs_set_trace
+ yaffs_set_trace.argtypes=[c_uint]
+ yaffs_set_trace.restype=c_uint
+ 
+ #int yaffs_get_trace(void) { return yaffs_traceMask; }
+ yaffs_get_trace=ylib.yaffs_get_trace
+ yaffs_get_trace.argtypes=[]
+ yaffs_get_trace.restypes=c_uint
+ 
+ #int yaffs_get_error(void)
+ yaffs_get_error=ylib.yaffs_get_error
+ yaffs_get_error.argtypes=[]
+ yaffs_get_error.restypes=c_int
+ 
  yaffs_O_CREAT=ylib.yaffs_O_CREAT()
  yaffs_O_RDONLY=ylib.yaffs_O_RDONLY()
  yaffs_O_WRONLY=ylib.yaffs_O_WRONLY()
diff --cc direct/yaffsfs.c
index 0b236ff,83605c5..ea33223
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@@ -2330,7 -2326,12 +2330,12 @@@ int yaffs_n_handles(const YCHAR *path
  	return yaffsfs_CountHandles(obj);
  }
  
+ int yaffs_get_error(void)
+ {
+ 	return yaffsfs_GetLastError();
+ }
+ 
 -int yaffs_DumpDevStruct(const YCHAR *path)
 +int yaffs_dump_dev(const YCHAR *path)
  {
  #if 0
  	YCHAR *rest;
diff --cc direct/yaffsfs.h
index 5f47a2d,6dd2c94..e094959
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@@ -166,16 -166,19 +166,19 @@@ int yaffs_n_handles(const YCHAR *path)
  int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int shareMode) ;
  
  
 -struct yaffs_DeviceStruct;
 -void yaffs_AddDevice(struct yaffs_DeviceStruct *dev);
 +struct yaffs_dev_s;
 +void yaffs_add_device(struct yaffs_dev_s *dev);
  
 -int yaffs_StartUp(void);
 +int yaffs_start_up(void);
  
+ /* Function to get the last error */
+ int yaffs_get_error(void);
  
  /* Function only for debugging */
  void * yaffs_getdev(const YCHAR *path);
 -int yaffs_DumpDevStruct(const YCHAR *path);
 +int yaffs_dump_dev(const YCHAR *path);
  
+ 
  #endif