summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulK <contact@paulk.fr>2012-03-29 20:49:24 +0200
committerPaulK <contact@paulk.fr>2012-03-29 20:49:24 +0200
commit41d701cf73b78631f2582339eac09b09e9a55518 (patch)
tree2ade95656c834b32cce0957ec96c8f33ca93d1c5
parentee639a43dab5b0da6fd701eb94db06eb65625257 (diff)
downloadhardware_replicant_libsamsung-ril-41d701cf73b78631f2582339eac09b09e9a55518.tar.gz
hardware_replicant_libsamsung-ril-41d701cf73b78631f2582339eac09b09e9a55518.tar.bz2
hardware_replicant_libsamsung-ril-41d701cf73b78631f2582339eac09b09e9a55518.zip
Removed unused code realted to SIM and typo on SMS
-rw-r--r--samsung-ril.h1
-rw-r--r--sec.c10
-rw-r--r--sms.c4
3 files changed, 4 insertions, 11 deletions
diff --git a/samsung-ril.h b/samsung-ril.h
index 6eb2ba8..52a42dc 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -167,7 +167,6 @@ typedef enum {
struct ril_state {
RIL_RadioState radio_state;
-// RIL_CardStatus card_status;
SIM_Status sim_status;
Modem_PowerMode power_mode;
diff --git a/sec.c b/sec.c
index fbe59d2..46856ca 100644
--- a/sec.c
+++ b/sec.c
@@ -279,10 +279,7 @@ void ril_request_get_sim_status(RIL_Token t)
LOGD("Got RILJ request for UNSOL data");
hex_dump(&(ril_state.sim_pin_status), sizeof(struct ipc_sec_pin_status_response));
pin_status = &(ril_state.sim_pin_status);
-/*
- sim_status = ipc2ril_sim_status(pin_status);
- ril_state_update(sim_status);
-*/
+
ipc2ril_card_status(pin_status, &card_status);
RIL_onRequestComplete(t, RIL_E_SUCCESS, &card_status, sizeof(RIL_CardStatus));
@@ -299,10 +296,7 @@ void ril_request_get_sim_status(RIL_Token t)
LOGE("Another request is going on, returning UNSOL data");
pin_status = &(ril_state.sim_pin_status);
-/*
- sim_status = ipc2ril_sim_status(pin_status);
- ril_state_update(sim_status);
-*/
+
ipc2ril_card_status(pin_status, &card_status);
RIL_onRequestComplete(t, RIL_E_SUCCESS, &card_status, sizeof(card_status));
}
diff --git a/sms.c b/sms.c
index 25cc69f..c594a3b 100644
--- a/sms.c
+++ b/sms.c
@@ -425,7 +425,7 @@ pdu_end:
/* Fill the IPC structure part of the message */
send_msg.type = IPC_SMS_TYPE_OUTGOING;
- send_msg.msg_type = send_msg_type;
+ send_msg.msg_type = send_msg_type;
send_msg.length = (unsigned char) (pdu_dec_len + smsc_len + 1);
send_msg.smsc_len = smsc_len;
@@ -433,7 +433,7 @@ pdu_end:
p = data;
memcpy(p, &send_msg, send_msg_len);
p += send_msg_len;
- memcpy(p, (char *) (smsc + 1), smsc_len);
+ memcpy(p, (char *) (smsc + 1), smsc_len); // First SMSC bytes is length
p += smsc_len;
memcpy(p, pdu_dec, pdu_dec_len);