migrate rsa git from private git(accel-proc)submit/master/20120920.1511592.0_alphamaster2.0alpha

4 files changed, 73 insertions, 78 deletions

diff --git a/debian/changelog b/debian/changelog
index 9332c45..ce429df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,45 +1,77 @@
-sf-plugin-proc-accel-emul (0.2.4) unstable; urgency=low
-  
-  * modified for support updated libslp-sensor
+sf-plugin-proc-accel-emul (0.2.10) unstable; urgency=low
+
+  * fixed unexpectedly stop when sms injection with sensor data
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.10
+
+ -- Sungmin ha <sungmin82.ha@samsung.com> Wed, 08 Aug 2012 20:39:35 +0900
+
+sf-plugin-proc-accel-emul (0.2.9) unstable; urgency=low
+
+  * off debug definition
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.9
+
+ -- Sungmin ha <sungmin82.ha@samsung.com> Thu, 02 Aug 2012 13:26:04 +0900
+
+sf-plugin-proc-accel-emul (0.2.8) unstable; urgency=low
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Thu, 5 Apr 2012 15:06:52 +0900
+  * modified for sensor FW changed by juhyun kim
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.8
 
-sf-plugin-proc-accel-emul (0.2.3-2) unstable; urgency=low
-   
-  * modified for build only i386
+ -- Sungmin ha <sungmin82.ha@samsung.com> Mon, 30 Jul 2012 15:57:10 +0900
 
- -- Sungmin Ha <sungmin82.ha@samsung.com>  Sat, 18 Feb 2012 13:06:52 +0900
+sf-plugin-proc-accel-emul (0.2.7) unstable; urgency=low
 
-sf-plugin-proc-accel-emul (0.2.3-1) unstable; urgency=low
+  * modified rotation vconf key path
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.7
 
- -- Sungmin Ha <sungmin82.ha@samsung.com> Fri, 10 Feb 2012 14:00:00 +0900
+ -- Sungmin ha <sungmin82.ha@samsung.com> Tue, 26 Jun 2012 11:28:00 +0900
 
-sf-plugin-proc-accel-sim (0.2.2-8) unstable; urgency=low
+sf-plugin-proc-accel-emul (0.2.6) unstable; urgency=low
 
-  * modified for repeated rotation event in Appcore
-  * Tag:emulator-plugin-accel-proc_0.2.2-8
+  * modified for checking return value of fopen
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.6
 
- -- Sung-min Ha <sungmin82.ha@samsung.com>  Tue, 27 Sep 2011 19:30:55 +0900
+ -- Sungmin ha <sungmin82.ha@samsung.com> Fri, 22 Jun 2012 18:28:00 +0900
 
-sf-plugin-proc-accel-sim (0.2.2-7) unstable; urgency=low
+sf-plugin-proc-accel-emul (0.2.5) unstable; urgency=low
 
-  * modified buf size for protocol to sensor_server
-  * Tag:emulator-plugin-accel-proc_0.2.2-7
+  * modified for OSP support
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.5
+
+ -- Sungmin ha <sungmin82.ha@samsung.com> Fri, 15 Jun 2012 18:44:00 +0900
+
+sf-plugin-proc-accel-emul (0.2.4) unstable; urgency=low
+
+  * deleted vconf set lcd_type
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.4
+
+ -- Sungmin ha <sungmin82.ha@samsung.com> Thu, 7 Jun 2012 21:00:00 +0900
+
+sf-plugin-proc-accel-emul (0.2.3) unstable; urgency=low
+
+  * modified for support updated libslp-sensor
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.3
 
- -- Sung-min Ha <sungmin82.ha@samsung.com>  Thu, 22 Sep 2011 18:00:55 +0900
+ -- Jihye kim <jihye1128.kim@samsung.com> Fri, 6 Apr 2012 20:00:00 +0900
 
-sf-plugin-proc-accel-sim (0.2.2-6) unstable; urgency=low
+sf-plugin-proc-accel-emul (0.2.2) unstable; urgency=low
 
-  * add send info to port 3581 for skin rotation
-  * Git:172.21.17.104:slp/sdk/emulator/plugin/emulator-plugin-accel-proc
-  * Tag:emulator-plugin-accel-proc_0.2.2-6
+  * Update changelog version.
+  * Git: slp/pkgs/e/emulator-plugin-accel-proc
+  * Tag: sf-plugin-proc-accel-emul_0.2.2
 
- -- Sung-min Ha <sungmin82.ha@samsung.com>  Mon, 25 Jul 2011 11:00:55 +0900
+ -- Kitae kim <kt920.kim@samsung.com>  Thu, 27 Mar 2012 20:00:00 +0900
 
-sf-plugin-proc-accel-sim (0.2.2-5) unstable; urgency=low
+sf-plugin-proc-accel-emul (0.2.1) unstable; urgency=low
 
-  * does not check target type anymore
-  * Git:165.213.180.234:/slp/pkgs/s/sf-plugin-proc-accel-sim
-  * Tag:sf-plugin-proc-accel-sim_0.2.2-5
+  * Initial Release.
 
- -- Yong-sul Oh <yongsul96.oh@samsung.com>  Tue, 21 Dec 2010 22:17:55 +0900
+ -- Sungmin Ha <sungmin82.ha@samsung.com> Thu, 15 Mar 2012 17:00:00 +0900
diff --git a/debian/control b/debian/control
index d3f0aaf..05ea768 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: sf-plugin-proc-accel-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, libslp-setting-dev
-Standards-Version: 0.2.4
+Standards-Version: 0.2.10
 
 Package: sf-plugin-proc-accel-emul
 Architecture: i386
diff --git a/packaging/sf-plugin-proc-accel-emul.spec b/packaging/sf-plugin-proc-accel-emul.spec
index 7aae88e..d02d5bc 100644
--- a/packaging/sf-plugin-proc-accel-emul.spec
+++ b/packaging/sf-plugin-proc-accel-emul.spec
@@ -1,6 +1,6 @@
 #git:/slp/pkgs/e/emulator-plugin-accel-proc
 Name: sf-plugin-proc-accel-emul
-Version: 0.2.1
+Version: 0.2.10
 Release: 1
 Summary: Accel simulator Processor plugin for sensor framework (using setting)
 Group: System Environment/Libraries
diff --git a/src/accel_sim_processor.cpp b/src/accel_sim_processor.cpp
index ce65e51..f3d013e 100644
--- a/src/accel_sim_processor.cpp
+++ b/src/accel_sim_processor.cpp
@@ -65,11 +65,12 @@
 
 #include <vconf.h>
 
+#define DEBUG
 #define SRV_IP "10.0.2.2"
 
 const char *accel_sim_processor::LCD_TYPE_NODE = "/sys/class/graphics/fb0/virtual_size";
 
-const char *accel_sim_processor::LCD_TYPE_KEY = "memory/sensor/lcd_type";
+const char *accel_sim_processor::LCD_TYPE_KEY = "memory/private/sensor/lcd_type";
 
 accel_sim_processor::accel_sim_processor()
 : m_sensor(NULL)
@@ -97,7 +98,7 @@ accel_sim_processor::accel_sim_processor()
 , m_data_report_cb_client(0)
 {
 	m_name = strdup("accel_sim_processor");
-	m_rotation_cb_key = strdup("memory/sensor/10001");
+	m_rotation_cb_key = strdup("memory/private/sensor/10001");
 	if ((!m_name) ||(!m_rotation_cb_key) ) {
 		free(m_name);
 		free(m_rotation_cb_key);
@@ -309,7 +310,7 @@ void *accel_sim_processor::working(void *inst)
 	char fbuf[16];
 	int port;
 	fd = fopen("/opt/home/sdb_port.txt", "r");
-	if(fd <= 0)
+	if(!fd)
 		port = 3581;
 	else
 	{
@@ -351,10 +352,10 @@ void *accel_sim_processor::working(void *inst)
 	if (filter->is_data_ready(true) == false) {
 		ERR("Data ready has failed\n");
 		processor->m_work_err_count++;
-		if ( processor->m_work_err_count > 10 ) {
-			ERR("Too many error counted stop processor");			
-			return (void*)cworker::STOPPED;
-		}
+//		if ( processor->m_work_err_count > 10 ) {
+//			ERR("Too many error counted stop processor");			
+//			return (void*)cworker::STOPPED;
+//		}
 		return (void*)cworker::STARTED;		
 	}
 	
@@ -367,7 +368,7 @@ void *accel_sim_processor::working(void *inst)
 	DBG("Read %ld %ld %ld\n", x, y, z);
 	DBG("Prev-Read %ld %ld %ld\n", processor->m_x, processor->m_y, processor->m_z);
 
-	atan_value = atan2(y,x);
+	atan_value = atan2(y,-x);
 	acc_theta = (int)(atan_value * (180.0/M_PI) + 270)%360;
 
 	if ( z > 250 ) {
@@ -871,45 +872,7 @@ int accel_sim_processor::get_struct_value(unsigned int struct_type , void *struc
 
 int accel_sim_processor::check_lcd_type(void)
 {	
-	int type=-1;
-	int state;
-
-#if defined (USE_LCD_TYPE_CHECK) && defined (TARGET)
-
-	FILE *fp;
-	int x;
-	int y;
-	
-	
-	fp = fopen(LCD_TYPE_NODE, "r");
-	if (!fp) {
-		ERR("Failed to open node : %s\n",LCD_TYPE_NODE);		
-		return type;
-	}
-
-	if (fscanf(fp, "%d,%d", &x, &y) != 2) {
-		ERR("Failed to collect data\n");
-		fclose(fp);
-		return type;
-	}
-	fclose(fp);
-
-	if ( x < y ) {
-		type = 1;
-	} else if ( x > y ) {
-		type = 2;		
-	} else {
-		type = 0 ;
-	}
-#else
-	type = 0;
-#endif
-
-	state = vconf_set_int(LCD_TYPE_KEY, type);
-	if (state < 0 ) {
-		ERR("Fail vconf_set_int at key : %s , value : %d\n",LCD_TYPE_KEY, type);
-		return -1;
-	}
+	int type=0;
 
 	return type;
 }