# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812583 -3600
# Node ID 077b560f9789d04b831e9aad10d02a3772832aa7
# Parent  3c15ef939dd3987cd54797e09f6791469ac8d613# Parent  d2f9a1d49266b4ee65249e814eec7680cedbbd9f
Catchup to latest Symbian^4

diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/bld.inf
--- a/baseport/syborg/bld.inf	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/bld.inf	Thu Jul 22 16:29:43 2010 +0100
@@ -36,9 +36,9 @@
 PRJ_EXTENSIONS
 start		extension		base/genexec
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
 #endif
 option		EXTRA_SRC_PATH  $(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel/eka/kernel
 end
@@ -111,19 +111,26 @@
 PRJ_EXTENSIONS
 start		extension		base/bootstrap
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
+#endif
+#ifdef GCCE
+option		GCCE			GCCE
+#endif
+#ifdef ARMCC
+option		ARMCC			ARMCC
 #endif
 option		NAME			_syborg_bootloader_bootrom
 option		MEMMODEL		multiple
 //option		MEMMODEL		flexible
 //option		MEMMODEL		moving
 option		SOURCES			syborg.s
+//option		INCLUDES		$(EXTENSION_ROOT)/config.inc $(EXTENSION_ROOT)/bootstrap/syborg.inc
 option		INCLUDES		config.inc syborg.inc
 option		E32PATH			$(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel
 option		EXTRA_INC_PATH	$(EXTENSION_ROOT)/bootstrap
-option		EXTRA_SRC_PATH	$(EXTENSION_ROOT)/bootstrap 
+option		EXTRA_SRC_PATH	$(EXTENSION_ROOT)/bootstrap
 end
 
 // Build image armv5 for urel and udeb
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/bootstrap/syborg.s
--- a/baseport/syborg/bootstrap/syborg.s	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/bootstrap/syborg.s	Thu Jul 22 16:29:43 2010 +0100
@@ -483,7 +483,7 @@
 GetDebugPortBase	ROUT
 		ldr		r1, [r12, #TRomHeader_iDebugPort]
 		cmp		r1, #42							; JTAG?
-		movseq	r1, #0
+		moveqs	r1, #0
 		bxeq	lr							    ; yes - return 0 and set Z
 		cmp		r1, #1
         blo     GetUartPort0          
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/rom/base_syborg.iby
--- a/baseport/syborg/rom/base_syborg.iby	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/rom/base_syborg.iby	Thu Jul 22 16:29:43 2010 +0100
@@ -66,7 +66,7 @@
 #endif
 
 // IEEE-mode VFP support
-extension[VARID]=	KERNEL_DIR\DEBUG_DIR\evfp.dll			        \sys\bin\evfp.dll
+//extension[VARID]=	KERNEL_DIR\DEBUG_DIR\evfp.dll			        \sys\bin\evfp.dll
 
 
 // Either include NGA or Non NGA Framebuffer
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/rom/kernel.iby
--- a/baseport/syborg/rom/kernel.iby	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/rom/kernel.iby	Thu Jul 22 16:29:43 2010 +0100
@@ -25,7 +25,7 @@
 variant[VARID]=		\epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_KASYBORG.DLL		\sys\bin\KASYBORG.DLL
 
 // IEEE-mode VFP support
-extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\EVFP.DLL				\sys\bin\EVFP.DLL
+//extension[VARID]=	\epoc32\release\##KMAIN##\##BUILD##\EVFP.DLL				\sys\bin\EVFP.DLL
 
 // Common monitor support. Must be before both interactive debugger and automatic logger.
 extension[VARID]=   	\Epoc32\release\##KMAIN##\##BUILD##\_##VARIANT##_EXMONCOMMON.DLL 	\sys\bin\EXMONCOMMON.DLL
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/specific/interrupts.cia
--- a/baseport/syborg/specific/interrupts.cia	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/specific/interrupts.cia	Thu Jul 22 16:29:43 2010 +0100
@@ -86,7 +86,7 @@
 	asm("__KHwBaseSic:");
 	asm(".word %a0" : : "i" ((TInt)KHwBaseSic));
 	asm("__SicHandlerStart:");
-	asm(".word %a0" : : "i" ((TInt)&Handlers[0]));
+	asm(".word %a0" : : "i" (&Handlers[0]));
 }
 
 __NAKED__ void SyborgInterrupt::FiqDispatch()
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/specific/syborg.cia
--- a/baseport/syborg/specific/syborg.cia	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/specific/syborg.cia	Thu Jul 22 16:29:43 2010 +0100
@@ -71,5 +71,5 @@
   asm("bx lr");
 	
 	asm("__KHwInt:");
-	asm(".word %a0" : : "i" (TInt)(KHwBaseSic));
+	asm(".word %a0" : : "i" ((TInt)(KHwBaseSic)));
 }
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/variant.mmh
--- a/baseport/syborg/variant.mmh	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/variant.mmh	Thu Jul 22 16:29:43 2010 +0100
@@ -99,9 +99,10 @@
 //macro __CPU_ARM1136_ERRATUM_411920_FIXED
 
 
-
+#ifndef GCCE
 macro __CPU_HAS_VFP
 #define USE_VFP_MATH
+#endif
 // !@! not moving when 1136
 //#define MM_MOVING
 macro __DEBUGGER_SUPPORT__
diff -r d2f9a1d49266 -r 077b560f9789 baseport/syborg/webcamera/webcamera_pdd.cpp
--- a/baseport/syborg/webcamera/webcamera_pdd.cpp	Mon Jul 05 10:50:39 2010 +0100
+++ b/baseport/syborg/webcamera/webcamera_pdd.cpp	Thu Jul 22 16:29:43 2010 +0100
@@ -168,6 +168,7 @@
 		  break;
 	  default:
 		  //
+		  break;
 	  }
   WriteReg(iPortAddr,WEBCAMERA_REG_DMA_ADDR, 0);
   WriteReg(iPortAddr,WEBCAMERA_REG_DMA_SIZE, 0);
diff -r d2f9a1d49266 -r 077b560f9789 symbian-qemu-0.9.1-12/qemu-symbian-svp/gui_common.h
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/gui_common.h	Mon Jul 05 10:50:39 2010 +0100
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/gui_common.h	Thu Jul 22 16:29:43 2010 +0100
@@ -49,7 +49,7 @@
 #   define SET_GUI_AREA_Y0(area_ptr,y0)    (area_ptr)->y0 = (y0)
 #   define SET_GUI_AREA_X1(area_ptr,x1)    (area_ptr)->x1 = (x1)
 #   define SET_GUI_AREA_Y1(area_ptr,y1)    (area_ptr)->y1 = (y1)
-#elif define WIDTH_HEIGHT
+#elif defined WIDTH_HEIGHT
 #   define GET_GUI_AREA_WIDTH(area_ptr)    (area_ptr)->width
 #   define GET_GUI_AREA_HEIGHT(area_ptr)   (area_ptr)->height
 #   define GET_GUI_AREA_X1(area_ptr)       ((area_ptr)->x0 + (area_ptr)->width)
diff -r d2f9a1d49266 -r 077b560f9789 symbian-qemu-0.9.1-12/qemu-symbian-svp/qemu-char.c
--- a/symbian-qemu-0.9.1-12/qemu-symbian-svp/qemu-char.c	Mon Jul 05 10:50:39 2010 +0100
+++ b/symbian-qemu-0.9.1-12/qemu-symbian-svp/qemu-char.c	Thu Jul 22 16:29:43 2010 +0100
@@ -615,7 +615,7 @@
 {
     CharDriverState *ret = NULL;
     const char *temp_format = "/tmp/%s";
-    char *fname = qemu_mallocz(sizeof(char) * (strlen(temp_path) + strlen(temp_file)));
+    char *fname = qemu_mallocz(sizeof(char) * (strlen(temp_format) + strlen(temp_file)));
     if (fname)
     {
         sprintf(fname, temp_format, temp_file);