From 51aecde6cc886797b05ecc516047300fb0dab84c Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 27 Oct 2010 12:10:17 -0500
Subject: [PATCH] stk: Remove ofono_stk_terminal_response_sent_notify

Not needed for now.  We can always put this back in later if need be.
---
 include/stk.h |  3 ---
 src/stk.c     | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/stk.h b/include/stk.h
index 8f548d39..c276c84f 100644
--- a/include/stk.h
+++ b/include/stk.h
@@ -70,9 +70,6 @@ void ofono_stk_proactive_session_end_notify(struct ofono_stk *stk);
 void ofono_stk_proactive_command_handled_notify(struct ofono_stk *stk,
 						int length,
 						const unsigned char *pdu);
-void ofono_stk_terminal_response_sent_notify(struct ofono_stk *stk,
-						int length,
-						const unsigned char *pdu);
 
 #ifdef __cplusplus
 }
diff --git a/src/stk.c b/src/stk.c
index 359f8e45..9a7748ad 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -2411,6 +2411,17 @@ void ofono_stk_proactive_command_handled_notify(struct ofono_stk *stk,
 	struct stk_command *cmd;
 	struct stk_response dummyrsp;
 
+	/*
+	 * Modems send us the proactive command details and terminal responses
+	 * sent by the modem as a response to the command.  Terminal responses
+	 * start with the Command Details CTLV tag (0x81).  We filter terminal
+	 * responses here
+	 */
+	if (length > 0 && pdu[0] == 0x81) {
+		stk_alpha_id_unset(stk);
+		return;
+	}
+
 	stk_proactive_command_cancel(stk);
 
 	cmd = stk_command_new_from_pdu(pdu, length);
@@ -2463,13 +2474,6 @@ void ofono_stk_proactive_command_handled_notify(struct ofono_stk *stk,
 	stk_command_free(cmd);
 }
 
-void ofono_stk_terminal_response_sent_notify(struct ofono_stk *stk,
-						int length,
-						const unsigned char *pdu)
-{
-	stk_alpha_id_unset(stk);
-}
-
 int ofono_stk_driver_register(const struct ofono_stk_driver *d)
 {
 	DBG("driver: %p, name: %s", d, d->name);