Merge branch 'sylvain/testing' of git://git.osmocom.org/osmocom-bb into testing

Conflicts:
	src/target/firmware/apps/simtest/main.c

diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile
index 56e0068..c69aab7 100644 (file)
--- a/src/target/firmware/Makefile
+++ b/src/target/firmware/Makefile
@@ -73,7 +73,7 @@ ANY_APP_LIBS+=calypso/libcalypso.a layer1/liblayer1.a lib/libmini.a comm/libcomm
 -include Makefile.inc
 
 # Uncomment this line if you want to enable Tx (Transmit) Support.
-#CFLAGS += -DCONFIG_TX_ENABLE
+CFLAGS += -DCONFIG_TX_ENABLE
 
 # Uncomment this line if you want to write to flash.
 #CFLAGS += -DCONFIG_FLASH_WRITE

diff --git a/src/target/firmware/apps/simtest/main.c b/src/target/firmware/apps/simtest/main.c
index 4b9fbcd..d055672 100755 (executable)
--- a/src/target/firmware/apps/simtest/main.c
+++ b/src/target/firmware/apps/simtest/main.c
@@ -207,6 +207,9 @@ void delay_ms(unsigned int ms)
        for (i= 0; i < ms*1300; i++) { i; }
 }
 
+
+
+
 /* Execute my (dexter's) personal test */
 void do_sim_test(void)
 {