[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-34
|
From: |
Pawel Kot |
|
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-34-g2307a7d |
|
Date: |
Fri, 09 Jul 2010 21:55:14 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".
The branch, master has been updated
via 2307a7de0d36c3543fe50b44ba94d3c33de713ea (commit)
via 7a5ddd3b8362264df354dd940d3d74879ddfcc5c (commit)
from 6b452be266b935aa646a1f92dfdacdc134b23a30 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=2307a7de0d36c3543fe50b44ba94d3c33de713ea
commit 2307a7de0d36c3543fe50b44ba94d3c33de713ea
Author: Pawel Kot <address@hidden>
Date: Fri Jul 9 23:52:43 2010 +0200
For GetSMSStatus calculate the sum of SM and ME memories.
diff --git a/ChangeLog b/ChangeLog
index 66326b5..55e0cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
o drop "T" modifier from ATDT because not all phones ignore it
and it prevents the use of direct dialling from phonebooks;
see gnokii man page and GSM 07.07 (Daniele Forsi)
+ o for GetSMSStatus sum messages from ME and SM (PaweÅ Kot)
0.6.29
======
diff --git a/common/phones/atgen.c b/common/phones/atgen.c
index caa606c..c95ca6e 100644
--- a/common/phones/atgen.c
+++ b/common/phones/atgen.c
@@ -1329,6 +1329,25 @@ static gn_error AT_GetSMSFolders(gn_data *data, struct
gn_statemachine *state)
return sm_block_no_retry(GN_OP_GetSMSFolders, data, state);
}
+static gn_error AT_GetSMSStatusInternal(gn_data *data, struct gn_statemachine
*state)
+{
+ gn_error ret;
+
+ if (!data->sms_status)
+ return GN_ERR_INTERNALERROR;
+
+ if (data->memory_status) {
+ ret = AT_SetSMSMemoryType(data->memory_status->memory_type,
state);
+ if (ret != GN_ERR_NONE)
+ return ret;
+ }
+
+ ret = sm_message_send(9, GN_OP_GetSMSStatus, "AT+CPMS?\r", state);
+ if (ret != GN_ERR_NONE)
+ return GN_ERR_NOTREADY;
+ return sm_block_no_retry(GN_OP_GetSMSStatus, data, state);
+}
+
static gn_error AT_GetSMSFolderStatus(gn_data *data, struct gn_statemachine
*state)
{
gn_sms_status smsstatus = {0, 0, 0, 0, GN_MT_XX}, *save_smsstatus;
@@ -1346,7 +1365,7 @@ static gn_error AT_GetSMSFolderStatus(gn_data *data,
struct gn_statemachine *sta
data->sms_status = &smsstatus;
save_memory_status = data->memory_status;
data->memory_status = &memory_status;
- ret = state->driver.functions(GN_OP_GetSMSStatus, data, state);
+ ret = AT_GetSMSStatusInternal(data, state);
data->memory_status = save_memory_status;
data->sms_status = save_smsstatus;
if (ret != GN_ERR_NONE)
@@ -1359,21 +1378,27 @@ static gn_error AT_GetSMSFolderStatus(gn_data *data,
struct gn_statemachine *sta
static gn_error AT_GetSMSStatus(gn_data *data, struct gn_statemachine *state)
{
- gn_error ret;
-
- if (!data->sms_status)
- return GN_ERR_INTERNALERROR;
-
- if (data->memory_status) {
- ret = AT_SetSMSMemoryType(data->memory_status->memory_type,
state);
- if (ret != GN_ERR_NONE)
- return ret;
- }
+ gn_sms_status smsstatus = {0, 0, 0, 0, GN_MT_XX}, *save_smsstatus;
+ gn_memory_status memory_status = {GN_MT_ME, 0, 0}, *save_memory_status;
+ gn_error ret = GN_ERR_NONE;
- ret = sm_message_send(9, GN_OP_GetSMSStatus, "AT+CPMS?\r", state);
+ save_smsstatus = data->sms_status;
+ data->sms_status = &smsstatus;
+ save_memory_status = data->memory_status;
+ data->memory_status = &memory_status;
+ ret = AT_GetSMSStatusInternal(data, state);
if (ret != GN_ERR_NONE)
- return GN_ERR_NOTREADY;
- return sm_block_no_retry(GN_OP_GetSMSStatus, data, state);
+ goto out;
+ save_smsstatus->number = smsstatus.number;
+ data->memory_status->memory_type = GN_MT_SM;
+ ret = AT_GetSMSStatusInternal(data, state);
+ if (ret != GN_ERR_NONE)
+ goto out;
+ save_smsstatus->number += smsstatus.number;
+out:
+ data->memory_status = save_memory_status;
+ data->sms_status = save_smsstatus;
+ return ret;
}
static gn_error AT_SendSMS(gn_data *data, struct gn_statemachine *state)
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=7a5ddd3b8362264df354dd940d3d74879ddfcc5c
commit 2307a7de0d36c3543fe50b44ba94d3c33de713ea
Author: Pawel Kot <address@hidden>
Date: Fri Jul 9 23:52:43 2010 +0200
For GetSMSStatus calculate the sum of SM and ME memories.
diff --git a/ChangeLog b/ChangeLog
index 66326b5..55e0cb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
o drop "T" modifier from ATDT because not all phones ignore it
and it prevents the use of direct dialling from phonebooks;
see gnokii man page and GSM 07.07 (Daniele Forsi)
+ o for GetSMSStatus sum messages from ME and SM (PaweÅ Kot)
0.6.29
======
diff --git a/common/phones/atgen.c b/common/phones/atgen.c
index caa606c..c95ca6e 100644
--- a/common/phones/atgen.c
+++ b/common/phones/atgen.c
@@ -1329,6 +1329,25 @@ static gn_error AT_GetSMSFolders(gn_data *data, struct
gn_statemachine *state)
return sm_block_no_retry(GN_OP_GetSMSFolders, data, state);
}
+static gn_error AT_GetSMSStatusInternal(gn_data *data, struct gn_statemachine
*state)
+{
+ gn_error ret;
+
+ if (!data->sms_status)
+ return GN_ERR_INTERNALERROR;
+
+ if (data->memory_status) {
+ ret = AT_SetSMSMemoryType(data->memory_status->memory_type,
state);
+ if (ret != GN_ERR_NONE)
+ return ret;
+ }
+
+ ret = sm_message_send(9, GN_OP_GetSMSStatus, "AT+CPMS?\r", state);
+ if (ret != GN_ERR_NONE)
+ return GN_ERR_NOTREADY;
+ return sm_block_no_retry(GN_OP_GetSMSStatus, data, state);
+}
+
static gn_error AT_GetSMSFolderStatus(gn_data *data, struct gn_statemachine
*state)
{
gn_sms_status smsstatus = {0, 0, 0, 0, GN_MT_XX}, *save_smsstatus;
@@ -1346,7 +1365,7 @@ static gn_error AT_GetSMSFolderStatus(gn_data *data,
struct gn_statemachine *sta
data->sms_status = &smsstatus;
save_memory_status = data->memory_status;
data->memory_status = &memory_status;
- ret = state->driver.functions(GN_OP_GetSMSStatus, data, state);
+ ret = AT_GetSMSStatusInternal(data, state);
data->memory_status = save_memory_status;
data->sms_status = save_smsstatus;
if (ret != GN_ERR_NONE)
@@ -1359,21 +1378,27 @@ static gn_error AT_GetSMSFolderStatus(gn_data *data,
struct gn_statemachine *sta
static gn_error AT_GetSMSStatus(gn_data *data, struct gn_statemachine *state)
{
- gn_error ret;
-
- if (!data->sms_status)
- return GN_ERR_INTERNALERROR;
-
- if (data->memory_status) {
- ret = AT_SetSMSMemoryType(data->memory_status->memory_type,
state);
- if (ret != GN_ERR_NONE)
- return ret;
- }
+ gn_sms_status smsstatus = {0, 0, 0, 0, GN_MT_XX}, *save_smsstatus;
+ gn_memory_status memory_status = {GN_MT_ME, 0, 0}, *save_memory_status;
+ gn_error ret = GN_ERR_NONE;
- ret = sm_message_send(9, GN_OP_GetSMSStatus, "AT+CPMS?\r", state);
+ save_smsstatus = data->sms_status;
+ data->sms_status = &smsstatus;
+ save_memory_status = data->memory_status;
+ data->memory_status = &memory_status;
+ ret = AT_GetSMSStatusInternal(data, state);
if (ret != GN_ERR_NONE)
- return GN_ERR_NOTREADY;
- return sm_block_no_retry(GN_OP_GetSMSStatus, data, state);
+ goto out;
+ save_smsstatus->number = smsstatus.number;
+ data->memory_status->memory_type = GN_MT_SM;
+ ret = AT_GetSMSStatusInternal(data, state);
+ if (ret != GN_ERR_NONE)
+ goto out;
+ save_smsstatus->number += smsstatus.number;
+out:
+ data->memory_status = save_memory_status;
+ data->sms_status = save_smsstatus;
+ return ret;
}
static gn_error AT_SendSMS(gn_data *data, struct gn_statemachine *state)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
common/phones/atgen.c | 57 +++++++++++++++++++++++++++++++++++-------------
2 files changed, 42 insertions(+), 16 deletions(-)
hooks/post-receive
--
libgnokii and core programs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-34-g2307a7d,
Pawel Kot <=