Fix mbtk_sdk_ready_v2
Change-Id: I842ad2cfccefb30a254d1ba5dd79c48e8cee71f0
diff --git a/mbtk/test/libmbtk_lib/mbtk_timer_test.c b/mbtk/test/libmbtk_lib/mbtk_timer_test.c
new file mode 100755
index 0000000..7b24ef2
--- /dev/null
+++ b/mbtk/test/libmbtk_lib/mbtk_timer_test.c
@@ -0,0 +1,49 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "mbtk_utils.h"
+#include "mbtk_log.h"
+
+#define KMSG "/dev/kmsg"
+
+static int fd = -1;
+
+void timer_alrm_cb(int signo)
+{
+ char *str = "----------------------Timeout---------------------------\n";
+ if(fd > 0) {
+ write(fd, str, strlen(str));
+ }
+
+ printf("%s", str);
+ LOGI("%s", str);
+}
+
+
+int main(int argc, char *argv[])
+{
+ if(argc != 2) {
+ printf("mbtk_timer_test <time>\n");
+ return -1;
+ }
+ mbtk_log_init("radio", "MBTK");
+
+ int time = atoi(argv[1]);
+ if(time > 0) {
+ mbtk_timer_set(timer_alrm_cb, time * 1000);
+ }
+
+ fd = open(KMSG, O_WRONLY);
+ if(fd > 0) {
+ printf("Open kmsg success.");
+ }
+
+ while(1) {
+ sleep(24 * 60 * 60);
+ }
+
+ return 0;
+}
+
diff --git a/mbtk/test/libmbtk_ril/Makefile b/mbtk/test/libmbtk_ril/Makefile
index 7acd22f..6974260 100755
--- a/mbtk/test/libmbtk_ril/Makefile
+++ b/mbtk/test/libmbtk_ril/Makefile
@@ -7,11 +7,16 @@
LIBS += -lmbtk_lib -lmbtk_ril
-CFLAGS +=
+CFLAGS +=
DEFINE +=
-LOCAL_SRC_FILES = $(wildcard *.c) $(wildcard *.cpp)
+#LOCAL_SRC_FILES = $(wildcard *.c) $(wildcard *.cpp)
+ifeq ($(MBTK_SOURCE_VERSION), 2)
+LOCAL_SRC_FILES = mbtk_ril_test.c
+else
+LOCAL_SRC_FILES = mbtk_info_test.c
+endif
$(info LOCAL_SRC_FILES = $(LOCAL_SRC_FILES))
diff --git a/mbtk/test/libmbtk_ril_v2/mbtk_ril_test.c b/mbtk/test/libmbtk_ril/mbtk_ril_test.c
similarity index 100%
rename from mbtk/test/libmbtk_ril_v2/mbtk_ril_test.c
rename to mbtk/test/libmbtk_ril/mbtk_ril_test.c
diff --git a/mbtk/test/libmbtk_ril_v2/Makefile.backup b/mbtk/test/libmbtk_ril_v2/Makefile.backup
deleted file mode 100755
index 7acd22f..0000000
--- a/mbtk/test/libmbtk_ril_v2/Makefile.backup
+++ /dev/null
@@ -1,34 +0,0 @@
-BUILD_ROOT = $(shell pwd)/../..
-include $(BUILD_ROOT)/Make.defines
-
-INC_DIR +=
-
-LIB_DIR +=
-
-LIBS += -lmbtk_lib -lmbtk_ril
-
-CFLAGS +=
-
-DEFINE +=
-
-LOCAL_SRC_FILES = $(wildcard *.c) $(wildcard *.cpp)
-
-$(info LOCAL_SRC_FILES = $(LOCAL_SRC_FILES))
-
-OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(LOCAL_SRC_FILES)))
-BINS = $(patsubst %.o,%,$(OBJS))
-
-all: $(BINS)
-
-$(BINS):$(OBJS)
- @echo " BIN $@"
- $(CC) $(CFLAGS) $(LIB_DIR) $(LIBS) $@.o -o $(OUT_DIR)/bin/$@
-
-%.o:%.c
- $(CC) $(CFLAGS) $(INC_DIR) $(DEFINE) -c $< -o $@
-
-%.o:%.cpp
- $(CC) $(CFLAGS) $(INC_DIR) $(DEFINE) -c $< -o $@
-
-clean:
- rm -f $(OBJS)
diff --git a/mbtk/test/others/proc_demo.c b/mbtk/test/others/proc_demo.c
new file mode 100755
index 0000000..7712b4c
--- /dev/null
+++ b/mbtk/test/others/proc_demo.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+int pub_int_d = 4;
+char *str = "abc";
+int bss_1;
+
+//int bss_1;
+//static int static_bss_2;
+
+void test(int c)
+{
+ int d = 10;
+ //printf("函数参数:test_c = %p, 局部变量:d = %p\n", &c, &d);
+}
+
+int main(int argc, char *argv[])
+{
+ printf("[栈]函数参数:argc = %p, argv = %p\n", &argc, argv);
+
+ int int_a;
+ static int static_int_b;
+ char *temp_malloc = (char*)malloc(10);
+ const char temp[10];
+
+ printf("[栈]局部变量:int_a[%d] = %p, [BSS]局部静态变量:static_int_b[%d] = %p\n", int_a, &int_a, static_int_b, &static_int_b);
+ printf("[DATA]全局变量:pub_int_d[%d] = %p\n", pub_int_d, &pub_int_d);
+ printf("常量:str = %p, 堆空间:temp_malloc = %p\n", str, temp_malloc);
+ printf("函数:test_func = %p\n", test);
+ printf("const_str = %p, &(temp[3]) = %p\n", temp, &(temp[3]));
+ printf("BSS : %d, %p\n", bss_1, &bss_1);
+
+ test(5);
+
+ while(1) {
+ sleep(24 * 60 * 60);
+ }
+
+ return 0;
+}
+