Merge branch 'tizen_2.4' into tizen_2.4_dev

Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>
Conflicts:
	daemon/Makefile
	scripts/stop.sh

Change-Id: Iaba759cad390088f2ab15bf778ba417d485274bf

diff --cc daemon/Makefile
index 3441151,5b8cf08..5ce7d32
--- 1/daemon/Makefile
--- 2/daemon/Makefile
+++ b/daemon/Makefile
@@@ -1,109 -1,71 +1,111 @@@
 -CC :=gcc
 -DEBUG_CPPFLAGS =                              \
 -              -DDEBUG                                 \
 -              -DUSE_LOG_ONCE                  \
 -#             -DMALLOC_DEBUG_LEVEL=1          \#
 -#             -DMALLOC_DEBUG_LEVEL=2          \#
 -#             -DDEB_PRINTBUF                  \#
 -#             -DPARSE_DEBUG_ON                \#
 -#             -DTHREAD_SAMPLING_DEBUG \#
 -#             -DTHREAD_REPLAY_DEBUG   #
 -
 -CPPFLAGS :=   -I/usr/include          \
 -              -I/usr/include/system   \
 -              -I/usr/include/capi-system-info \
 -              -I/usr/include/capi-system-runtime-info \
 -              -I/usr/include/vconf    \
 -              $(DEBUG_CPPFLAGS)
 +CC := gcc
 +CPP := g++
 +
 +COMM_FLAGS := -Wall -g -O0
 +
 +DEBUG_FLAGS = \
 +      -DDEBUG \
 +      -DUSE_LOG_ONCE \
 +#     -DMALLOC_DEBUG_LEVEL=1 \
 +#     -DMALLOC_DEBUG_LEVEL=2 \
 +#     -DDEB_PRINTBUF \
 +#     -DPARSE_DEBUG_ON \
 +#     -DTHREAD_SAMPLING_DEBUG \
 +#     -DTHREAD_REPLAY_DEBUG \
 +#     -DNOLOGI=1
 +
 +INCLUDE := \
 +      -I/usr/include \
 +      -I/usr/include/system \
 +      -I/usr/include/capi-system-info \
 +      -I/usr/include/capi-system-runtime-info \
 +      -I/usr/include/vconf \
 +      -I/usr/include/ecore-1 \
 +      -I/usr/include/eina-1 \
-       -I/usr/include/eina-1/eina
++      -I/usr/include/eina-1/eina \
++      -I/usr/include/efl-1 \
++      -I/usr/include/eo-1
 +
 +FLAGS := \
 +      $(COMM_FLAGS) \
 +      $(INCLUDE) \
 +      $(DEBUG_FLAGS)
 +
  ifeq (arm, $(findstring arm, $(shell uname -sm)))
 -      CPPFLAGS += -DDEVICE_ONLY
 +      FLAGS += -DDEVICE_ONLY
  endif
  
 -COMMON_LIBS := -lglib-2.0 -lpthread
 -TARGET_LIBS := $(COMMON_LIBS) -lvconf -lsmack -lcapi-system-info -lecore -leina -lpthread
 -CFLAGS := -Wall -pthread -g -O0 \
 -                -I/usr/include/ecore-1 \
 -                -I/usr/include/eina-1 \
 -                -I/usr/include/eina-1/eina \
 -                -I/usr/include/efl-1 \
 -                -I/usr/include/eo-1
 -
 -DAEMON_SRCS =                 \
 -      buffer.c                \
 -      da_data.c               \
 -      da_debug.c              \
 -      da_protocol.c           \
 -      da_protocol_inst.c      \
 -      da_inst.c               \
 -      daemon.c                \
 -      debug.c                 \
 -      elf.c                   \
 -      ioctl_commands.c        \
 -      main.c                  \
 -      sys_stat.c              \
 -      threads.c               \
 -      transfer_thread.c       \
 -      utils.c                 \
 -      da_protocol_check.c     \
 -      md5.c                   \
 -      input_events.c          \
 -      device_vconf.c          \
 -      device_system_info.c    \
 -      device_camera.c         \
 -      smack.c                                 \
 +
 +# compiler flags
 +CFLAGS := $(FLAGS)
 +CPPFLAGS := $(FLAGS)
 +
 +# linker flags
 +LDFLAGS := \
 +      -lpthread \
 +      -lvconf \
 +      -lsmack \
 +      -lecore \
 +      -lcapi-system-info \
 +      -lwebsockets \
-       -ljson
++      -ljson-c
 +
 +SRC_C := \
 +      buffer.c \
 +      da_data.c \
 +      da_debug.c \
 +      da_protocol.c \
 +      da_protocol_inst.c \
 +      da_inst.c \
 +      daemon.c \
 +      debug.c \
 +      elf.c \
 +      ioctl_commands.c \
 +      main.c \
 +      sys_stat.c \
 +      threads.c \
 +      transfer_thread.c \
 +      utils.c \
 +      da_protocol_check.c \
 +      md5.c \
 +      input_events.c \
 +      device_vconf.c \
 +      device_system_info.c \
 +      device_camera.c \
 +      smack.c \
        malloc_debug.c \
        target.c \
 -      thread.c
 +      thread.c \
 +      wsi.c
  
 -DAEMON_OBJS = $(patsubst %.c,%.o, $(DAEMON_SRCS))
 +SRC_CPP :=
 +
 +OBJS_C := $(SRC_C:.c=.o)
 +OBJS_CPP := $(SRC_CPP:.cpp=.o)
 +OBJS := $(OBJS_C) $(OBJS_CPP)
  
  TARGET = da_manager
 -START_SH = start.sh
 -STOP_SH = stop.sh
 +DASCRIPT = da_command
 +START_SH = ../scripts/start.sh
 +STOP_SH = ../scripts/stop.sh
 +PRELOAD_SCRIPT = ../scripts/gen_preload_header.sh
  
  all: debug
 -debug release: $(TARGET_LIBS)
 +
 +release: CFLAGS += -DNOLOGI=1
  release: CPPFLAGS += -DNOLOGI=1
 -debug release: $(DAEMON_OBJS)
 -      $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $(TARGET)
 +release: debug
 +
 +.c.o:
 +      $(CC) $(CFLAGS) -c -o $@ $<
 +
 +.cpp.o:
 +      $(CPP) $(CPPFLAGS) -c -o $@ $<
 +
 +
 +debug: $(OBJS)
-       $(CPP) $(LDFLAGS) $(OBJS) -o $(TARGET)
++      $(CPP) $(OBJS) -o $(TARGET) $(LDFLAGS)
 +
  
  install: BINDIR = $(DESTDIR)/usr/bin
  install: OPTDIR = $(DESTDIR)/opt/swap/sdk

diff --cc daemon/da_protocol.c
Simple merge

diff --cc daemon/daemon.h
Simple merge

diff --cc daemon/utils.c
Simple merge

diff --cc scripts/start.sh
Simple merge

diff --cc scripts/stop.sh
index bf301d4,8dabccd..8e33002
--- 1/scripts/stop.sh
--- 2/daemon/stop.sh
+++ b/scripts/stop.sh
@@@ -1,9 -1,8 +1,12 @@@
  #!/bin/sh
  
+ # swap disabling
+ echo 0 > /sys/kernel/debug/swap/enable
+ 
 +rmmod swap_preload
 +rmmod swap_task_data
 +rmmod swap_webprobe
 +rmmod swap_retprobe
  rmmod swap_message_parser
  rmmod swap_energy
  rmmod swap_sampler