Merge a pointless head that got away.
--- a/baseport/syborg/bld.inf Thu Nov 25 14:15:45 2010 +0000
+++ b/baseport/syborg/bld.inf Thu Nov 25 14:28:39 2010 +0000
@@ -136,6 +136,12 @@
// Build image armv5 for urel and udeb
PRJ_EXTENSIONS
start extension base/rom
+#ifdef ARMCC
+option ROM_DEFS ARMCC
+#endif
+#ifdef GCCE
+option ROM_DEFS GCCE
+#endif
option REE_TARGET syborg
option TYPE tshell
end
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_nvmemorydevice.py Thu Nov 25 14:15:45 2010 +0000
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/plugins/syborg_nvmemorydevice.py Thu Nov 25 14:28:39 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 )
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/python-plugin.c Thu Nov 25 14:15:45 2010 +0000
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/python-plugin.c Thu Nov 25 14:28:39 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;