# HG changeset patch
# User Mike Kinghan <mikek@symbian.org>
# Date 1290184553 0
# Node ID c1a52682bd520da7e1e3209d3c82e7fc77e4f78d
# Parent  0a4b67281c4832d3d24eff668275525e68bf3b53# Parent  aa939c1eee2f1ec4d3bfd7b65d6aeb763791917f
merge with GCC_SURGE tip

diff -r aa939c1eee2f -r c1a52682bd52 symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_nvmemorydevice.py
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_nvmemorydevice.py	Fri Nov 19 16:17:17 2010 +0000
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_nvmemorydevice.py	Fri Nov 19 16:35:53 2010 +0000
@@ -202,9 +202,9 @@
                 sys.exit( error_msg )
             else:
                 if( self.transaction_direction == self.NVMEM_TRANSACTION_READ ):
-                    self.nvmemlib.nvmem_read(  self.obj, self.nvmemory_sharedmemory_host_address, self.nvmemhandle, self.transaction_offset, self.transaction_size )
+                    self.nvmemlib.nvmem_read(  self.obj, ctypes.c_void_p(self.nvmemory_sharedmemory_host_address), self.nvmemhandle, self.transaction_offset, self.transaction_size )
                 elif( self.transaction_direction == self.NVMEM_TRANSACTION_WRITE ):
-                    self.nvmemlib.nvmem_write(  self.obj, self.nvmemory_sharedmemory_host_address, self.nvmemhandle, self.transaction_offset, self.transaction_size )
+                    self.nvmemlib.nvmem_write(  self.obj, ctypes.c_void_p(self.nvmemory_sharedmemory_host_address), self.nvmemhandle, self.transaction_offset, self.transaction_size )
                 else:
                     error_msg = "syborg_nvmemorydevice: Transaction direction not set!" 
                     sys.exit( error_msg )
diff -r aa939c1eee2f -r c1a52682bd52 symbian-qemu-0.9.1-12/qemu-symbian-svp/python-plugin.c
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/python-plugin.c	Fri Nov 19 16:17:17 2010 +0000
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/python-plugin.c	Fri Nov 19 16:35:53 2010 +0000
@@ -158,7 +158,7 @@
 	int ret = -1;
 	int region_index = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "ll", kwlist,
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "ii", kwlist,
                                      &base, &size ))
 		{
         ret = -1;