Fix SMS CMT for ril v2.
Change-Id: I95a289df6ab4d14dd23f3a7ebaa8183862d44de0
diff --git a/mbtk/libmbtk_lib/ril/inc/mbtk_ril.h b/mbtk/libmbtk_lib/ril/inc/mbtk_ril.h
old mode 100644
new mode 100755
index e7971b2..3631b67
--- a/mbtk/libmbtk_lib/ril/inc/mbtk_ril.h
+++ b/mbtk/libmbtk_lib/ril/inc/mbtk_ril.h
@@ -208,7 +208,7 @@
RIL_MSG_ID_IND_NET_REG_STATE_CHANGE,
// <uint8> State
RIL_MSG_ID_IND_CALL_STATE_CHANGE,
- // <uint8> State
+ // mbtk_ril_sms_state_info_t
RIL_MSG_ID_IND_SMS_STATE_CHANGE,
// mbtk_ril_radio_state_info_t
RIL_MSG_ID_IND_RADIO_STATE_CHANGE,
diff --git a/mbtk/libmbtk_lib/ril/v2/mbtk_ril_api.c b/mbtk/libmbtk_lib/ril/v2/mbtk_ril_api.c
index 9c14459..05f9def 100755
--- a/mbtk/libmbtk_lib/ril/v2/mbtk_ril_api.c
+++ b/mbtk/libmbtk_lib/ril/v2/mbtk_ril_api.c
@@ -19,7 +19,7 @@
typedef struct {
ATPortType_enum port;
- bool enable;
+// bool enable;
int open_count;
} ril_at_port_info_t;
@@ -444,7 +444,7 @@
return FALSE;
}
- return ril_cli.ports[port].port == port && ril_cli.ports[port].enable;
+ return ril_cli.ports[port].port == port && ril_cli.ports[port].open_count > 0;
}
mbtk_ril_handle* mbtk_ril_open(ATPortType_enum port)
@@ -462,7 +462,7 @@
return &(ril_cli.ports[port]);
} else {
ril_cli.ports[port].port = port;
- ril_cli.ports[port].enable = TRUE;
+ // ril_cli.ports[port].enable = TRUE;
ril_cli.ports[port].open_count++;
return &(ril_cli.ports[port]);
}
@@ -552,12 +552,12 @@
// Auto open default port.
ril_cli.ports[MBTK_AT_PORT_DEF].port = MBTK_AT_PORT_DEF;
- ril_cli.ports[MBTK_AT_PORT_DEF].enable = TRUE;
+ //ril_cli.ports[MBTK_AT_PORT_DEF].enable = TRUE;
ril_cli.ports[MBTK_AT_PORT_DEF].open_count++;
if(port != MBTK_AT_PORT_DEF) {
ril_cli.ports[port].port = port;
- ril_cli.ports[port].enable = TRUE;
+ //ril_cli.ports[port].enable = TRUE;
ril_cli.ports[port].open_count++;
return &(ril_cli.ports[port]);
} else {
@@ -597,14 +597,15 @@
}
LOGD("Will close port %d", port);
- ril_cli.ports[port].enable = FALSE;
+ // ril_cli.ports[port].enable = FALSE;
ril_cli.ports[port].port = ATPORTTYPE_NON;
ril_cli.ports[port].open_count = 0;
// All port is close ???
int i = ATPORTTYPE_0;
for(; i < ATPORTTYPE_NUM; i++) {
- if(ril_cli.ports[i].enable)
+ //if(ril_cli.ports[i].enable)
+ if(ril_cli.ports[i].open_count > 0)
break;
}