sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

atmodem: Make sim operations return sim error codes.

This commit is contained in:
Andrzej Zaborowski 2010-07-07 00:39:00 +02:00 committed by Denis Kenzior
parent 30e16fb5ca
commit 79372d26f5
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/atmodem/sim.c
View File

@ -82,8 +82,15 @@ static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
if (!g_at_result_iter_next_hexstring(&iter, &response, &len) ||
(sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92) ||
(sw1 == 0x90 && sw2 != 0x00))
goto error;
(sw1 == 0x90 && sw2 != 0x00)) {
memset(&error, 0, sizeof(error));
error.type = OFONO_ERROR_TYPE_SIM;
error.error = (sw1 << 8) | sw2;
cb(&error, -1, -1, -1, NULL, cbd->data);
return;
}
DBG("crsm_info_cb: %02x, %02x, %i", sw1, sw2, len);
@ -165,9 +172,18 @@ static void at_crsm_read_cb(gboolean ok, GAtResult *result,
g_at_result_iter_next_number(&iter, &sw1);
g_at_result_iter_next_number(&iter, &sw2);
if (!g_at_result_iter_next_hexstring(&iter, &response, &len) ||
(sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
(sw1 == 0x90 && sw2 != 0x00)) {
if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
(sw1 == 0x90 && sw2 != 0x00)) {
memset(&error, 0, sizeof(error));
error.type = OFONO_ERROR_TYPE_SIM;
error.error = (sw1 << 8) | sw2;
cb(&error, NULL, 0, cbd->data);
return;
}
if (!g_at_result_iter_next_hexstring(&iter, &response, &len)) {
CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
return;
}
@ -255,8 +271,10 @@ static void at_crsm_update_cb(gboolean ok, GAtResult *result,
if ((sw1 != 0x90 && sw1 != 0x91 && sw1 != 0x92 && sw1 != 0x9f) ||
(sw1 == 0x90 && sw2 != 0x00)) {
CALLBACK_WITH_FAILURE(cb, cbd->data);
return;
memset(&error, 0, sizeof(error));
error.type = OFONO_ERROR_TYPE_SIM;
error.error = (sw1 << 8) | sw2;
}
DBG("crsm_update_cb: %02x, %02x", sw1, sw2);

20
drivers/atmodem/stk.c
View File

@ -74,11 +74,13 @@ static void at_csim_envelope_cb(gboolean ok, GAtResult *result,
if (rlen != len * 2 || len < 2)
goto error;
if (response[len - 2] != 0x90 && response[len - 2] != 0x91)
goto error;
if ((response[len - 2] != 0x90 && response[len - 2] != 0x91) ||
(response[len - 2] == 0x90 && response[len - 1] != 0)) {
memset(&error, 0, sizeof(error));
if (response[len - 2] == 0x90 && response[len - 1] != 0)
goto error;
error.type = OFONO_ERROR_TYPE_SIM;
error.error = (response[len - 2] << 8) | response[len - 1];
}
DBG("csim_envelope_cb: %i", len);
@ -157,11 +159,13 @@ static void at_csim_terminal_response_cb(gboolean ok, GAtResult *result,
if (rlen != len * 2 || len < 2)
goto error;
if (response[len - 2] != 0x90 && response[len - 2] != 0x91)
goto error;
if ((response[len - 2] != 0x90 && response[len - 2] != 0x91) ||
(response[len - 2] == 0x90 && response[len - 1] != 0)) {
memset(&error, 0, sizeof(error));
if (response[len - 2] == 0x90 && response[len - 1] != 0)
goto error;
error.type = OFONO_ERROR_TYPE_SIM;
error.error = (response[len - 2] << 8) | response[len - 1];
}
DBG("csim_terminal_response_cb: %i", len);