sync with private git

diff --git a/include/mux.h b/include/mux.h
index bd23b7d..6a087fc 100755 (executable)
--- a/include/mux.h
+++ b/include/mux.h
@@ -1,29 +1,29 @@
-/*\r
- * libtcore\r
- *\r
- * Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Arijit Sen <arijit.sen@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-#ifndef __MUX_H__\r
-#define __MUX_H__\r
-\r
-void tcore_cmux_init(TcorePlugin *plugin, TcoreHal *h);\r
-\r
-void tcore_cmux_close();\r
-\r
-int tcore_cmux_rcv_from_hal(unsigned char *data, int len);\r
-#endif  /* __MUX_H__ */\r
+/*
+ * libtcore
+ *
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Arijit Sen <arijit.sen@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MUX_H__
+#define __MUX_H__
+
+void tcore_cmux_init(TcorePlugin *plugin, TcoreHal *h);
+
+void tcore_cmux_close();
+
+int tcore_cmux_rcv_from_hal(unsigned char *data, int len);
+#endif  /* __MUX_H__ */

diff --git a/include/storage.h b/include/storage.h
index 3f422f2..cd85640 100644 (file)
--- a/include/storage.h
+++ b/include/storage.h
@@ -67,6 +67,7 @@ enum tcore_storage_key {
 
        STORAGE_KEY_TELEPHONY_BOOL = STORAGE_KEY_BOOL,
        STORAGE_KEY_3G_ENABLE,
+       STORAGE_KEY_TELEPHONY_READY,
        STORAGE_KEY_SETAPPL_STATE_DATA_ROAMING_BOOL,
        STORAGE_KEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL,
        STORAGE_KEY_SETAPPL_FLIGHT_MODE_BOOL,

diff --git a/include/type/call.h b/include/type/call.h
index 25f4ade..080db87 100644 (file)
--- a/include/type/call.h
+++ b/include/type/call.h
@@ -449,11 +449,11 @@ struct treq_call_sound_set_recording {
        gboolean state;
 };
 
-#define MAX_SOUND_EQ_PARAMETER_SIZE 6
+#define MAX_CALL_EQ_PARAMETER_SIZE 6
 struct treq_call_sound_set_equalization {
        gboolean mode;
        enum telephony_call_sound_direction direction;
-       unsigned short parameter[ MAX_SOUND_EQ_PARAMETER_SIZE ];
+       unsigned short parameter[ MAX_CALL_EQ_PARAMETER_SIZE ];
 };
 
 struct treq_call_sound_set_noise_reduction {

diff --git a/include/type/network.h b/include/type/network.h
index 052aec1..85d879e 100644 (file)
--- a/include/type/network.h
+++ b/include/type/network.h
@@ -29,27 +29,29 @@ enum telephony_network_select_mode {
        NETWORK_SELECT_MODE_GSM_AUTOMATIC = 0x02,
        NETWORK_SELECT_MODE_GSM_MANUAL = 0x03,
        NETWORK_SELECT_MODE_CDMA = 0x04,
+       NETWORK_SELECT_MODE_LTE_AUTO = 0x05,
+       NETWORK_SELECT_MODE_LTE_MANUAL = 0x06
 };
 
 enum telephony_network_plmn_status {
        NETWORK_PLMN_UNKNOWN,
        NETWORK_PLMN_AVAILABLE,
        NETWORK_PLMN_CURRENT,
-       NETWORK_PLMN_FORBIDDEN,
+       NETWORK_PLMN_FORBIDDEN
 };
 
 enum telephony_network_service_domain {
        NETWORK_SERVICE_DOMAIN_COMBINED = 0x01,
        NETWORK_SERVICE_DOMAIN_CS,
        NETWORK_SERVICE_DOMAIN_PS,
-       NETWORK_SERVICE_DOMAIN_AUTOMATIC,
+       NETWORK_SERVICE_DOMAIN_AUTOMATIC
 };
 
 enum telephony_network_service_domain_status {
        NETWORK_SERVICE_DOMAIN_STATUS_NO = 0x0,
        NETWORK_SERVICE_DOMAIN_STATUS_EMERGENCY,
        NETWORK_SERVICE_DOMAIN_STATUS_FULL,
-       NETWORK_SERVICE_DOMAIN_STATUS_SEARCH,
+       NETWORK_SERVICE_DOMAIN_STATUS_SEARCH
 };
 
 enum telephony_network_service_type {
@@ -61,7 +63,8 @@ enum telephony_network_service_type {
        NETWORK_SERVICE_TYPE_2_5G,
        NETWORK_SERVICE_TYPE_2_5G_EDGE,
        NETWORK_SERVICE_TYPE_3G,
-       NETWORK_SERVICE_TYPE_HSDPA
+       NETWORK_SERVICE_TYPE_HSDPA,
+       NETWORK_SERVICE_TYPE_LTE
 };
 
 enum telephony_network_access_technology {
@@ -86,7 +89,7 @@ enum telephony_network_access_technology {
 
 enum telephony_network_band_mode {
        NETWORK_BAND_MODE_PREFERRED = 0x01,
-       NETWORK_BAND_MODE_ONLY = 0x02,
+       NETWORK_BAND_MODE_ONLY = 0x02
 };
 
 enum telephony_network_band {
@@ -101,7 +104,9 @@ enum telephony_network_band {
        NETWORK_BAND_TYPE_WCDMA2100,
        NETWORK_BAND_TYPE_GSM900,
        NETWORK_BAND_TYPE_GSM1800,
-       NETWORK_BAND_TYPE_GSM_850_1900
+       NETWORK_BAND_TYPE_GSM_850_1900,
+       NETWORK_BAND_TYPE_LTE_BAND_4,
+       NETWORK_BAND_TYPE_LTE_BAND_17
 };
 
 enum telephony_network_preferred_plmn_operation {
@@ -121,7 +126,7 @@ enum telephony_network_icon_info_type {
        NETWORK_ICON_INFO_RSSI = 0x01,
        NETWORK_ICON_INFO_BATTERY = 0x02,
        NETWORK_ICON_INFO_HDR_RSSI = 0x04,
-       NETWORK_ICON_INFO_ALL = 0xFF,
+       NETWORK_ICON_INFO_ALL = 0xFF
 };
 
 enum telephony_network_mode {
@@ -129,7 +134,7 @@ enum telephony_network_mode {
        NETWORK_MODE_GSM = 0x01,
        NETWORK_MODE_WCDMA = 0x02,
        NETWORK_MODE_CDMA = 0x04,
-       NETWORK_MODE_LTE = 0x08,
+       NETWORK_MODE_LTE = 0x08
 };
 
 struct treq_network_search { /* no data */

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 8c55c45..7f40832 100755 (executable)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/l/libtcore
 Name: libtcore
 Summary: Telephony-core library
-Version: 0.1.51
+Version: 0.1.55
 Release:    1
 Group:      System/Libraries
 License:    Apache