Sync from SPIN branch

Change-Id: I8ba0cbb10885c22e514cd9194f7f8f44e8cac7c3

diff --git a/packaging/tel-plugin-imc.spec b/packaging/tel-plugin-imc.spec
index e256867..189b469 100755 (executable)
--- a/packaging/tel-plugin-imc.spec
+++ b/packaging/tel-plugin-imc.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 88
+%define patchlevel 89
 
 Name:             tel-plugin-imc
 Version:          %{major}.%{minor}.%{patchlevel}

diff --git a/src/imc_sms.c b/src/imc_sms.c
index 0b5671f..2e12610 100644 (file)
--- a/src/imc_sms.c
+++ b/src/imc_sms.c
@@ -1818,7 +1818,7 @@ static void on_response_get_paramcnt(TcorePending *p,
                                                                        dbg("Getting FileType: [Transparent file type]");
                                                                        /* increment to next byte */
                                                                        ptr_data++;
-                                                                       file_type = 0x01; /* SIM_FTYPE_TRANSPARENT */
+                                                                       file_type = SIM_FTYPE_TRANSPARENT;
 
                                                                        /* data coding byte - value 21 */
                                                                        ptr_data++;
@@ -1841,7 +1841,7 @@ static void on_response_get_paramcnt(TcorePending *p,
                                                                        num_of_records = *ptr_data++;
 
                                                                        /* Data lossy conversation from enum (int) to unsigned char */
-                                                                       file_type = 0x02;       /* SIM_FTYPE_LINEAR_FIXED */
+                                                                       file_type = SIM_FTYPE_LINEAR_FIXED;
                                                                break;
 
                                                                case 0x6:
@@ -1859,7 +1859,7 @@ static void on_response_get_paramcnt(TcorePending *p,
                                                                        record_len = SMS_SWAPBYTES16(record_len);
                                                                        ptr_data = ptr_data + 2;
                                                                        num_of_records = *ptr_data++;
-                                                                       file_type = 0x04;       /* SIM_FTYPE_CYCLIC */
+                                                                       file_type = SIM_FTYPE_CYCLIC;
                                                                break;
 
                                                                default:
@@ -2086,14 +2086,14 @@ static void on_response_get_paramcnt(TcorePending *p,
                                                        if (file_type_tag == 0x00 || file_type_tag == 0x01) {
                                                                /* increament to next byte as this byte is RFU */
                                                                ptr_data++;
-                                                               file_type = (file_type_tag == 0x00) ? 0x01 : 0x02; /* SIM_FTYPE_TRANSPARENT:SIM_FTYPE_LINEAR_FIXED; */
+                                                               file_type = (file_type_tag == 0x00) ? SIM_FTYPE_TRANSPARENT : SIM_FTYPE_LINEAR_FIXED;
                                                        } else {
                                                                /* increment to next byte */
                                                                ptr_data++;
 
                                                                /* For a cyclic EF all bits except bit 7 are RFU; b7=1 indicates that */
                                                                /* the INCREASE command is allowed on the selected cyclic file. */
-                                                               file_type = 0x04;       /* SIM_FTYPE_CYCLIC; */
+                                                               file_type = SIM_FTYPE_CYCLIC;
                                                        }
 
                                                        /* bytes 9 to 11 give SIM file access conditions */