diff options
| author |   Aleksander Morgado <aleksander@lanedo.com> | 2013-04-11 15:22:23 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-17 15:19:39 +0200 |
| commit | b8904b3b5285e3a35e9ec0845f8bbca45568cb34 (patch) | |
| tree | 9a4ad33ed20f87a34ca5170b1a0fd8cc2415c23c | |
| parent | 8232d023c178f8c804dd550ca567c5cf64710f93 (diff) | |
mbim-port: no longer needed to request next transaction ID
Already handled by the MbimDevice if none given.
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 12 | ||||
| -rw-r--r-- | src/mm-mbim-port.c | 10 | ||||
| -rw-r--r-- | src/mm-mbim-port.h | 2 | ||||
| -rw-r--r-- | src/mm-sim-mbim.c | 1 |
4 files changed, 3 insertions, 22 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index dfd633e6..49b326b2 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -178,9 +178,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 ( - mbim_device_get_next_transaction_id (device), - NULL)); + message = (mbim_message_basic_connect_device_caps_query_request_new (NULL)); mbim_device_command (device, message, 10, @@ -449,9 +447,7 @@ modem_load_unlock_required (MMIfaceModem *self, modem_load_unlock_required); mm_dbg ("loading unlock required..."); - message = (mbim_message_basic_connect_pin_query_request_new ( - mbim_device_get_next_transaction_id (device), - NULL)); + message = (mbim_message_basic_connect_pin_query_request_new (NULL)); mbim_device_command (device, message, 10, @@ -584,9 +580,7 @@ modem_load_power_state (MMIfaceModem *self, user_data, modem_load_power_state); - message = (mbim_message_basic_connect_radio_state_query_request_new ( - mbim_device_get_next_transaction_id (device), - NULL)); + message = (mbim_message_basic_connect_radio_state_query_request_new (NULL)); mbim_device_command (device, message, 10, diff --git a/src/mm-mbim-port.c b/src/mm-mbim-port.c index d300bf3a..0a5499d1 100644 --- a/src/mm-mbim-port.c +++ b/src/mm-mbim-port.c @@ -31,16 +31,6 @@ struct _MMMbimPortPrivate { /*****************************************************************************/ -guint32 -mm_mbim_port_get_next_transaction_id (MMMbimPort *self) -{ - return (self->priv->mbim_device ? - mbim_device_get_next_transaction_id (self->priv->mbim_device) : - 0); -} - -/*****************************************************************************/ - typedef struct { MMMbimPort *self; GSimpleAsyncResult *result; diff --git a/src/mm-mbim-port.h b/src/mm-mbim-port.h index 434d5834..0a18663e 100644 --- a/src/mm-mbim-port.h +++ b/src/mm-mbim-port.h @@ -58,8 +58,6 @@ gboolean mm_mbim_port_open_finish (MMMbimPort *self, gboolean mm_mbim_port_is_open (MMMbimPort *self); void mm_mbim_port_close (MMMbimPort *self); -guint32 mm_mbim_port_get_next_transaction_id (MMMbimPort *self); - MbimDevice *mm_mbim_port_peek_device (MMMbimPort *self); #endif /* MM_MBIM_PORT_H */ diff --git a/src/mm-sim-mbim.c b/src/mm-sim-mbim.c index 63201e23..8a70ed89 100644 --- a/src/mm-sim-mbim.c +++ b/src/mm-sim-mbim.c @@ -127,7 +127,6 @@ send_pin (MMSim *self, mm_dbg ("Sending PIN..."); message = (mbim_message_basic_connect_pin_set_request_new ( - mbim_device_get_next_transaction_id (device), MBIM_PIN_TYPE_PIN1, MBIM_PIN_OPERATION_ENTER, pin, |