Merge source into branch 2.0_beta.submit/master/20120920.1512022.0_alphamaster2.0alpha

3 files changed, 20 insertions, 70 deletions

diff --git a/debian/changelog b/debian/changelog
index 84f3baa..307abb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,87 +1,37 @@
 sf-plugin-proxi-emul (0.2.5) unstable; urgency=low
-  
-  * modified enum name for sync with proxi-proc
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Thu, 19 Apr 2012 17:35:52 +0900
+  * modified get_struct_value for support OSP
+  * Git: slp/pkgs/e/emulator-plugin-proxi
+  * Tag: sf-plugin-proxi-emul_0.2.5
+
+ -- Sungmin Ha <sungmin82.ha@samsung.com> Mon, 25 Jun 2012 18:11:00 +0900
 
 sf-plugin-proxi-emul (0.2.4) unstable; urgency=low
-  
+
   * modified for get_struct_value bug fix
+  * Git: slp/pkgs/e/emulator-plugin-proxi
+  * Tag: sf-plugin-proxi-emul_0.2.4
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Thu, 19 Apr 2012 16:35:52 +0900
+ -- Sungmin Ha <sungmin82.ha@samsung.com> Thu, 19 Apr 2012 18:00:00 +0900
 
 sf-plugin-proxi-emul (0.2.3) unstable; urgency=low
-  
+
   * modified for support updated libslp-sensor
+  * Git: slp/pkgs/e/emulator-plugin-proxi
+  * Tag: sf-plugin-proxi-emul_0.2.3
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Thu, 5 Apr 2012 15:06:52 +0900
+ -- Jihye kim <jihye1128.kim@samsung.com> Fri, 6 Apr 2012 20:00:00 +0900
 
 sf-plugin-proxi-emul (0.2.2) unstable; urgency=low
 
-    * modified for build only i386
+  * Update changelog version.
+  * Git: slp/pkgs/e/emulator-plugin-proxi
+  * Tag: sf-plugin-proxi-emul_0.2.2
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Sat, 18 Feb 2012 13:06:52 +0900
+ -- Kitae kim <kt920.kim@samsung.com> Thu, 27 Mar 2012 20:00:00 +0900
 
 sf-plugin-proxi-emul (0.2.1) unstable; urgency=low
 
- -- Sungmin Ha <sungmin82.ha@samsung.com> Fri, 10 Feb 2012 14:00:00 +0900
-
-sf-plugin-proxi-sim (0.1.2-2) unstable; urgency=low
-
-  * some prevent-checking-bug fix (CID 14034 , 14033)
-  * Git:165.213.180.234:/git/slp/pkgs/sf-plugin-proxi-sim
-  * Tag:sf-plugin-proxi-sim_0.1.2-2
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Wed, 15 Sep 2010 18:44:53 +0900
-
-sf-plugin-proxi-sim (0.1.2-1) unstable; urgency=low
-
-  * change get_struct_value() & get_property()
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-proxi-sim-0
-  * Tag:sf-plugin-proxi-sim_0.1.2-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Tue, 15 Jun 2010 10:05:06 +0900
-
-sf-plugin-proxi-sim (0.1.1-1) unstable; urgency=low
-
-  * change for new libslp-sensor APIs
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-proxi-sim-0
-  * Tag:sf-plugin-proxi-sim_0.1.1-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Mon, 31 May 2010 01:23:20 +0900
-
-sf-plugin-proxi-sim (0.0.4-2) unstable; urgency=low
-
-  * DAC rule changed 
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-proxi-sim-0
-  * Tag:sf-plugin-proxi-sim_0.0.4-2
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Mon, 10 May 2010 21:06:32 +0900
-
-sf-plugin-proxi-sim (0.0.4-1) unstable; urgency=low
-
-  * add {pkg_name}.postinst.in for permission control & add free() codes when it's class constructor returned with error
-  * Git:165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-proxi-sim-0
-  * Tag:sf-plugin-proxi-sim_0.0.4-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Tue, 20 Apr 2010 13:16:52 +0900
-
-sf-plugin-proxi-sim (0.0.3-1) unstable; urgency=low
-
-  * add real-device checking routine (return NULL when a real-device does not exist)
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/sf-plugin-proxi-sim-0
-  * Tag: sf-plugin-proxi-sim_0.0.3-1
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Mon, 05 Apr 2010 13:57:18 +0900
-
-sf-plugin-proxi-sim (0.0.2-1) unstable; urgency=low
-
-  * double-execute updating bug-fix & toolchain upgrade
-
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Fri, 19 Mar 2010 14:31:15 +0900
-
-sf-plugin-proxi-sim (0.0.1-1) unstable; urgency=low
-
   * Initial Release.
 
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Fri, 19 Feb 2010 21:34:27 +0900
+ -- Sungmin Ha <sungmin82.ha@samsung.com> Thu, 15 Mar 2012 17:00:00 +0900s
diff --git a/debian/control b/debian/control
index 41384a2..897cdb0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: sf-plugin-proxi-emul
 Section: misc
 Priority: extra
-Maintainer: Sungmin ha <sungmin82.ha@samsung.com>
+Maintainer:Sungmin ha <sungmin82.ha@samsung.com>,Jihye Kim <jihye1128.kim@samsung.com>,Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
 Build-Depends: libsf-common-dev
 Standards-Version: 0.2.5
 
diff --git a/src/cproxi_sim.cpp b/src/cproxi_sim.cpp
index fa7ebbc..beeab73 100644
--- a/src/cproxi_sim.cpp
+++ b/src/cproxi_sim.cpp
@@ -506,7 +506,7 @@ int cproxi_sim::get_struct_value(unsigned int struct_type , void *struct_values)
 				return_struct_value->data_unit_idx = IDX_UNIT_STATE_ON_OFF;
 				return_struct_value->time_stamp = m_fired_time ;
 				return_struct_value->values_num = 1;
-				if(m_vo > 3)
+				if(m_vo == 0)
 					return_struct_value->values[0] = PROXIMITY_STATE_FAR;
 				else
 					return_struct_value->values[0] = PROXIMITY_STATE_NEAR;