SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem-mbim,sim-mbim: update message creator/parser names

Browse Source 
Sync with libmbim commit:
    commit b73673bf30a82e95819deb17296c9234399f0795
    Author: Aleksander Morgado <aleksander@lanedo.com>
    Date:   Thu Apr 11 20:07:12 2013 +0200

        mbim-codegen: properly define the 4 types of messages that we may have
This commit is contained in:
Aleksander Morgado
2013-04-17 15:19:40 +02:00
parent 67c322361e
commit f6958bb362
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-mbim.c
+12 -12
View File
@@ -122,7 +122,7 @@ device_caps_query_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_device_caps_query_response_parse (
mbim_message_device_caps_response_parse (
response,
NULL, /* device_type */
&ctx->self->priv->caps_cellular_class,
@@ -176,7 +176,7 @@ modem_load_current_capabilities (MMIfaceModem *self,
modem_load_current_capabilities);
mm_dbg ("loading current capabilities...");
message = (mbim_message_basic_connect_device_caps_query_request_new (NULL));
message = mbim_message_device_caps_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -401,7 +401,7 @@ pin_query_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_pin_query_response_parse (
mbim_message_pin_response_parse (
response,
&pin_type,
&pin_state,
@@ -438,7 +438,7 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_subscriber_ready_status_query_response_parse (
mbim_message_subscriber_ready_status_response_parse (
response,
&ready_state,
NULL, /* subscriber_id */
@@ -490,7 +490,7 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
MbimMessage *message;
/* Query which lock is to unlock */
message = (mbim_message_basic_connect_pin_query_request_new (NULL));
message = mbim_message_pin_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -517,7 +517,7 @@ wait_for_sim_ready (LoadUnlockRequiredContext *ctx)
{
MbimMessage *message;
message = mbim_message_basic_connect_subscriber_ready_status_query_request_new (NULL);
message = mbim_message_subscriber_ready_status_query_new (NULL);
mbim_device_command (ctx->device,
message,
10,
@@ -578,7 +578,7 @@ pin_query_unlock_retries_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_pin_query_response_parse (
mbim_message_pin_response_parse (
response,
&pin_type,
NULL,
@@ -617,7 +617,7 @@ modem_load_unlock_retries (MMIfaceModem *self,
user_data,
modem_load_unlock_retries);
message = (mbim_message_basic_connect_pin_query_request_new (NULL));
message = mbim_message_pin_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -653,7 +653,7 @@ own_numbers_subscriber_ready_state_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_subscriber_ready_status_query_response_parse (
mbim_message_subscriber_ready_status_response_parse (
response,
NULL, /* ready_state */
NULL, /* subscriber_id */
@@ -689,7 +689,7 @@ modem_load_own_numbers (MMIfaceModem *self,
user_data,
modem_load_own_numbers);
message = mbim_message_basic_connect_subscriber_ready_status_query_request_new (NULL);
message = mbim_message_subscriber_ready_status_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -740,7 +740,7 @@ radio_state_query_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_radio_state_query_response_parse (
mbim_message_radio_state_response_parse (
response,
&hardware_radio_state,
&software_radio_state,
@@ -782,7 +782,7 @@ modem_load_power_state (MMIfaceModem *self,
user_data,
modem_load_power_state);
message = (mbim_message_basic_connect_radio_state_query_request_new (NULL));
message = mbim_message_radio_state_query_new (NULL);
mbim_device_command (device,
message,
10,
src/mm-sim-mbim.c
+10 -10
View File
@@ -88,7 +88,7 @@ simid_subscriber_ready_state_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_subscriber_ready_status_query_response_parse (
mbim_message_subscriber_ready_status_response_parse (
response,
NULL, /* ready_state */
NULL, /* subscriber_id */
@@ -121,7 +121,7 @@ load_sim_identifier (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, load_sim_identifier);
message = mbim_message_basic_connect_subscriber_ready_status_query_request_new (NULL);
message = mbim_message_subscriber_ready_status_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -156,7 +156,7 @@ imsi_subscriber_ready_state_ready (MbimDevice *device,
response = mbim_device_command_finish (device, res, &error);
if (response &&
mbim_message_command_done_get_result (response, &error) &&
mbim_message_basic_connect_subscriber_ready_status_query_response_parse (
mbim_message_subscriber_ready_status_response_parse (
response,
NULL, /* ready_state */
&subscriber_id,
@@ -189,7 +189,7 @@ load_imsi (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, load_imsi);
message = mbim_message_basic_connect_subscriber_ready_status_query_request_new (NULL);
message = mbim_message_subscriber_ready_status_query_new (NULL);
mbim_device_command (device,
message,
10,
@@ -224,7 +224,7 @@ pin_set_enter_ready (MbimDevice *device,
if (response &&
!mbim_message_command_done_get_result (response, &error)) {
/* Sending PIN failed, build a better error to report */
if (mbim_message_basic_connect_pin_set_response_parse (
if (mbim_message_pin_response_parse (
response,
&pin_type,
&pin_state,
@@ -268,7 +268,7 @@ send_pin (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, send_pin);
mm_dbg ("Sending PIN...");
message = (mbim_message_basic_connect_pin_set_request_new (
message = (mbim_message_pin_set_new (
MBIM_PIN_TYPE_PIN1,
MBIM_PIN_OPERATION_ENTER,
pin,
@@ -316,7 +316,7 @@ puk_set_enter_ready (MbimDevice *device,
if (response &&
!mbim_message_command_done_get_result (response, &error)) {
/* Sending PUK failed, build a better error to report */
if (mbim_message_basic_connect_pin_set_response_parse (
if (mbim_message_pin_response_parse (
response,
&pin_type,
&pin_state,
@@ -361,7 +361,7 @@ send_puk (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, send_puk);
mm_dbg ("Sending PUK...");
message = (mbim_message_basic_connect_pin_set_request_new (
message = (mbim_message_pin_set_new (
MBIM_PIN_TYPE_PUK1,
MBIM_PIN_OPERATION_ENTER,
puk,
@@ -441,7 +441,7 @@ enable_pin (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, send_puk);
mm_dbg ("%s PIN ...", enabled ? "Enabling" : "Disabling");
message = (mbim_message_basic_connect_pin_set_request_new (
message = (mbim_message_pin_set_new (
MBIM_PIN_TYPE_PIN1,
enabled ? MBIM_PIN_OPERATION_ENABLE : MBIM_PIN_OPERATION_DISABLE,
pin,
@@ -521,7 +521,7 @@ change_pin (MMSim *self,
result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, send_puk);
mm_dbg ("Changing PIN");
message = (mbim_message_basic_connect_pin_set_request_new (
message = (mbim_message_pin_set_new (
MBIM_PIN_TYPE_PIN1,
MBIM_PIN_OPERATION_CHANGE,
old_pin,