Full change over to ctypes

diff --git a/direct/python/Makefile b/direct/python/Makefile
index f5ca02c4d90dd8a4f946ecc26c22e7b0d69b0ec3..f9f42b80977cc626cdf00a1d2db4be6f6a28ed76 100644 (file)
--- a/direct/python/Makefile
+++ b/direct/python/Makefile
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
 #
 # NB Warning this Makefile does not include header dependencies.
 #

-# $Id: Makefile,v 1.3 2009-10-09 06:12:26 charles Exp $
+# $Id: Makefile,v 1.4 2009-10-12 23:05:49 charles Exp $

 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 


@@ -36,7 +36,6 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
                 yaffs_norif1.o  ynorsim.o
 
 
                 yaffs_norif1.o  ynorsim.o
 
 

-YAFFSSWIGOBJS  = $(COMMONTESTOBJS) yaffs_wrap.o yaffs_python_helper.o

 YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 
 YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
 
 


@@ -56,27 +55,12 @@ YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h y
 
 SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
 
 
 SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
 

-all: _yaffs.so libyaffsfs.so
+all:  libyaffsfs.so

 
 

-yaffs_wrap.c: yaffs.i yaffsfs_for_swig.h
-       swig -python yaffs.i
-
-yaffsfs_for_swig.h: yaffsfs.h
-       cat yaffsfs.h | \
-       sed -e "s/YCHAR/char/g" | \
-       sed -e "s/YUCHAR/unsigned char/g" | \
-       sed -e "s/void \*/char \*/g" | \
-       sed -e "s/loff_t/long long/g" | \
-       sed -e "s/off_t/long/g" | \
-       sed -e "s/struct yaffs_stat/struct yaffs_stat_struct/g" \
-       > $@

 
 $(YAFFSLIBOBJS): %.o: %.c
        gcc -c $(CFLAGS)   -o $@ $<
 
 
 $(YAFFSLIBOBJS): %.o: %.c
        gcc -c $(CFLAGS)   -o $@ $<
 

-yaffs_wrap.o:  %.o: %.c
-       gcc -c $(CFLAGS) -I/usr/include/python2.6/  -o $@ $<
-

 
 $(YAFFSSYMLINKS):
        ln -s ../../$@ $@
 
 $(YAFFSSYMLINKS):
        ln -s ../../$@ $@


@@ -86,9 +70,6 @@ $(YAFFSDIRECTSYMLINKS):
 
 
 
 
 
 

-_yaffs.so: $(SYMLINKS) yaffs_wrap.c $(YAFFSSWIGOBJS)
-       gcc -shared $(YAFFSSWIGOBJS) -o $@
-

 libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
        gcc -shared $(YAFFSLIBOBJS) -o $@
 
 libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
        gcc -shared $(YAFFSLIBOBJS) -o $@
 


@@ -96,8 +77,6 @@ libyaffsfs.so: $(SYMLINKS) $(YAFFSLIBOBJS)
 
 
 clean:
 
 
 clean:

-       rm -f _yaffs.so yaffs.py yaffs.pyc yaffs_wrap.c $(YAFFSLIBOBJS) yaffs_wrap.o core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)
-       rm -f *.c.*
-       rm -f yaffsfs_for_swig.h
+       rm -f  $(YAFFSLIBOBJS)  core $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS)

        rm -f libyaffsfs.so
 
        rm -f libyaffsfs.so
 

diff --git a/direct/python/README.txt b/direct/python/README.txt
index a6706e1329ad3b780466ac657f9f0cec3853d708..4dc517170c21d3bbce5127bd7285554e9fe590f6 100644 (file)
--- a/direct/python/README.txt
+++ b/direct/python/README.txt
@@ -15,13 +15,10 @@ $ python
 Python 2.6.2 (release26-maint, Apr 19 2009, 01:56:41) 
 [GCC 4.3.3] on linux2
 Type "help", "copyright", "credits" or "license" for more information.
 Python 2.6.2 (release26-maint, Apr 19 2009, 01:56:41) 
 [GCC 4.3.3] on linux2
 Type "help", "copyright", "credits" or "license" for more information.

->>> from ctypes import *
->>> cdll.LoadLibrary("./libyaffsfs.so")
-<CDLL './libyaffsfs.so', handle 9ed4178 at b7d418ac>
->>> y = CDLL("./libyaffsfs.so")
->>> y.yaffs_StartUp()
+>>> from yaffsfs import *
+>>> yaffs_StartUp()

 0
 0

->>> y.yaffs_mount("/yaffs2")
+>>> yaffs_mount("/yaffs2")

 yaffs: Mounting /yaffs2
 yaffs: yaffs_GutsInitialise()
 yaffs_ScanBackwards starts  intstartblk 1 intendblk 256...
 yaffs: Mounting /yaffs2
 yaffs: yaffs_GutsInitialise()
 yaffs_ScanBackwards starts  intstartblk 1 intendblk 256...


@@ -45,18 +42,16 @@ Dead 0 blocks
 yaffs: yaffs_GutsInitialise() done.
 
 0
 yaffs: yaffs_GutsInitialise() done.
 
 0

->>> y.yaffs_open("/yaffs2/xx",66,0666)
+>>> yaffs_open("/yaffs2/xx",66,0666)

 yaffs: Tnodes added
 Allocated block 1, seq  4097, 255 left
 0
 yaffs: Tnodes added
 Allocated block 1, seq  4097, 255 left
 0

->>> y.yaffs_write(0,"abc",3)
-3
->>> y.yaffs_lseek(0,0,0)
-0
+>>> yaffs_write(0,"abcdefg",5)
+5

 >>> b = create_string_buffer("",100)
 >>> b = create_string_buffer("",100)

->>> y.yaffs_read(0,b,100)
-3
->>> b.value
-'abc'
->>> 
-
+>>> yaffs_lseek(0,0,0)
+0
+>>> yaffs_read(0,b,100)
+5
+>>> print b.value
+abcde

diff --git a/direct/python/yaffs.i b/direct/python/yaffs.i
deleted file mode 100644 (file)
index a7135f8..0000000
--- a/direct/python/yaffs.i
+++ /dev/null
@@ -1,8 +0,0 @@
-%module yaffs
-%{
-#include "yaffsfs_for_swig.h"
-void yaffs_print_constants(void);
-%}
-
-%include "yaffsfs_for_swig.h"
-void yaffs_print_constants(void);

diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c
index aa63d5e541d31af32701a542d7fcbdea59bf6012..cbb434c880b30ef8ca75e71a8b342e0b9b77eea7 100644 (file)
--- a/direct/python/yaffs_python_helper.c
+++ b/direct/python/yaffs_python_helper.c
@@ -34,6 +34,7 @@ int yaffs_print_constants(void)
        printf( "O_RDWR.........%d\n",O_RDWR);
        printf( "O_TRUNC........%d\n",O_TRUNC);
 
        printf( "O_RDWR.........%d\n",O_RDWR);
        printf( "O_TRUNC........%d\n",O_TRUNC);
 

+       printf( "sizeof(off_t)..%d\n",sizeof(off_t)); 

        return 0;
 }
 
        return 0;
 }
 

diff --git a/direct/python/yaffsfs.py b/direct/python/yaffsfs.py
new file mode 100644 (file)
index 0000000..590da21
--- /dev/null
+++ b/direct/python/yaffsfs.py
@@ -0,0 +1,222 @@
+from ctypes import *
+cdll.LoadLibrary("./libyaffsfs.so")
+ylib = CDLL("./libyaffsfs.so")
+
+#int yaffs_open(const YCHAR *path, int oflag, int mode) ;
+yaffs_open = ylib.yaffs_open
+yaffs_open.argtypes = [ c_char_p, c_int, c_int]
+yaffs_open.restype = c_int
+
+#int yaffs_close(int fd) ;
+yaffs_close = ylib.yaffs_close
+yaffs_close.argtypes = [ c_int]
+yaffs_close.restype = c_int
+
+#int yaffs_fsync(int fd) ;
+yaffs_fsync = ylib.yaffs_fsync
+yaffs_fsync.argtypes = [c_int]
+yaffs_fsync.restype = c_int
+
+#int yaffs_fdatasync(int fd) ;
+yaffs_fdatasync = ylib.yaffs_fdatasync
+yaffs_fdatasync.argtypes = [c_int]
+yaffs_fdatasync.restype = c_int
+
+#int yaffs_flush(int fd) ; /* same as yaffs_fsync() */
+yaffs_flush = ylib.yaffs_flush
+yaffs_flush.argtypes = [c_int]
+yaffs_flush.restype = c_int
+
+#int yaffs_access(const YCHAR *path, int amode);
+yaffs_access=ylib.yaffs_access
+yaffs_access.argtypes= [c_char_p,c_int]
+yaffs_access.restype = c_int
+
+#int yaffs_dup(int fd);
+yaffs_dup = ylib.yaffs_dup
+yaffs_dup.argtypes = [c_int]
+yaffs_dup.restype = c_int
+
+#int yaffs_read(int fd, void *buf, unsigned int nbyte) ;
+yaffs_read=ylib.yaffs_read
+yaffs_read.argtypes=[c_int,c_char_p,c_int]
+yaffs_read.restype = c_int
+
+#int yaffs_write(int fd, const void *buf, unsigned int nbyte) ;
+yaffs_write=ylib.yaffs_write
+yaffs_write.argtypes=[c_int,c_char_p,c_int]
+yaffs_write.restype = c_int
+
+#int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset);
+yaffs_pread=ylib.yaffs_pread
+yaffs_pread.argtypes=[c_int,c_char_p,c_int,c_int]
+yaffs_pread.restype = c_int
+
+#int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offset);
+yaffs_pwrite=ylib.yaffs_pwrite
+yaffs_pwrite.argtypes=[c_int,c_char_p,c_int,c_int]
+yaffs_pwrite.restype = c_int
+
+# off_t = 4 byte int
+#off_t yaffs_lseek(int fd, off_t offset, int whence) ;
+yaffs_lseek=ylib.yaffs_lseek
+yaffs_lseek.argtypes= [c_int, c_int, c_int]
+yaffs_lseek.restype= c_int
+
+#int yaffs_truncate(const YCHAR *path, off_t newSize);
+yaffs_truncate=ylib.yaffs_truncate
+yaffs_truncate.argtypes = [c_char_p,c_int]
+yaffs_truncate.restype = c_int
+
+#int yaffs_ftruncate(int fd, off_t newSize);
+yaffs_ftruncate = ylib.yaffs_ftruncate
+yaffs_truncate.argtypes = [c_int,c_int]
+yaffs_truncate.restype = c_int
+
+#int yaffs_unlink(const YCHAR *path) ;
+yaffs_unlink=ylib.yaffs_unlink
+yaffs_unlink.argtypes = [c_char_p]
+yaffs_unlink.restype = c_int
+
+#int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath) ;
+yaffs_rename= ylib.yaffs_rename
+yaffs_rename.argtypes=[c_char_p, c_char_p]
+yaffs_rename.restype = c_int
+
+class yaffs_stat_struct(Structure):
+    _fields_ = [
+        ("st_dev", c_int),
+        ("st_ino", c_int),
+        ("st_mode", c_int),
+        ("st_nlink", c_int),
+        ("st_uid", c_int),
+        ("st_gid", c_int),
+        ("st_rdev", c_int),
+        ("st_size", c_int),
+        ("st_blksize", c_int),
+        ("st_blocks", c_int),
+        ("yst_atime", c_int),
+        ("yst_mtime", c_int),
+        ("yst_ctime", c_int)]
+
+#int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf) ;
+yaffs_stat = ylib.yaffs_stat
+yaffs_stat.argtypes=[c_char_p,POINTER(yaffs_stat_struct)]
+yaffs_stat.restype=c_int
+
+#int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf) ;
+yaffs_lstat = ylib.yaffs_lstat
+yaffs_lstat.argtypes=[c_char_p,POINTER(yaffs_stat_struct)]
+yaffs_lstat.restype=c_int
+
+#int yaffs_fstat(int fd, struct yaffs_stat *buf) ;
+yaffs_fstat = ylib.yaffs_fstat
+yaffs_fstat.argtypes=[c_int,POINTER(yaffs_stat_struct)]
+yaffs_fstat.restype=c_int
+
+
+#int yaffs_chmod(const YCHAR *path, mode_t mode);
+yaffs_chmod = ylib.yaffs_chmod
+yaffs_chmod.argtypes = [c_char_p, c_int]
+yaffs_chmod.restype = c_int
+
+#int yaffs_fchmod(int fd, mode_t mode); 
+yaffs_fchmod = ylib.yaffs_fchmod
+yaffs_fchmod.argtypes = [c_int, c_int]
+yaffs_fchmod.restype = c_int
+
+#int yaffs_mkdir(const YCHAR *path, mode_t mode) ;
+yaffs_mkdir = ylib.yaffs_mkdir
+yaffs_mkdir.argtypes = [c_char_p, c_int]
+yaffs_mkdir.restype = c_int
+
+#int yaffs_rmdir(const YCHAR *path) ;
+yaffs_rmdir = ylib.yaffs_rmdir
+yaffs_rmdir.argtypes = [c_char_p]
+yaffs_rmdir.restype = c_int
+
+class yaffs_dirent_struct(Structure):
+    _fields_ = [
+        ("d_ino", c_int),
+        ("d_off", c_int),
+        ("d_reclen", c_short),
+        ("d_type", c_char),
+        ("d_name", c_char * 257),
+        ("d_dont_use", c_int)]
+
+#yaffs_DIR *yaffs_opendir(const YCHAR *dirname) ;
+yaffs_opendir = ylib.yaffs_opendir
+yaffs_opendir.argtypes = [c_char_p]
+yaffs_opendir.restype = c_int
+
+#struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp) ;
+yaffs_readdir= ylib.yaffs_readdir
+yaffs_readdir.argtypes=[c_int]
+yaffs_readdir.restype=POINTER(yaffs_dirent_struct)
+
+#void yaffs_rewinddir(yaffs_DIR *dirp) ;
+yaffs_rewinddir = ylib.yaffs_rewinddir
+yaffs_rewinddir.argtypes = [c_int]
+yaffs_rewinddir.restype = c_int ###### Should be void
+
+#int yaffs_closedir(yaffs_DIR *dirp) ;
+yaffs_closedir = ylib.yaffs_closedir
+yaffs_closedir.argtypes = [c_int]
+yaffs_closedir.restype = c_int
+
+
+#int yaffs_mount(const YCHAR *path) ;
+yaffs_mount = ylib.yaffs_mount
+yaffs_mount.argtypes = [c_char_p]
+yaffs_mount.restype = c_int
+
+#int yaffs_unmount(const YCHAR *path) ;
+yaffs_unmount = ylib.yaffs_unmount
+yaffs_unmount.argtypes = [c_char_p]
+yaffs_unmount.restype = c_int
+
+#int yaffs_sync(const YCHAR *path) ;
+yaffs_sync = ylib.yaffs_sync
+yaffs_sync.argtypes = [c_char_p]
+yaffs_sync.restype = c_int
+
+#int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath);
+yaffs_symlink= ylib.yaffs_symlink
+yaffs_symlink.argtypes= [c_char_p, c_char_p]
+yaffs_symlink.restype = c_int
+
+#int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz); 
+yaffs_readlink = ylib.yaffs_readlink
+yaffs_readlink.argtypes = [c_char_p, c_char_p, c_int]
+yaffs_readlink.restype = c_int
+
+#int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath); 
+yaffs_link = ylib.yaffs_link
+yaffs_link.argtypes = [c_char_p, c_char_p]
+yaffs_link.restype = c_int
+
+#int yaffs_mknod(const YCHAR *pathname, mode_t mode, dev_t dev);
+yaffs_mknod = ylib.yaffs_mknod
+yaffs_mknod.argtypes = [c_char_p, c_int, c_int]
+yaffs_mknod.restype = c_int
+
+#loff_t yaffs_freespace(const YCHAR *path);
+yaffs_freespace = ylib.yaffs_freespace
+yaffs_freespace.argtypes = [c_char_p]
+yaffs_freespace.restype = c_longlong
+
+#loff_t yaffs_totalspace(const YCHAR *path);
+yaffs_totalspace = ylib.yaffs_totalspace
+yaffs_totalspace.argtypes = [c_char_p]
+yaffs_totalspace.restype = c_longlong
+
+#int yaffs_inodecount(const YCHAR *path);
+yaffs_inodecount = ylib.yaffs_inodecount
+yaffs_inodecount.argtypes = [c_char_p]
+yaffs_inodecount.restype = c_int
+
+#int yaffs_StartUp(void)
+yaffs_StartUp = ylib.yaffs_StartUp
+yaffs_StartUp.argtypes = []
+yaffs_StartUp.restype = c_int
+