- ipaq fixes, compiles & runs with FAST_LOCK

Makefile.defs

@@ -8,7 +8,7 @@
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL = 7
-EXTRAVERSION = -6-unstable
+EXTRAVERSION = -7-ipaq
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s)
@@ -84,9 +84,10 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DF_MALLOC  -DUSE_SYNONIM\
 	 -DSHM_MEM  -DSHM_MMAP \
 	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \
-	 -DWAIT -DNEW_HNAME -DNOISY_REPLIES -DBOGDAN_TRIFLE \
+	 -DWAIT -DNEW_HNAME \
 	 -DSILENT_FR \
 	 -DNO_DEBUG \
+	 #-DNOISY_REPLIES \
 	 #-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \
 	 #-DNOSMP \
 	 #-DEXTRA_DEBUG 
@@ -168,6 +169,11 @@ ifeq 	($(CC_NAME), gcc)
 endif
 endif
 
+ifeq ($(ARCH), armv4l)
+	DEFS+= -DFAST_LOCK
+endif
+
+
 
 # setting CFLAGS
 ifeq ($(mode), release)

fastlock.h

@@ -54,7 +54,7 @@ inline static int tsl(fl_lock_t* lock)
 			: "=r"(val) : "r"(lock):"memory"
 	);
 	
-#elif defined __armv4l
+#elif defined __arm__
 	asm volatile(
 			"# here \n\t"
 			"swpb %0, %1, [%2] \n\t"
@@ -108,7 +108,7 @@ inline static void release_lock(fl_lock_t* lock)
 			: "r" (lock)
 			: "memory"
 	);
-#elif defined __armv4l
+#elif defined __arm__
 	asm volatile(
 		" str %0, [%1] \n\r" 
 		: /*no outputs*/ 

test/locking/locking_test.c

@@ -132,7 +132,7 @@ Options:\n\
 
 int main (int argc, char** argv)
 {
-	char c;
+	int c;
 	int r;
 	char *tmp;
 	

test/th-uri-2.cfg

@@ -22,7 +22,8 @@ rev_dns=yes      # (cmd. line: -R)
 #port=5070
 #listen=127.0.0.1
 #listen=192.168.57.33
-listen=10.0.0.179
+listen=192.168.57.72
+#listen=10.0.0.179
 loop_checks=0
 # for more info: sip_router -h