qmi: Remove qmi_free()
PATCH v2 1/33 qmi: Remove qmi_free()
This was just a simple wrapper around l_free, get rid of it.
--- drivers/qmimodem/devinfo.c | 8 ++++---- drivers/qmimodem/qmi.c | 5 ----- drivers/qmimodem/qmi.h | 2 -- drivers/qmimodem/sim-legacy.c | 6 +++--- drivers/qmimodem/sim.c | 2 +- 5 files changed, 8 insertions(+), 15 deletions(-)
drivers/qmimodem/devinfo.c +4 -4
@@ -45,7 +45,7 @@ static void string_cb(struct qmi_result *result, void *user_data)CALLBACK_WITH_SUCCESS (cb, str, cbd->data); -qmi_free (str); +l_free (str); } static void qmi_query_manufacturer(struct ofono_devinfo *devinfo,
@@ -136,9 +136,9 @@ static void get_ids_cb(struct qmi_result *result, void *user_data)else CALLBACK_WITH_FAILURE (cb,NULL , cbd->data); -qmi_free (esn); -qmi_free (imei); -qmi_free (meid); +l_free (esn); +l_free (imei); +l_free (meid); } static void qmi_query_serial(struct ofono_devinfo *devinfo,
drivers/qmimodem/qmi.c +0 -5
@@ -181,11 +181,6 @@ struct qmi_tlv_hdr { } __attribute__ ((packed));#define QMI_TLV_HDR_SIZE 3 -void qmi_free (void *ptr) -{ -l_free (ptr); -} -static bool qmi_service_info_matches (const void *data,const void *user) {const struct qmi_service_info *info = data;
drivers/qmimodem/qmi.h +0 -2
@@ -56,8 +56,6 @@ enum qmi_data_endpoint_type { QMI_DATA_ENDPOINT_TYPE_BAM_DMUX = 0x05, }; -void qmi_free (void *ptr); -typedef void (*qmi_destroy_func_t )(void *user_data);
drivers/qmimodem/sim-legacy.c +3 -3
@@ -71,14 +71,14 @@ static void get_iccid_cb(struct qmi_result *result, void *user_data) len =strlen (str);if (len >20 ) { -qmi_free (str); +l_free (str);CALLBACK_WITH_FAILURE (cb,NULL ,0 , cbd->data);return ; }sim_encode_bcd_number (str, iccid); iccid_len = len /2 ; -qmi_free (str); +l_free (str);CALLBACK_WITH_SUCCESS (cb, iccid, iccid_len, cbd->data); }
@@ -128,7 +128,7 @@ static void get_imsi_cb(struct qmi_result *result, void *user_data)CALLBACK_WITH_SUCCESS (cb, str, cbd->data); -qmi_free (str); +l_free (str); } static void qmi_read_imsi(struct ofono_sim *sim,
drivers/qmimodem/sim.c +1 -1
@@ -427,7 +427,7 @@ static void get_imsi_cb(struct qmi_result *result, void *user_data)CALLBACK_WITH_SUCCESS (cb, str, cbd->data); -qmi_free (str); +l_free (str); } static void qmi_read_imsi(struct ofono_sim *sim,
Signature · 1 line
2.45.0
PATCH v2 2/33 qmi: Rename qmi_result_func_t
to qmi_service_result_func_t to be more consistent.
--- drivers/qmimodem/call-settings.c | 2 +- drivers/qmimodem/qmi.c | 8 ++++---- drivers/qmimodem/qmi.h | 12 +++++------- drivers/qmimodem/sms.c | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-)
drivers/qmimodem/call-settings.c +1 -1
@@ -24,7 +24,7 @@ struct call_settings_data { };static void query_status (struct ofono_call_settings *cs,uint16_t message, -qmi_result_func_t fn, +qmi_service_result_func_t fn,ofono_call_settings_status_cb_t cb,void *data) {struct call_settings_data *csd =ofono_call_settings_get_data (cs);
drivers/qmimodem/qmi.c +4 -4
@@ -141,7 +141,7 @@ struct qmi_notify {uint16_t id;uint16_t message;unsigned int service_handle; -qmi_result_func_t callback; +qmi_service_result_func_t callback;void *user_data;qmi_destroy_func_t destroy; };
@@ -2678,7 +2678,7 @@ bool qmi_service_get_version(struct qmi_service *service, }struct service_send_data { -qmi_result_func_t func; +qmi_service_result_func_t func;void *user_data;qmi_destroy_func_t destroy; };
@@ -2722,7 +2722,7 @@ done:uint16_t qmi_service_send (struct qmi_service *service,uint16_t message,struct qmi_param *param, -qmi_result_func_t func, +qmi_service_result_func_t func,void *user_data,qmi_destroy_func_t destroy) {struct qmi_device *device;
@@ -2838,7 +2838,7 @@ static bool qmi_service_cancel_all(struct qmi_service *service) }uint16_t qmi_service_register (struct qmi_service *service, -uint16_t message,qmi_result_func_t func, +uint16_t message,qmi_service_result_func_t func,void *user_data,qmi_destroy_func_t destroy) {struct qmi_notify *notify;
drivers/qmimodem/qmi.h +5 -7
@@ -60,11 +60,14 @@ typedef void (*qmi_destroy_func_t)(void *user_data);struct qmi_device ; +struct qmi_result ;typedef void (*qmi_debug_func_t )(const char *str,void *user_data);typedef void (*qmi_shutdown_func_t )(void *user_data);typedef void (*qmi_discover_func_t )(void *user_data); +typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *); +void qmi_device_free (struct qmi_device *device); void qmi_device_set_debug(struct qmi_device *device,
@@ -105,9 +108,6 @@ struct qmi_param *qmi_param_new_uint8(uint8_t type, uint8_t value);struct qmi_param *qmi_param_new_uint16 (uint8_t type,uint16_t value);struct qmi_param *qmi_param_new_uint32 (uint8_t type,uint32_t value); - -struct qmi_result ; -bool qmi_result_set_error (struct qmi_result *result,uint16_t *error);const char *qmi_result_get_error (struct qmi_result *result);
@@ -130,8 +130,6 @@ int qmi_error_to_ofono_cme(int qmi_error);struct qmi_service ; -typedef void (*qmi_result_func_t )(struct qmi_result *result,void *user_data); -typedef void (*qmi_create_func_t )(struct qmi_service *service,void *user_data); bool qmi_service_create_shared(struct qmi_device *device,
@@ -146,11 +144,11 @@ bool qmi_service_get_version(struct qmi_service *service,uint16_t qmi_service_send (struct qmi_service *service,uint16_t message,struct qmi_param *param, -qmi_result_func_t func, +qmi_service_result_func_t func,void *user_data,qmi_destroy_func_t destroy);bool qmi_service_cancel (struct qmi_service *service,uint16_t id);uint16_t qmi_service_register (struct qmi_service *service, -uint16_t message,qmi_result_func_t func, +uint16_t message,qmi_service_result_func_t func,void *user_data,qmi_destroy_func_t destroy);bool qmi_service_unregister (struct qmi_service *service,uint16_t id);
drivers/qmimodem/sms.c +1 -1
@@ -353,7 +353,7 @@ static void delete_msg(struct ofono_sms *sms, uint8_t tag) {struct sms_data *data =ofono_sms_get_data (sms);struct qmi_param *param; -qmi_result_func_t func =NULL ; +qmi_service_result_func_t func =NULL ;DBG ("" );
Signature · 1 line
2.45.0
PATCH v2 3/33 qmi: Drop unused major/minor information
In reply to Denis KenziorQMI radio-settings, ussd and voicecall atoms request and store the service version major/minor numbers, but never use this information. Remove this functionality until needed.
--- drivers/qmimodem/radio-settings.c | 4 ---- drivers/qmimodem/ussd.c | 3 --- drivers/qmimodem/voicecall.c | 4 ---- 3 files changed, 11 deletions(-)
drivers/qmimodem/radio-settings.c +0 -4
@@ -21,8 +21,6 @@struct settings_data {struct qmi_service *nas;struct qmi_service *dms; -uint16_t major; -uint16_t minor; }; static void get_system_selection_pref_cb(struct qmi_result *result,
@@ -211,8 +209,6 @@ static int qmi_radio_settings_probev(struct ofono_radio_settings *rs, data->dms = dms; data->nas = nas; -qmi_service_get_version (data->nas, &data->major, &data->minor); -ofono_radio_settings_set_data (rs, data);return 0 ;
drivers/qmimodem/ussd.c +0 -3
@@ -24,8 +24,6 @@struct ussd_data {struct qmi_service *voice; -uint16_t major; -uint16_t minor; };static int validate_ussd_data (const struct qmi_ussd_data *data,uint16_t size)
@@ -156,7 +154,6 @@ static int qmi_ussd_probe(struct ofono_ussd *ussd, data = l_new(struct ussd_data, 1); data->voice = voice; -qmi_service_get_version (data->voice, &data->major, &data->minor);qmi_service_register (data->voice,QMI_VOICE_USSD_IND , async_ind, ussd,NULL ); qmi_service_register(data->voice, QMI_VOICE_ASYNC_ORIG_USSD,
drivers/qmimodem/voicecall.c +0 -4
@@ -24,8 +24,6 @@struct voicecall_data {struct qmi_service *voice; -uint16_t major; -uint16_t minor;struct l_queue *call_list;struct ofono_phone_number dialed;char *full_dtmf;
@@ -721,8 +719,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc, data->voice = voice; data->call_list =l_queue_new (); -qmi_service_get_version (data->voice, &data->major, &data->minor); -qmi_service_register (data->voice,QMI_VOICE_ALL_CALL_STATUS_IND , all_call_status_ind, vc,NULL );
Signature · 1 line
2.45.0
PATCH v2 4/33 qmi: Add qmi_qrtr_node_get_service
In reply to Denis KenziorIntroduce a new method that will return a qmi_service object handle immediately, if possible. This allows the lightweight service handles to be obtained without requiring the caller to provide a callback function and waiting for the event loop to invoke it. On QRTR, the underlying socket can access all services directly without needing to exchange any messages to allocate a client for that service first, as done by QMUX using QMI_CTL_GET_CLIENT_ID.
--- drivers/qmimodem/qmi.c | 26 ++++++++++++++++++++++++++ drivers/qmimodem/qmi.h | 7 ++++--- 2 files changed, 30 insertions(+), 3 deletions(-)
drivers/qmimodem/qmi.c +26 -0
@@ -2332,6 +2332,32 @@ struct qmi_device *qmi_device_new_qrtr(void)return &qrtr->super; } +struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device, +uint32_t type) +{ +struct service_family *family; +const struct qmi_service_info *info; + +if (!device) +return NULL ; + +if (type ==QMI_SERVICE_CONTROL ) +return NULL ; + + family =l_hashmap_lookup (device->family_list,L_UINT_TO_PTR (type)); +if (family) + goto done; + + info =__find_service_info_by_type (device, type); +if (!info) +return NULL ; + + family =service_family_create (device, info,0 ); +l_hashmap_insert (device->family_list,L_UINT_TO_PTR (type), family); +done: +return service_create (family); +} +struct qmi_param *qmi_param_new (void ) { return l_new(struct qmi_param, 1);
drivers/qmimodem/qmi.h +4 -3
@@ -58,9 +58,9 @@ enum qmi_data_endpoint_type {typedef void (*qmi_destroy_func_t )(void *user_data); -struct qmi_device ;struct qmi_result ; +struct qmi_service ;typedef void (*qmi_debug_func_t )(const char *str,void *user_data);typedef void (*qmi_shutdown_func_t )(void *user_data);
@@ -90,6 +90,9 @@ bool qmi_device_set_expected_data_format(struct qmi_device *device,struct qmi_device *qmi_device_new_qmux (const char *device);struct qmi_device *qmi_device_new_qrtr (void ); +struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device, +uint32_t type); +struct qmi_param ;struct qmi_param *qmi_param_new (void );
@@ -128,8 +131,6 @@ void qmi_result_print_tlvs(struct qmi_result *result);int qmi_error_to_ofono_cme (int qmi_error); -struct qmi_service ; -typedef void (*qmi_create_func_t )(struct qmi_service *service,void *user_data); bool qmi_service_create_shared(struct qmi_device *device,
Signature · 1 line
2.45.0
PATCH v2 5/33 plugins: Add new qrtrqmi modem driver
In reply to Denis KenziorThis driver will be used for QRTR based devices (MHI bus and SoC)
--- Makefile.am | 1 + plugins/qrtrqmi.c | 430 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 431 insertions(+) create mode 100644 plugins/qrtrqmi.c
Makefile.am +1 -0
@@ -387,6 +387,7 @@ builtin_sources += $(qmi_sources) \ drivers/qmimodem/call-forwarding.c builtin_sources += plugins/gobi.c +builtin_sources += plugins/qrtrqmi.c endif if MBIMMODEM
plugins/qrtrqmi.c new file +430 -0
430 lines not on this page · raw message
Signature · 1 line
2.45.0
PATCH v2 6/33 gobi: Use correct attribute name in docs
In reply to Denis KenziorThe name should be NetworkInterfaceKernelDriver, not NetworkInterfaceDriver.
--- plugins/gobi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
plugins/gobi.c +1 -1
@@ -112,7 +112,7 @@ static void gobi_debug(const char *str, void *user_data)* NetworkInterfaceIndex * The index of the main interface given by NetworkInterface * -* NetworkInterfaceDriver +* NetworkInterfaceKernelDriver * The kernel driver that is being used by the main network device. Certain * drivers such as 'qmi_wwan' or 'qmi_wwan_q' are treated specifically. *
Signature · 1 line
2.45.0
PATCH v2 7/33 udevng: Use new qrtrqmi driver for MHI and SoC modems
In reply to Denis KenziorThe new qrtrqmi driver only supports QRTR based devices, so drop the use of DeviceProtocol modem attribute.
--- plugins/udevng.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
plugins/udevng.c +4 -5
@@ -278,8 +278,7 @@ static int setup_qmi_qrtr(struct modem_info *modem,return -ENOTSUP ; } -ofono_modem_set_driver (modem->modem,"gobi" ); -ofono_modem_set_string (modem->modem,"DeviceProtocol" ,"qrtr" ); +ofono_modem_set_driver (modem->modem,"qrtrqmi" );return setup_qmi_netdev (modem, net); }
@@ -309,7 +308,7 @@ static gboolean setup_gobi_qrtr_premux(struct modem_info *modem,return TRUE; } -static gboolean setup_gobi_qrtr (struct modem_info *modem) +static gboolean setup_qrtrsoc (struct modem_info *modem) {const struct device_info *ipa_info =NULL ;int premux_count =0 ;
@@ -1798,7 +1797,7 @@ static struct { { "wavecom", setup_wavecom }, { "tc65", setup_tc65 }, { "ehs6", setup_ehs6 }, - { "gobiqrtr", setup_gobi_qrtr }, + { "qrtrsoc", setup_qrtrsoc }, { "mhi", setup_mhi }, { } };
@@ -2487,7 +2486,7 @@ static void check_net_device(struct udev_device *device)/* Collect all rmnet devices with this iflink under a common path. */ sprintf (path,"/embedded/qrtr/%s" , iflink); -add_device (path,NULL ,"gobiqrtr" ,NULL ,NULL ,MODEM_TYPE_EMBEDDED , +add_device (path,NULL ,"qrtrsoc" ,NULL ,NULL ,MODEM_TYPE_EMBEDDED , device,"qrtr" ); }
Signature · 1 line
2.45.0
PATCH v2 8/33 gobi: Remove qrtr support
In reply to Denis KenziorQRTR based devices will now be managed by the qrtrqmi driver.
--- plugins/gobi.c | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-)
plugins/gobi.c +4 -34
@@ -55,11 +55,6 @@#define GOBI_VOICE (1 << 6)#define GOBI_WDA (1 << 7) -enum qmi_protocol { -QMI_PROTOCOL_QMUX , -QMI_PROTOCOL_QRTR , -}; -struct service_request {struct qmi_service **member;uint32_t service_type;
@@ -87,7 +82,6 @@ struct gobi_data {char main_net_name[IFNAMSIZ ];uint32_t max_aggregation_size;uint32_t set_powered_id; -enum qmi_protocol protocol; };static void gobi_debug (const char *str,void *user_data)
@@ -101,10 +95,6 @@ static void gobi_debug(const char *str, void *user_data)* Probe the modem. The following modem properties are expected to be set * in order to initialize the driver properly: * -* DeviceProtocol -* Can be "qrtr" or "qmux", tells the driver which QMI encapsulation protocol -* is being used. -* * NetworkInterface * The string that contains the 'main' network device. This can be * "rmnet_ipa" on SoC systems, or "wwan0" for upstream linux systems.
@@ -122,8 +112,6 @@ static void gobi_debug(const char *str, void *user_data)static int gobi_probe (struct ofono_modem *modem) {struct gobi_data *data; -const char *value; -enum qmi_protocol protocol;const char *if_driver;const char *ifname;int ifindex;
@@ -131,15 +119,6 @@ static int gobi_probe(struct ofono_modem *modem)DBG ("%p" , modem); - value =ofono_modem_get_string (modem,"DeviceProtocol" ); - -if (l_streq0 (value,"qrtr" )) - protocol =QMI_PROTOCOL_QRTR ; -else if (l_streq0 (value,"qmux" )) - protocol =QMI_PROTOCOL_QMUX ; -else -return -EPROTO ; - if_driver =ofono_modem_get_string (modem,"NetworkInterfaceKernelDriver" ); ifname =ofono_modem_get_string (modem,"NetworkInterface" );
@@ -152,7 +131,6 @@ static int gobi_probe(struct ofono_modem *modem)return -EPROTO ; data = l_new(struct gobi_data, 1); - data->protocol = protocol;if (!strcmp (if_driver,"qmi_wwan_q" )) data->using_qmi_wwan_q = true;
@@ -519,19 +497,11 @@ static int gobi_enable(struct ofono_modem *modem)DBG ("%p" , modem); -switch (data->protocol) { -case QMI_PROTOCOL_QRTR : - data->device =qmi_device_new_qrtr (); -break ; -case QMI_PROTOCOL_QMUX : - device =ofono_modem_get_string (modem,"Device" ); -if (!device) -return -EINVAL ; - - data->device =qmi_device_new_qmux (device); -break ; - } + device =ofono_modem_get_string (modem,"Device" ); +if (!device) +return -EINVAL ; + data->device =qmi_device_new_qmux (device);if (!data->device)return -EIO ;
Signature · 1 line
2.45.0
PATCH v2 9/33 udevng: Do not set DeviceProtocol
In reply to Denis KenziorThis attribute is no longer used by the gobi driver.
--- plugins/udevng.c | 1 - 1 file changed, 1 deletion(-)
plugins/udevng.c +0 -1
@@ -252,7 +252,6 @@ static int setup_qmi_qmux(struct modem_info *modem,ofono_modem_set_driver (modem->modem,"gobi" );ofono_modem_set_string (modem->modem,"Device" , qmi->devnode); -ofono_modem_set_string (modem->modem,"DeviceProtocol" ,"qmux" );ofono_modem_set_string (modem->modem,"InterfaceNumber" , net->number);ofono_modem_set_string (modem->modem,"Bus" ,"usb" );
Signature · 1 line
2.45.0
PATCH v2 10/33 unit: Rename device to node
In reply to Denis KenziorThis better reflects the terminology on the QRTR bus
--- unit/test-qmimodem-qmi.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
unit/test-qmimodem-qmi.c +14 -14
@@ -32,7 +32,7 @@struct test_info {int service_fds[TEST_SERVICE_COUNT ]; -struct qmi_device *device; +struct qmi_device *node;struct l_timeout *timeout;struct l_queue *services;
@@ -153,11 +153,11 @@ static struct test_info *test_setup(void) info = l_new(struct test_info, 1);setup_test_qrtr_services (info); - info->device =qmi_device_new_qrtr (); -assert (info->device); + info->node =qmi_device_new_qrtr (); +assert (info->node);/* Enable ofono logging */ -qmi_device_set_debug (info->device, debug_log,NULL ); +qmi_device_set_debug (info->node, debug_log,NULL ); info->services =l_queue_new (); info->timeout = l_timeout_create(TEST_TIMEOUT, test_timeout_cb, info,
@@ -174,7 +174,7 @@ static void test_cleanup(struct test_info *info)l_timeout_remove (info->timeout);l_queue_destroy (info->services, (l_queue_destroy_func_t ) qmi_service_free); -qmi_device_free (info->device); +qmi_device_free (info->node);/* The qrtr services will be destroyed automatically. */ for (i =0 ; i <TEST_SERVICE_COUNT ; ++i)
@@ -185,7 +185,7 @@ static void test_cleanup(struct test_info *info)l_main_exit (); } -static void test_create_qrtr_device (const void *data) +static void test_create_qrtr_node (const void *data) {struct test_info *info =test_setup ();
@@ -201,7 +201,7 @@ static void discovery_complete_cb(void *user_data)static void perform_discovery (struct test_info *info) { -qmi_device_discover (info->device, discovery_complete_cb, info,NULL ); +qmi_device_discover (info->node, discovery_complete_cb, info,NULL );while (!info->discovery_callback_called)l_main_iterate (-1 );
@@ -246,7 +246,7 @@ static void test_create_services(const void *data)uint16_t major, minor; service_type =unique_service_type (i); -assert (qmi_service_create_shared (info->device, service_type, +assert (qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work ();
@@ -266,7 +266,7 @@ static void test_create_services(const void *data)* call the callback. */ service_type =unique_service_type (TEST_SERVICE_COUNT ); -assert (!qmi_service_create_shared (info->device, service_type, +assert (!qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work ();assert (l_queue_isempty (info->services));
@@ -275,7 +275,7 @@ static void test_create_services(const void *data) service_type =unique_service_type (0 );for (i =0 ; i <L_ARRAY_SIZE (services); i++) { -assert (qmi_service_create_shared (info->device, service_type, +assert (qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work ();
@@ -455,7 +455,7 @@ static void test_send_data(const void *data)perform_discovery (info); service_type =unique_service_type (0 );/* Use the first service */ -assert (qmi_service_create_shared (info->device, service_type, +assert (qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work (); service =l_queue_pop_head (info->services);
@@ -505,7 +505,7 @@ static void test_notifications(const void *data)perform_discovery (info); service_type =unique_service_type (0 );/* Use the first service */ -assert (qmi_service_create_shared (info->device, service_type, +assert (qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work (); service =l_queue_pop_head (info->services);
@@ -567,7 +567,7 @@ static void test_service_notification_independence(const void *data)l_io_set_read_handler (io, received_data, info,NULL );for (i =0 ; i <L_ARRAY_SIZE (services); i++) { -assert (qmi_service_create_shared (info->device, service_type, +assert (qmi_service_create_shared (info->node, service_type, create_service_cb, info,NULL ));perform_all_pending_work (); services[i] =l_queue_pop_head (info->services);
@@ -623,7 +623,7 @@ int main(int argc, char **argv)__ofono_log_init (argv[0 ],"*" , FALSE);l_test_init (&argc, &argv); -l_test_add ("QRTR device creation" , test_create_qrtr_device,NULL ); +l_test_add ("QRTR node creation" , test_create_qrtr_node,NULL );l_test_add ("QRTR discovery" , test_discovery,NULL );l_test_add ("QRTR services may be created" , test_create_services,NULL );l_test_add ("QRTR service sends/responses" , test_send_data,NULL );
Signature · 1 line
2.45.0
PATCH v2 11/33 qmi: Rename qmi_device_new_qrtr to qmi_qrtr_node_new
In reply to Denis KenziorThis better reflects the terminology used on the QRTR bus. A 'node' parameter is introduced. It is currently unused, but in the future will be used to specify which node is being addressed by the created object.
--- drivers/qmimodem/qmi.c | 2 +- drivers/qmimodem/qmi.h | 2 +- plugins/qrtrqmi.c | 2 +- unit/test-qmimodem-qmi.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/qmimodem/qmi.c +1 -1
@@ -2310,7 +2310,7 @@ static const struct qmi_device_ops qrtr_ops = { .destroy = qmi_device_qrtr_destroy, }; -struct qmi_device *qmi_device_new_qrtr (void ) +struct qmi_device *qmi_qrtr_node_new (uint32_t node) {struct qmi_device_qrtr *qrtr;int fd;
drivers/qmimodem/qmi.h +1 -1
@@ -88,8 +88,8 @@ bool qmi_device_set_expected_data_format(struct qmi_device *device, enum qmi_device_expected_data_format format);struct qmi_device *qmi_device_new_qmux (const char *device); -struct qmi_device *qmi_device_new_qrtr (void ); +struct qmi_device *qmi_qrtr_node_new (uint32_t node);struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type);
plugins/qrtrqmi.c +1 -1
@@ -208,7 +208,7 @@ static int qrtrqmi_enable(struct ofono_modem *modem)DBG ("%p" , modem); - data->node =qmi_device_new_qrtr (); + data->node =qmi_qrtr_node_new (0 );if (!data->node)return -EIO ;
unit/test-qmimodem-qmi.c +1 -1
@@ -153,7 +153,7 @@ static struct test_info *test_setup(void) info = l_new(struct test_info, 1);setup_test_qrtr_services (info); - info->node =qmi_device_new_qrtr (); + info->node =qmi_qrtr_node_new (0 );assert (info->node);/* Enable ofono logging */
Signature · 1 line
2.45.0
PATCH v2 12/33 qmi: Rename qmi_device_new_qmux to qmi_qmux_device_new
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 2 +- drivers/qmimodem/qmi.h | 3 +-- plugins/gobi.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/qmimodem/qmi.c +1 -1
@@ -1991,7 +1991,7 @@ static const struct qmi_device_ops qmux_ops = { .destroy = qmi_device_qmux_destroy, }; -struct qmi_device *qmi_device_new_qmux (const char *device) +struct qmi_device *qmi_qmux_device_new (const char *device) {struct qmi_device_qmux *qmux;int fd;
drivers/qmimodem/qmi.h +1 -2
@@ -68,6 +68,7 @@ typedef void (*qmi_discover_func_t)(void *user_data);typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *); +struct qmi_device *qmi_qmux_device_new (const char *device);void qmi_device_free (struct qmi_device *device); void qmi_device_set_debug(struct qmi_device *device,
@@ -87,8 +88,6 @@ enum qmi_device_expected_data_format qmi_device_get_expected_data_format(bool qmi_device_set_expected_data_format (struct qmi_device *device,enum qmi_device_expected_data_format format); -struct qmi_device *qmi_device_new_qmux (const char *device); -struct qmi_device *qmi_qrtr_node_new (uint32_t node);struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type);
plugins/gobi.c +1 -1
@@ -501,7 +501,7 @@ static int gobi_enable(struct ofono_modem *modem)if (!device)return -EINVAL ; - data->device =qmi_device_new_qmux (device); + data->device =qmi_qmux_device_new (device);if (!data->device)return -EIO ;
Signature · 1 line
2.45.0
PATCH v2 13/33 unit: Drop use of qmi_service_create_shared
In reply to Denis Kenzior--- unit/test-qmimodem-qmi.c | 47 +++++++--------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-)
unit/test-qmimodem-qmi.c +8 -39
@@ -34,7 +34,6 @@ struct test_info {int service_fds[TEST_SERVICE_COUNT ];struct qmi_device *node;struct l_timeout *timeout; -struct l_queue *services;/* Data sent to our test service */ struct sockaddr_qrtr sender;
@@ -159,7 +158,6 @@ static struct test_info *test_setup(void)/* Enable ofono logging */ qmi_device_set_debug (info->node, debug_log,NULL ); - info->services =l_queue_new (); info->timeout =l_timeout_create (TEST_TIMEOUT , test_timeout_cb, info,NULL );
@@ -172,8 +170,6 @@ static void test_cleanup(struct test_info *info)l_free (info->received);l_timeout_remove (info->timeout); -l_queue_destroy (info->services, - (l_queue_destroy_func_t ) qmi_service_free);qmi_device_free (info->node);/* The qrtr services will be destroyed automatically. */
@@ -216,13 +212,6 @@ static void test_discovery(const void *data)test_cleanup (info); } -static void create_service_cb (struct qmi_service *service,void *user_data) -{ -struct test_info *info = user_data; - -l_queue_push_tail (info->services, service); -} -/* Callbacks could queue other callbacks so continue until there are no more. */ static void perform_all_pending_work (void ) {
@@ -246,12 +235,7 @@ static void test_create_services(const void *data)uint16_t major, minor; service_type =unique_service_type (i); -assert (qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); - -assert (l_queue_length (info->services) ==1 ); - service =l_queue_pop_head (info->services); + service =qmi_qrtr_node_get_service (info->node, service_type);assert (service);assert (qmi_service_get_version (service, &major, &minor));
@@ -266,21 +250,14 @@ static void test_create_services(const void *data)* call the callback. */ service_type =unique_service_type (TEST_SERVICE_COUNT ); -assert (!qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); -assert (l_queue_isempty (info->services)); +assert (!qmi_qrtr_node_get_service (info->node, service_type));/* Confirm that multiple services may be created for the same type */ service_type =unique_service_type (0 );for (i =0 ; i <L_ARRAY_SIZE (services); i++) { -assert (qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); - -assert (l_queue_length (info->services) ==1 ); - services[i] =l_queue_pop_head (info->services); + services[i] =qmi_qrtr_node_get_service (info->node, + service_type);assert (services[i]); }
@@ -455,10 +432,7 @@ static void test_send_data(const void *data)perform_discovery (info); service_type =unique_service_type (0 );/* Use the first service */ -assert (qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); - service =l_queue_pop_head (info->services); + service =qmi_qrtr_node_get_service (info->node, service_type);assert (service); io =l_io_new (info->service_fds[0 ]);
@@ -505,10 +479,7 @@ static void test_notifications(const void *data)perform_discovery (info); service_type =unique_service_type (0 );/* Use the first service */ -assert (qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); - service =l_queue_pop_head (info->services); + service =qmi_qrtr_node_get_service (info->node, service_type);assert (service); io =l_io_new (info->service_fds[0 ]);
@@ -567,10 +538,8 @@ static void test_service_notification_independence(const void *data)l_io_set_read_handler (io, received_data, info,NULL );for (i =0 ; i <L_ARRAY_SIZE (services); i++) { -assert (qmi_service_create_shared (info->node, service_type, - create_service_cb, info,NULL )); -perform_all_pending_work (); - services[i] =l_queue_pop_head (info->services); + services[i] =qmi_qrtr_node_get_service (info->node, + service_type);assert (services[i]);send_request_via_qmi (info, services[i]);
Signature · 1 line
2.45.0
PATCH v2 14/33 qmi: qmux: Make shared service creation generic
In reply to Denis KenziorThe underlying QMUX protocol does not have a concept of a shared or non-shared service. Services are accessed via clients, with each client having its own state tracked by the service implementation. Some state is shared amongst all clients. The shared service concept was local to the qmi_device implementation, enabling multiple atom drivers to request a handle to a given service, and for that handle to share the client service handle at the protocol level.
Services meant to be shared are now created and managed at the modem driver level. Services that require a dedicated service client handle (such as in the case of gprs_context atom driver) will obtain such handles from the modem driver in the future.
Remove qmi_service_create_shared() API and introduce a QMUX specific qmux_device_create_client() API in its stead. The new API will generically handle creation of new service clients at the QMUX protocol level.
While here, also remove the now unused client_create method from the qmi_device_ops structure and rename qmux_client_create_reply() to qmux_client_create_timeout()
--- drivers/qmimodem/qmi.c | 233 ++++++++--------------------------------- drivers/qmimodem/qmi.h | 12 ++- plugins/gobi.c | 6 +- 3 files changed, 51 insertions(+), 200 deletions(-)
drivers/qmimodem/qmi.c +41 -192
@@ -64,10 +64,6 @@ struct qmi_device_ops {int (*discover)(struct qmi_device *device,qmi_discover_func_t discover_func,void *user,qmi_destroy_func_t destroy); -int (*client_create)(struct qmi_device *device, -uint16_t service_type, -qmi_create_func_t func, -void *user,qmi_destroy_func_t destroy);void (*client_release)(struct qmi_device *device,uint16_t service_type,uint16_t client_id); int (*shutdown)(struct qmi_device *device,
@@ -106,7 +102,6 @@ struct qmi_device_qmux {unsigned int release_users;uint8_t next_control_tid;struct l_queue *control_queue; -struct l_queue *pending_families; };struct service_family {
@@ -1410,17 +1405,6 @@ done:l_free (family); } -struct service_create_shared_data { -struct discovery super; -uint16_t service_type; -struct service_family *family; -struct qmi_device *device; -qmi_create_func_t func; -void *user_data; -qmi_destroy_func_t destroy; -struct l_idle *idle; -}; -static uint8_t __ctl_request_submit (struct qmi_device_qmux *qmux,struct qmi_request *req) {
@@ -1484,79 +1468,6 @@ static struct qmi_service *service_create(struct service_family *family)return service; } -static void service_create_shared_idle_cb (struct l_idle *idle,void *user_data) -{ -struct service_create_shared_data *data = user_data; -struct qmi_service *service =service_create (data->family); - -DISCOVERY_DONE (data, service, data->user_data); -} - -static void service_create_shared_reply (struct service_create_shared_data *data, -struct service_family *family) -{ -struct qmi_service *service =NULL ; - -if (family) - service =service_create (family); - -DISCOVERY_DONE (data, service, data->user_data); -} - -static bool pending_family_match (const void *data,const void *user_data) -{ -const struct service_create_shared_data *shared_data = data; -uint16_t service_type =L_PTR_TO_UINT (user_data); - -return shared_data->service_type == service_type; -} - -struct pending_family_reply_if_match_info { -uint16_t service_type; -struct service_family *family; -}; - -static bool pending_family_reply_if_match (void *data,void *user_data) -{ -struct service_create_shared_data *shared_data = data; -const struct pending_family_reply_if_match_info *info = user_data; - -if (pending_family_match (data,L_UINT_TO_PTR (info->service_type))) { -service_create_shared_reply (shared_data, info->family); -return true; - } - -return false; -} - -static void service_create_shared_pending_reply (struct qmi_device_qmux *qmux, -uint16_t service_type, -struct service_family *family) -{struct pending_family_reply_if_match_info info = { - .service_type = service_type, - .family = family, - }; - -l_queue_foreach_remove (qmux->pending_families, - pending_family_reply_if_match, &info); -} - -static void service_create_shared_data_free (void *user_data) -{ -struct service_create_shared_data *data = user_data; - -if (data->idle) -l_idle_remove (data->idle); - -if (data->family) -service_family_unref (data->family); - -if (data->destroy) - data->destroy (data->user_data); - -l_free (data); -} -static struct qmi_request *find_control_request (struct qmi_device_qmux *qmux,uint16_t tid) {
@@ -1737,7 +1648,9 @@ struct qmux_client_create_data {uint8_t type;uint16_t major;uint16_t minor; -qmi_create_func_t func; +qmi_qmux_device_create_client_func_t func; +void *user_data; +qmi_destroy_func_t destroy;struct l_timeout *timeout;uint16_t tid; };
@@ -1749,10 +1662,14 @@ static void qmux_client_create_data_free(void *user_data)if (data->timeout)l_timeout_remove (data->timeout); +if (data->destroy) + data->destroy (data->user_data); +l_free (data); } -static void qmux_client_create_reply (struct l_timeout *timeout,void *user_data) +static void qmux_client_create_timeout (struct l_timeout *timeout, +void *user_data) {struct qmux_client_create_data *data = user_data;struct qmi_device *device = data->device;
@@ -1760,20 +1677,17 @@ static void qmux_client_create_reply(struct l_timeout *timeout, void *user_data) l_container_of(device, struct qmi_device_qmux, super);struct qmi_request *req; -DBG ("" ); - -service_create_shared_pending_reply (qmux, data->type,NULL ); - -/* remove request from queues */ - req =find_control_request (qmux, data->tid); +__debug_device (device,"client creation timed out" );l_timeout_remove (data->timeout); data->timeout =NULL ; -DISCOVERY_DONE (data,NULL ,NULL ); - +/* remove request from queues */ + req =find_control_request (qmux, data->tid);if (req)__request_free (req); + +DISCOVERY_DONE (data,NULL , data->user_data); } static void qmux_client_create_callback(uint16_t message, uint16_t length,
@@ -1781,9 +1695,8 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, {struct qmux_client_create_data *data = user_data;struct qmi_device *device = data->device; -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super);struct service_family *family =NULL ; +struct qmi_service *service =NULL ;struct qmi_service_info info;const struct qmi_result_code *result_code;const struct qmi_client_id *client_id;
@@ -1817,72 +1730,63 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, hash_id =family_list_create_hash (family->info.service_type, family->client_id);l_hashmap_insert (device->family_list,L_UINT_TO_PTR (hash_id), family); -l_hashmap_insert (device->family_list, -L_UINT_TO_PTR (family->info.service_type), - family); + done: -service_create_shared_pending_reply (qmux, data->type, family);if (family) -service_family_unref (family); + service =service_create (family); + +DISCOVERY_DONE (data, service, data->user_data); -DISCOVERY_DONE (data,NULL ,NULL ); +if (family) +service_family_unref (family); } -static int qmi_device_qmux_client_create (struct qmi_device *device, -uint16_t service_type, -qmi_create_func_t func,void *user_data, -qmi_destroy_func_t destroy) +bool qmi_qmux_device_create_client (struct qmi_device *device, +uint16_t service_type, +qmi_qmux_device_create_client_func_t func, +void *user_data,qmi_destroy_func_t destroy) { -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super);unsigned char client_req[] = {0x01 ,0x01 ,0x00 , service_type }; +const struct qmi_service_info *info; +struct qmi_device_qmux *qmux;struct qmi_request *req; -struct service_create_shared_data *shared_data;struct qmux_client_create_data *create_data; -bool create_in_progress; -if (!l_queue_length (device->service_infos)) -return -ENOENT ; +if (!device || !func) +return false; - create_in_progress =l_queue_find (qmux->pending_families, - pending_family_match, -L_UINT_TO_PTR (service_type)); +if (service_type ==QMI_SERVICE_CONTROL ) +return false; - shared_data = l_new(struct service_create_shared_data, 1); - shared_data->super.destroy = service_create_shared_data_free; - shared_data->service_type = service_type; - shared_data->device = device; - shared_data->func = func; - shared_data->user_data = user_data; - shared_data->destroy = destroy; -l_queue_push_tail (qmux->pending_families, shared_data); + info =__find_service_info_by_type (device, service_type); +if (!info) +return false; -if (create_in_progress) -return 0 ; + qmux = l_container_of(device, struct qmi_device_qmux, super); create_data = l_new(struct qmux_client_create_data, 1); create_data->super.destroy = qmux_client_create_data_free; create_data->device = device; create_data->type = service_type; + create_data->major = info->major; + create_data->minor = info->minor; + create_data->func = func; + create_data->user_data = user_data; + create_data->destroy = destroy;__debug_device (device,"service create [type=%d]" , service_type); -qmi_device_get_service_version (device, create_data->type, - &create_data->major, - &create_data->minor); - req =__control_request_alloc (QMI_CTL_GET_CLIENT_ID , client_req,sizeof (client_req), qmux_client_create_callback, create_data); create_data->tid =__ctl_request_submit (qmux, req); - create_data->timeout =l_timeout_create (8 , qmux_client_create_reply, + create_data->timeout =l_timeout_create (8 , qmux_client_create_timeout, create_data,NULL );__qmi_device_discovery_started (device, &create_data->super); - -return 0 ; +return true; } static void qmux_client_release_callback(uint16_t message, uint16_t length,
@@ -1971,8 +1875,6 @@ static void qmi_device_qmux_destroy(struct qmi_device *device)struct qmi_device_qmux *qmux = l_container_of(device, struct qmi_device_qmux, super); -l_queue_destroy (qmux->pending_families, - (l_queue_destroy_func_t ) service_create_shared_data_free);l_queue_destroy (qmux->control_queue, __request_free);if (qmux->shutdown_idle)
@@ -1985,7 +1887,6 @@ static void qmi_device_qmux_destroy(struct qmi_device *device)static const struct qmi_device_ops qmux_ops = { .write = qmi_device_qmux_write, .discover = qmi_device_qmux_discover, - .client_create = qmi_device_qmux_client_create, .client_release = qmi_device_qmux_client_release, .shutdown = qmi_device_qmux_shutdown, .destroy = qmi_device_qmux_destroy,
@@ -2010,7 +1911,6 @@ struct qmi_device *qmi_qmux_device_new(const char *device) qmux->next_control_tid =1 ; qmux->control_queue =l_queue_new (); - qmux->pending_families =l_queue_new ();l_io_set_read_handler (qmux->super.io, received_qmux_data, qmux,NULL );return &qmux->super;
@@ -2304,7 +2204,6 @@ static void qmi_device_qrtr_destroy(struct qmi_device *device)static const struct qmi_device_ops qrtr_ops = { .write = qmi_device_qrtr_write, .discover = qmi_device_qrtr_discover, - .client_create =NULL , .client_release =NULL , .shutdown =NULL , .destroy = qmi_device_qrtr_destroy,
@@ -2630,56 +2529,6 @@ bool qmi_result_get_uint64(struct qmi_result *result, uint8_t type,return true; } -bool qmi_service_create_shared (struct qmi_device *device,uint16_t type, -qmi_create_func_t func,void *user_data, -qmi_destroy_func_t destroy) -{ -struct service_create_shared_data *data; -struct service_family *family; - -if (!device || !func) -return false; - -if (type ==QMI_SERVICE_CONTROL ) -return false; - - family =l_hashmap_lookup (device->family_list,L_UINT_TO_PTR (type)); -if (!family) { -const struct qmi_service_info *info; - -if (device->ops->client_create) { -int r; - - r = device->ops->client_create (device, type, func, - user_data, destroy); -return r ==0 ; - } - - info =__find_service_info_by_type (device, type); -if (!info) -return false; - - family =service_family_create (device, info,0 ); -l_hashmap_insert (device->family_list,L_UINT_TO_PTR (type), - family); - } - - data = l_new(struct service_create_shared_data, 1); - - data->super.destroy = service_create_shared_data_free; - data->device = device; - data->func = func; - data->user_data = user_data; - data->destroy = destroy; - data->family =service_family_ref (family); - data->idle =l_idle_create (service_create_shared_idle_cb, data,NULL ); - -/* Not really discovery... just tracking the idle callback. */ -__qmi_device_discovery_started (device, &data->super); - -return true; -} -const char *qmi_service_get_identifier (struct qmi_service *service) {if (!service)
drivers/qmimodem/qmi.h +7 -5
@@ -65,12 +65,19 @@ struct qmi_service;typedef void (*qmi_debug_func_t )(const char *str,void *user_data);typedef void (*qmi_shutdown_func_t )(void *user_data);typedef void (*qmi_discover_func_t )(void *user_data); +typedef void (*qmi_qmux_device_create_client_func_t )(struct qmi_service *, +void *user_data);typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *);struct qmi_device *qmi_qmux_device_new (const char *device);void qmi_device_free (struct qmi_device *device); +bool qmi_qmux_device_create_client (struct qmi_device *device, +uint16_t service_type, +qmi_qmux_device_create_client_func_t func, +void *user_data,qmi_destroy_func_t destroy); +void qmi_device_set_debug (struct qmi_device *device,qmi_debug_func_t func,void *user_data);
@@ -130,11 +137,6 @@ void qmi_result_print_tlvs(struct qmi_result *result);int qmi_error_to_ofono_cme (int qmi_error); -typedef void (*qmi_create_func_t )(struct qmi_service *service,void *user_data); - -bool qmi_service_create_shared (struct qmi_device *device, -uint16_t type,qmi_create_func_t func, -void *user_data,qmi_destroy_func_t destroy);struct qmi_service *qmi_service_clone (struct qmi_service *service);void qmi_service_free (struct qmi_service *service);
plugins/gobi.c +3 -3
@@ -419,7 +419,7 @@ static void request_service_cb(struct qmi_service *service, void *user_data)if (data->cur_service_request == data->num_service_requests) {DBG ("All services requested, proceeding to create WDA" ); -if (qmi_service_create_shared (data->device,QMI_SERVICE_WDA , +if (qmi_qmux_device_create_client (data->device,QMI_SERVICE_WDA , create_wda_cb, modem,NULL ))return ;
@@ -429,7 +429,7 @@ static void request_service_cb(struct qmi_service *service, void *user_data) req = &data->service_requests[data->cur_service_request];DBG ("Requesting: %u" , req->service_type); -if (qmi_service_create_shared (data->device, req->service_type, +if (qmi_qmux_device_create_client (data->device, req->service_type, request_service_cb, modem,NULL ))return ;
@@ -482,7 +482,7 @@ static void discover_cb(void *user_data)if (data->features &GOBI_UIM )add_service_request (data, &data->uim,QMI_SERVICE_UIM ); -if (qmi_service_create_shared (data->device,QMI_SERVICE_DMS , +if (qmi_qmux_device_create_client (data->device,QMI_SERVICE_DMS , request_service_cb, modem,NULL ) >0 )return ; error:
Signature · 1 line
2.45.0
PATCH v2 15/33 qmi: Rename qmi_device_get_service_version
In reply to Denis KenziorThis makes it more explicit that major/minor attributes are only supported by QMUX.
--- drivers/qmimodem/qmi.c | 3 ++- drivers/qmimodem/qmi.h | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/qmimodem/qmi.c +2 -1
@@ -988,7 +988,8 @@ static const struct qmi_service_info *__find_service_info_by_type(return info; } -bool qmi_device_get_service_version (struct qmi_device *device,uint16_t type, +bool qmi_qmux_device_get_service_version (struct qmi_device *device, +uint16_t type,uint16_t *major,uint16_t *minor) {const struct qmi_service_info *info;
drivers/qmimodem/qmi.h +3 -2
@@ -77,6 +77,9 @@ bool qmi_qmux_device_create_client(struct qmi_device *device,uint16_t service_type, qmi_qmux_device_create_client_func_t func, void *user_data, qmi_destroy_func_t destroy); +bool qmi_qmux_device_get_service_version (struct qmi_device *device, +uint16_t type, +uint16_t *major,uint16_t *minor);void qmi_device_set_debug (struct qmi_device *device,qmi_debug_func_t func,void *user_data);
@@ -87,8 +90,6 @@ int qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func, void *user_data, qmi_destroy_func_t destroy);bool qmi_device_has_service (struct qmi_device *device,uint16_t type); -bool qmi_device_get_service_version (struct qmi_device *device,uint16_t type, -uint16_t *major,uint16_t *minor);enum qmi_device_expected_data_format qmi_device_get_expected_data_format (struct qmi_device *device);
Signature · 1 line
2.45.0
PATCH v2 16/33 qmi: sms: Require at WMS version 1.2+
In reply to Denis KenziorMove the version check from the SMS atom driver to the gobi modem driver. Do not request WMS unless version 1.2 is supported.
--- drivers/qmimodem/sms.c | 12 ------------ plugins/gobi.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 14 deletions(-)
drivers/qmimodem/sms.c +0 -12
@@ -22,8 +22,6 @@struct sms_data {struct qmi_service *wms; -uint16_t major; -uint16_t minor;struct qmi_wms_read_msg_id rd_msg_id;struct qmi_wms_result_msg_list *msg_list;uint32_t rd_msg_num;
@@ -263,16 +261,11 @@ static void qmi_bearer_query(struct ofono_sms *sms,DBG ("" ); -if (data->major <1 || (data->major ==1 && data->minor <2 )) - goto error; -if (qmi_service_send (data->wms,QMI_WMS_GET_DOMAIN_PREF ,NULL , get_domain_pref_cb, cbd, l_free) >0 )return ; -error:CALLBACK_WITH_FAILURE (cb,-1 , cbd->data); -l_free (cbd); }
@@ -301,9 +294,6 @@ static void qmi_bearer_set(struct ofono_sms *sms, int bearer,DBG ("bearer %d" , bearer); -if (data->major <1 || (data->major ==1 && data->minor <2 )) - goto error; - domain =bearer_to_domain (bearer); param =qmi_param_new_uint8 (QMI_WMS_PARAM_DOMAIN , domain);
@@ -314,7 +304,6 @@ static void qmi_bearer_set(struct ofono_sms *sms, int bearer,qmi_param_free (param); -error:CALLBACK_WITH_FAILURE (cb, cbd->data);l_free (cbd); }
@@ -747,7 +736,6 @@ static int qmi_sms_probe(struct ofono_sms *sms, data->wms = wms;memset (&data->rd_msg_id,0 ,sizeof (data->rd_msg_id)); data->msg_mode =QMI_WMS_MESSAGE_MODE_GSMWCDMA ; -qmi_service_get_version (data->wms, &data->major, &data->minor);qmi_service_register (data->wms,QMI_WMS_EVENT , event_notify, sms,NULL );ofono_sms_set_data (sms, data);
plugins/gobi.c +11 -2
@@ -441,6 +441,8 @@ static void discover_cb(void *user_data) {struct ofono_modem *modem = user_data;struct gobi_data *data =ofono_modem_get_data (modem); +uint16_t major; +uint16_t minor;DBG ("" );
@@ -448,8 +450,6 @@ static void discover_cb(void *user_data) data->features |=GOBI_DMS ;if (qmi_device_has_service (data->device,QMI_SERVICE_NAS )) data->features |=GOBI_NAS ; -if (qmi_device_has_service (data->device,QMI_SERVICE_WMS )) - data->features |=GOBI_WMS ;if (qmi_device_has_service (data->device,QMI_SERVICE_WDS )) data->features |=GOBI_WDS ;if (qmi_device_has_service (data->device,QMI_SERVICE_WDA ))
@@ -461,6 +461,15 @@ static void discover_cb(void *user_data)if (qmi_device_has_service (data->device,QMI_SERVICE_VOICE )) data->features |=GOBI_VOICE ; +if (qmi_qmux_device_get_service_version (data->device,QMI_SERVICE_WMS , + &major, &minor)) { +if (major <1 || (major ==1 && minor <2 )) +ofono_warn ("unsupported WMS version: %u.%u, need: 1.2" , + major, minor); +else + data->features |=GOBI_WMS ; + } + if (!(data->features & GOBI_DMS)) { if (++data->discover_attempts < 3 && !qmi_device_discover(data->device, discover_cb,
Signature · 1 line
2.45.0
PATCH v2 17/33 qmi: Rework qmi_service_get_version
In reply to Denis KenziorWith the introduction of QRTR support, qmi_service_get_version became somewhat confusing. It still returns the minor version, however QRTR does not have such a concept. Additionally, QRTR is limited to 8 bit service versions. Rework qmi_service_get_version API to make this clearer. While here, add some documentation and update the unit test to the new API.
--- drivers/qmimodem/qmi.c | 22 +++++++++++++++------- drivers/qmimodem/qmi.h | 3 +-- unit/test-qmimodem-qmi.c | 7 +++---- 3 files changed, 19 insertions(+), 13 deletions(-)
drivers/qmimodem/qmi.c +15 -7
@@ -2538,17 +2538,25 @@ const char *qmi_service_get_identifier(struct qmi_service *service)return __service_type_to_string (service->family->info.service_type); } -bool qmi_service_get_version (struct qmi_service *service, -uint16_t *major,uint16_t *minor) +/** +* qmi_service_get_version: +* @service: lightweight service handle +* @out_version: version output +* +* Returns the version of the service this handle is currently referring to. +* On QMUX this corresponds to the 'major' version of the service. On QRTR, +* this corresponds to the lower 8 bits of the 'instance' attribute and is thus +* limited to uint8_t. +* +* Returns: #false if the service handle is NULL, #true on success. +*/ +bool qmi_service_get_version (struct qmi_service *service,uint8_t *out_version) {if (!service)return false; -if (major) - *major = service->family->info.major; - -if (minor) - *minor = service->family->info.minor; +if (out_version) + *out_version = service->family->info.major;return true; }
drivers/qmimodem/qmi.h +1 -2
@@ -142,8 +142,7 @@ struct qmi_service *qmi_service_clone(struct qmi_service *service);void qmi_service_free (struct qmi_service *service);const char *qmi_service_get_identifier (struct qmi_service *service); -bool qmi_service_get_version (struct qmi_service *service, -uint16_t *major,uint16_t *minor); +bool qmi_service_get_version (struct qmi_service *service,uint8_t *out_version); uint16_t qmi_service_send(struct qmi_service *service, uint16_t message, struct qmi_param *param,
unit/test-qmimodem-qmi.c +3 -4
@@ -232,15 +232,14 @@ static void test_create_services(const void *data)for (i =0 ; i <TEST_SERVICE_COUNT ; i++) {struct qmi_service *service; -uint16_t major, minor; +uint8_t version; service_type =unique_service_type (i); service =qmi_qrtr_node_get_service (info->node, service_type);assert (service); -assert (qmi_service_get_version (service, &major, &minor)); -assert (major ==unique_service_version (i)); -assert (minor ==0 ); +assert (qmi_service_get_version (service, &version)); +assert (version ==unique_service_version (i));qmi_service_free (service); }
Signature · 1 line
2.45.0
PATCH v2 18/33 qmi: break up qmi_device_free into qrtr & qmux variants
In reply to Denis KenziorIntroduce qmi_qrtr_node_free() that will deallocate a qrtr node object and qmi_qmux_device_free() that will deallocate a qmux device object. This removes the need for the .destroy method inside qmi_device_ops, so get rid of that as well.
Since qrtr has no concept of shutting down (this is accomplished immediately using close() on the qrtr socket), move the relevant variables into the qmux specific structure.
The destroy operation inside qmi_device_ops is no longer used, remove it.
--- drivers/qmimodem/qmi.c | 94 +++++++++++++++++++++------------------- drivers/qmimodem/qmi.h | 3 +- plugins/gobi.c | 4 +- plugins/qrtrqmi.c | 2 +- unit/test-qmimodem-qmi.c | 2 +- 5 files changed, 55 insertions(+), 50 deletions(-)
drivers/qmimodem/qmi.c +49 -45
@@ -69,7 +69,6 @@ struct qmi_device_ops {int (*shutdown)(struct qmi_device *device,qmi_shutdown_func_t shutdown_func,void *user,qmi_destroy_func_t destroy); -void (*destroy)(struct qmi_device *device); };struct qmi_device {
@@ -86,8 +85,6 @@ struct qmi_device {struct l_hashmap *family_list;const struct qmi_device_ops *ops; bool writer_active : 1; - bool shutting_down : 1; - bool destroyed : 1; };struct qmi_device_qmux {
@@ -102,6 +99,8 @@ struct qmi_device_qmux {unsigned int release_users;uint8_t next_control_tid;struct l_queue *control_queue; + bool shutting_down : 1; + bool destroyed : 1; };struct service_family {
@@ -890,17 +889,8 @@ static int qmi_device_init(struct qmi_device *device, int fd,return 0 ; } -static void __qmi_device_shutdown_finished (struct qmi_device *device) +static void __qmi_device_free (struct qmi_device *device) { -if (device->destroyed) - device->ops->destroy (device); -} - -void qmi_device_free (struct qmi_device *device) -{ -if (!device) -return ; -__debug_device (device,"device %p free" , device);l_queue_destroy (device->service_queue, __request_free);
@@ -912,11 +902,6 @@ void qmi_device_free(struct qmi_device *device)l_hashmap_destroy (device->family_list, family_destroy);l_queue_destroy (device->service_infos, l_free); - -if (device->shutting_down) - device->destroyed = true; -else - device->ops->destroy (device); } void qmi_device_set_debug(struct qmi_device *device,
@@ -1816,6 +1801,17 @@ static void qmi_device_qmux_client_release(struct qmi_device *device,__ctl_request_submit (qmux, req); } +static void __qmux_device_free (struct qmi_device_qmux *qmux) +{ +l_queue_destroy (qmux->control_queue, __request_free); + +if (qmux->shutdown_idle) +l_idle_remove (qmux->shutdown_idle); + +l_free (qmux->version_str); +l_free (qmux); +} +static void qmux_shutdown_destroy (void *user_data) {struct qmi_device_qmux *qmux = user_data;
@@ -1825,7 +1821,8 @@ static void qmux_shutdown_destroy(void *user_data) qmux->shutdown_idle =NULL ; -__qmi_device_shutdown_finished (&qmux->super); +if (qmux->destroyed) +__qmux_device_free (qmux); }static void qmux_shutdown_callback (struct l_idle *idle,void *user_data)
@@ -1835,12 +1832,12 @@ static void qmux_shutdown_callback(struct l_idle *idle, void *user_data)if (qmux->release_users >0 )return ; - qmux->super.shutting_down = true; + qmux->shutting_down = true;if (qmux->shutdown_func) qmux->shutdown_func (qmux->shutdown_user_data); - qmux->super.shutting_down = false; + qmux->shutting_down = false;l_idle_remove (qmux->shutdown_idle); }
@@ -1871,26 +1868,11 @@ static int qmi_device_qmux_shutdown(struct qmi_device *device,return 0 ; } -static void qmi_device_qmux_destroy (struct qmi_device *device) -{ -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); - -l_queue_destroy (qmux->control_queue, __request_free); - -if (qmux->shutdown_idle) -l_idle_remove (qmux->shutdown_idle); - -l_free (qmux->version_str); -l_free (qmux); -} -static const struct qmi_device_ops qmux_ops = { .write = qmi_device_qmux_write, .discover = qmi_device_qmux_discover, .client_release = qmi_device_qmux_client_release, .shutdown = qmi_device_qmux_shutdown, - .destroy = qmi_device_qmux_destroy, };struct qmi_device *qmi_qmux_device_new (const char *device)
@@ -1917,6 +1899,24 @@ struct qmi_device *qmi_qmux_device_new(const char *device)return &qmux->super; } +void qmi_qmux_device_free (struct qmi_device *device) +{ +struct qmi_device_qmux *qmux; + +if (!device) +return ; + +__qmi_device_free (device); + + qmux = l_container_of(device, struct qmi_device_qmux, super); +if (qmux->shutting_down) { + qmux->destroyed = true; +return ; + } + +__qmux_device_free (qmux); +} +struct qmi_device_qrtr {struct qmi_device super; };
@@ -2194,20 +2194,11 @@ error:return rc; } -static void qmi_device_qrtr_destroy (struct qmi_device *device) -{ -struct qmi_device_qrtr *qrtr = - l_container_of(device, struct qmi_device_qrtr, super); - -l_free (qrtr); -} -static const struct qmi_device_ops qrtr_ops = { .write = qmi_device_qrtr_write, .discover = qmi_device_qrtr_discover, .client_release =NULL , .shutdown =NULL , - .destroy = qmi_device_qrtr_destroy, };struct qmi_device *qmi_qrtr_node_new (uint32_t node)
@@ -2232,6 +2223,19 @@ struct qmi_device *qmi_qrtr_node_new(uint32_t node)return &qrtr->super; } +void qmi_qrtr_node_free (struct qmi_device *device) +{ +struct qmi_device_qrtr *node; + +if (!device) +return ; + +__qmi_device_free (device); + + node = l_container_of(device, struct qmi_device_qrtr, super); +l_free (node); +} +struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type) {
drivers/qmimodem/qmi.h +2 -1
@@ -71,7 +71,7 @@ typedef void (*qmi_qmux_device_create_client_func_t)(struct qmi_service *,typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *);struct qmi_device *qmi_qmux_device_new (const char *device); -void qmi_device_free (struct qmi_device *device); +void qmi_qmux_device_free (struct qmi_device *device); bool qmi_qmux_device_create_client(struct qmi_device *device, uint16_t service_type,
@@ -97,6 +97,7 @@ bool qmi_device_set_expected_data_format(struct qmi_device *device, enum qmi_device_expected_data_format format);struct qmi_device *qmi_qrtr_node_new (uint32_t node); +void qmi_qrtr_node_free (struct qmi_device *device);struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type);
plugins/gobi.c +2 -2
@@ -188,7 +188,7 @@ static void gobi_remove(struct ofono_modem *modem)cleanup_services (data); -qmi_device_free (data->device); +qmi_qmux_device_free (data->device);l_free (data); }
@@ -217,7 +217,7 @@ static void shutdown_cb(void *user_data) data->discover_attempts =0 ; -qmi_device_free (data->device); +qmi_qmux_device_free (data->device); data->device =NULL ;ofono_modem_set_powered (modem, FALSE);
plugins/qrtrqmi.c +1 -1
@@ -113,7 +113,7 @@ static void qrtrqmi_deinit(struct qrtrqmi_data *data) {qmi_service_free (data->dms); data->dms =NULL ; -qmi_device_free (data->node); +qmi_qrtr_node_free (data->node); data->node =NULL ; }
unit/test-qmimodem-qmi.c +1 -1
@@ -170,7 +170,7 @@ static void test_cleanup(struct test_info *info)l_free (info->received);l_timeout_remove (info->timeout); -qmi_device_free (info->node); +qmi_qrtr_node_free (info->node);/* The qrtr services will be destroyed automatically. */ for (i =0 ; i <TEST_SERVICE_COUNT ; ++i)
Signature · 1 line
2.45.0
PATCH v2 19/33 qmi: Convert DBG statements to __debug_device
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 53 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 24 deletions(-)
drivers/qmimodem/qmi.c +29 -24
@@ -1942,7 +1942,7 @@ static int qmi_device_qrtr_write(struct qmi_device *device, bytes_written =sendto (fd, data, len,0 , (struct sockaddr *) &addr,sizeof (addr));if (bytes_written <0 ) { -DBG ("Failure sending data: %s" ,strerror (errno)); +__debug_device (device,"sendto: %s" ,strerror (errno));return -errno; }
@@ -1990,20 +1990,19 @@ static void qrtr_received_control_packet(struct qmi_device *device,uint32_t type;uint32_t instance;uint32_t version; -uint32_t node; -uint32_t port; +uint32_t qrtr_node; +uint32_t qrtr_port;if (len <sizeof (*packet)) { -DBG ("qrtr packet is too small" ); +__debug_device (device,"qrtr packet is too small" );return ; } -qrtr_debug_ctrl_request (packet, device->debug_func, - device->debug_data); +qrtr_debug_ctrl_request (packet, device->debug_func, device->debug_data); cmd =L_LE32_TO_CPU (packet->cmd);if (cmd !=QRTR_TYPE_NEW_SERVER ) { -DBG ("Unknown command: %d" , cmd); +__debug_device (device,"Unknown command: %d" , cmd);return ; }
@@ -2011,7 +2010,8 @@ static void qrtr_received_control_packet(struct qmi_device *device,if (!packet->server.service && !packet->server.instance && !packet->server.node && !packet->server.port) { -DBG ("Initial service discovery has completed" ); +__debug_device (device, +"Initial service discovery has completed" );if (data)DISCOVERY_DONE (data, data->user_data);
@@ -2025,16 +2025,17 @@ static void qrtr_received_control_packet(struct qmi_device *device, version =L_LE32_TO_CPU (packet->server.instance) &0xff ; instance =L_LE32_TO_CPU (packet->server.instance) >>8 ; - node =L_LE32_TO_CPU (packet->server.node); - port =L_LE32_TO_CPU (packet->server.port); + qrtr_node =L_LE32_TO_CPU (packet->server.node); + qrtr_port =L_LE32_TO_CPU (packet->server.port); -DBG ("New server: Type: %d Version: %d Instance: %d Node: %d Port: %d" , - type, version, instance, node, port); +__debug_device (device, +"New server: %d Version: %d Node/Port: %d/%d" , + type, version, qrtr_node, qrtr_port);memset (&info,0 ,sizeof (info)); info.service_type = type; - info.qrtr_port = port; - info.qrtr_node = node; + info.qrtr_port = qrtr_port; + info.qrtr_node = qrtr_node; info.major = version; info.instance = instance;
@@ -2049,7 +2050,8 @@ static void qrtr_received_control_packet(struct qmi_device *device, }static void qrtr_received_service_message (struct qmi_device *device, -uint32_t node,uint32_t port, +uint32_t qrtr_node, +uint32_t qrtr_port,const void *buf,size_t len) {const struct l_queue_entry *entry;
@@ -2059,15 +2061,16 @@ static void qrtr_received_service_message(struct qmi_device *device, entry; entry = entry->next) {struct qmi_service_info *info = entry->data; -if (info->qrtr_node == node && info->qrtr_port == port) { +if (info->qrtr_node == qrtr_node && + info->qrtr_port == qrtr_port) { service_type = info->service_type;break ; } }if (!service_type) { -DBG ("Received msg from unknown service on node: %d, port: %d" , - node, port); +__debug_device (device,"Message from unknown at node/port %d/%d" , + qrtr_node, qrtr_port);return ; }
@@ -2088,8 +2091,8 @@ static bool qrtr_received_data(struct l_io *io, void *user_data) addr_size =sizeof (addr); bytes_read =recvfrom (l_io_get_fd (qrtr->super.io), buf,sizeof (buf),0 , (struct sockaddr *) &addr, &addr_size); -DBG ("Received %zd bytes from Node: %d Port: %d" , bytes_read, - addr.sq_node, addr.sq_port); +__debug_device (&qrtr->super,"Received %zd bytes from Node: %d Port: %d" , + bytes_read, addr.sq_node, addr.sq_port);if (bytes_read <0 )return true;
@@ -2152,14 +2155,15 @@ static int qmi_device_qrtr_discover(struct qmi_device *device, addr_len =sizeof (addr); rc =getsockname (fd, (struct sockaddr *) &addr, &addr_len);if (rc) { -DBG ("getsockname failed: %s" ,strerror (errno)); +__debug_device (device,"getsockname failed: %s" , +strerror (errno)); rc = -errno; goto error; }if (addr.sq_family !=AF_QIPCRTR || addr_len !=sizeof (addr)) { -DBG ("Unexpected sockaddr from getsockname. family: %d size: %d" , - addr.sq_family, addr_len); +__debug_device (device,"Unexpected sockaddr family: %d size: %d" , + addr.sq_family, addr_len); rc = -EIO ; goto error; }
@@ -2172,7 +2176,8 @@ static int qmi_device_qrtr_discover(struct qmi_device *device,sizeof (packet),0 , (struct sockaddr *) &addr, addr_len);if (bytes_written <0 ) { -DBG ("Failure sending data: %s" ,strerror (errno)); +__debug_device (device,"Failure sending data: %s" , +strerror (errno)); rc = -errno; goto error; }
Signature · 1 line
2.45.0
PATCH v2 20/33 qmi: introduce qmi_qrtr_node_lookup
In reply to Denis KenziorService discovery on QRTR is accomplished using a QRTR NEW_LOOKUP control message. Utilize this terminology and introduce a QRTR specific qmi_qrtr_node_lookup method. This method replaces qmi_device_discover(). Update the qrtr unit tests to use the new API.
Refactor the lookup implementation to not use struct discover_data or the discovery queue. Use a dedicated 'lookup' structure instead.
Change the -EINPROGRESS error returned from qmi_qrtr_node_lookup to -EALREADY to better reflect that the operation has already started. -EINPROGRESS is frequently used in other drivers to notify the caller that the operation will complete asynchronously, with the 0 result meaning that the operation is already complete.
--- drivers/qmimodem/qmi.c | 193 +++++++++++++++++++-------------------- drivers/qmimodem/qmi.h | 4 + plugins/qrtrqmi.c | 2 +- unit/test-qmimodem-qmi.c | 26 +++--- 4 files changed, 114 insertions(+), 111 deletions(-)
drivers/qmimodem/qmi.c +96 -97
@@ -1919,8 +1919,30 @@ void qmi_qmux_device_free(struct qmi_device *device)struct qmi_device_qrtr {struct qmi_device super; +struct { +qmi_qrtr_node_lookup_done_func_t func; +void *user_data; +qmi_destroy_func_t destroy; +struct l_timeout *timeout; + } lookup; }; +static void __qrtr_lookup_finished (struct qmi_device_qrtr *node) +{ +if (!node->lookup.func) { +__debug_device (&node->super,"No lookup in progress" ); +return ; + } + +l_timeout_remove (node->lookup.timeout); + node->lookup.func (node->lookup.user_data); + +if (node->lookup.destroy) + node->lookup.destroy (node->lookup.user_data); + +memset (&node->lookup,0 ,sizeof (node->lookup)); +} +static int qmi_device_qrtr_write (struct qmi_device *device,struct qmi_request *req) {
@@ -1980,11 +2002,11 @@ static void qrtr_debug_ctrl_request(const struct qrtr_ctrl_pkt *packet,function (strbuf, user_data); } -static void qrtr_received_control_packet (struct qmi_device *device, +static void qrtr_received_control_packet (struct qmi_device_qrtr *node,const void *buf,size_t len) { +struct qmi_device *device = &node->super;const struct qrtr_ctrl_pkt *packet = buf; -struct discover_data *data;struct qmi_service_info info;uint32_t cmd;uint32_t type;
@@ -2006,18 +2028,11 @@ static void qrtr_received_control_packet(struct qmi_device *device,return ; } - data =l_queue_peek_head (device->discovery_queue); -if (!packet->server.service && !packet->server.instance && !packet->server.node && !packet->server.port) {__debug_device (device,"Initial service discovery has completed" ); - -if (data) -DISCOVERY_DONE (data, data->user_data); -else -DBG ("discovery_queue is empty" );/* likely a timeout */ - +__qrtr_lookup_finished (node);return ; }
@@ -2041,12 +2056,10 @@ static void qrtr_received_control_packet(struct qmi_device *device,__qmi_service_appeared (device, &info); -if (!data) { -DBG ("discovery_queue is empty" );/* likely a timeout */ +if (!node->lookup.func)return ; - } -l_timeout_modify (data->timeout,DISCOVER_TIMEOUT ); +l_timeout_modify (node->lookup.timeout,DISCOVER_TIMEOUT ); } static void qrtr_received_service_message(struct qmi_device *device,
@@ -2101,7 +2114,7 @@ static bool qrtr_received_data(struct l_io *io, void *user_data) qrtr->super.debug_data);if (addr.sq_port ==QRTR_PORT_CTRL ) -qrtr_received_control_packet (&qrtr->super, buf, bytes_read); +qrtr_received_control_packet (qrtr, buf, bytes_read);else qrtr_received_service_message (&qrtr->super, addr.sq_node, addr.sq_port, buf, bytes_read);
@@ -2109,42 +2122,78 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)return true; } -static void qrtr_discover_reply_timeout (struct l_timeout *timeout, -void *user_data) +static const struct qmi_device_ops qrtr_ops = { + .write = qmi_device_qrtr_write, + .client_release =NULL , + .shutdown =NULL , +}; + +struct qmi_device *qmi_qrtr_node_new (uint32_t node) { -struct discover_data *data = user_data; +struct qmi_device_qrtr *qrtr; +int fd; -l_timeout_remove (data->timeout); - data->timeout =NULL ; + fd =socket (AF_QIPCRTR ,SOCK_DGRAM ,0 ); +if (fd <0 ) +return NULL ; -DISCOVERY_DONE (data, data->user_data); + qrtr = l_new(struct qmi_device_qrtr, 1); + +if (qmi_device_init (&qrtr->super, fd, &qrtr_ops) <0 ) { +close (fd); +l_free (qrtr); +return NULL ; + } + +l_io_set_read_handler (qrtr->super.io, qrtr_received_data, qrtr,NULL ); + +return &qrtr->super; } -static int qmi_device_qrtr_discover (struct qmi_device *device, -qmi_discover_func_t func, -void *user_data, -qmi_destroy_func_t destroy) +void qmi_qrtr_node_free (struct qmi_device *device) { -struct discover_data *data; +struct qmi_device_qrtr *node; + +if (!device) +return ; + +__qmi_device_free (device); + + node = l_container_of(device, struct qmi_device_qrtr, super); + +if (node->lookup.destroy) + node->lookup.destroy (node->lookup.user_data); + +l_free (node); +} + +static void qrtr_lookup_reply_timeout (struct l_timeout *timeout, +void *user_data) +{ +struct qmi_device_qrtr *node = user_data; + +__qrtr_lookup_finished (node); +} + +int qmi_qrtr_node_lookup (struct qmi_device *device, +qmi_qrtr_node_lookup_done_func_t func, +void *user_data,qmi_destroy_func_t destroy) +{ +struct qmi_device_qrtr *node;struct qrtr_ctrl_pkt packet;struct sockaddr_qrtr addr;socklen_t addr_len; -int rc;ssize_t bytes_written;int fd; -__debug_device (device,"device %p discover" , device); - -if (l_queue_length (device->discovery_queue) >0 ) -return -EINPROGRESS ; +if (!device || !func) +return -EINVAL ; - data = l_new(struct discover_data, 1); + node = l_container_of(device, struct qmi_device_qrtr, super); +if (node->lookup.func) +return -EALREADY ; - data->super.destroy = discover_data_free; - data->device = device; - data->func = func; - data->user_data = user_data; - data->destroy = destroy; +__debug_device (device,"node %p discover" , node); fd =l_io_get_fd (device->io);
@@ -2153,19 +2202,16 @@ static int qmi_device_qrtr_discover(struct qmi_device *device,* get its value. */ addr_len =sizeof (addr); - rc =getsockname (fd, (struct sockaddr *) &addr, &addr_len); -if (rc) { +if (getsockname (fd, (struct sockaddr *) &addr, &addr_len) <0 ) {__debug_device (device,"getsockname failed: %s" ,strerror (errno)); - rc = -errno; - goto error; +return -errno; }if (addr.sq_family !=AF_QIPCRTR || addr_len !=sizeof (addr)) {__debug_device (device,"Unexpected sockaddr family: %d size: %d" , addr.sq_family, addr_len); - rc = -EIO ; - goto error; +return -EIO ; } addr.sq_port =QRTR_PORT_CTRL ;
@@ -2178,67 +2224,20 @@ static int qmi_device_qrtr_discover(struct qmi_device *device,if (bytes_written <0 ) {__debug_device (device,"Failure sending data: %s" ,strerror (errno)); - rc = -errno; - goto error; +return -errno; }l_util_hexdump (false, &packet, bytes_written, device->debug_func, device->debug_data); - data->timeout =l_timeout_create (DISCOVER_TIMEOUT , - qrtr_discover_reply_timeout, - data,NULL ); - -__qmi_device_discovery_started (device, &data->super); + node->lookup.func = func; + node->lookup.user_data = user_data; + node->lookup.destroy = destroy; + node->lookup.timeout =l_timeout_create (DISCOVER_TIMEOUT , + qrtr_lookup_reply_timeout, + node,NULL );return 0 ; - -error: -__discovery_free (&data->super); - -return rc; -} - -static const struct qmi_device_ops qrtr_ops = { - .write = qmi_device_qrtr_write, - .discover = qmi_device_qrtr_discover, - .client_release =NULL , - .shutdown =NULL , -}; - -struct qmi_device *qmi_qrtr_node_new (uint32_t node) -{ -struct qmi_device_qrtr *qrtr; -int fd; - - fd =socket (AF_QIPCRTR ,SOCK_DGRAM ,0 ); -if (fd <0 ) -return NULL ; - - qrtr = l_new(struct qmi_device_qrtr, 1); - -if (qmi_device_init (&qrtr->super, fd, &qrtr_ops) <0 ) { -close (fd); -l_free (qrtr); -return NULL ; - } - -l_io_set_read_handler (qrtr->super.io, qrtr_received_data, qrtr,NULL ); - -return &qrtr->super; -} - -void qmi_qrtr_node_free (struct qmi_device *device) -{ -struct qmi_device_qrtr *node; - -if (!device) -return ; - -__qmi_device_free (device); - - node = l_container_of(device, struct qmi_device_qrtr, super); -l_free (node); } struct qmi_service *qmi_qrtr_node_get_service(struct qmi_device *device,
drivers/qmimodem/qmi.h +4 -0
@@ -67,6 +67,7 @@ typedef void (*qmi_shutdown_func_t)(void *user_data);typedef void (*qmi_discover_func_t )(void *user_data);typedef void (*qmi_qmux_device_create_client_func_t )(struct qmi_service *,void *user_data); +typedef void (*qmi_qrtr_node_lookup_done_func_t )(void *);typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *);
@@ -98,6 +99,9 @@ bool qmi_device_set_expected_data_format(struct qmi_device *device,struct qmi_device *qmi_qrtr_node_new (uint32_t node);void qmi_qrtr_node_free (struct qmi_device *device); +int qmi_qrtr_node_lookup (struct qmi_device *device, +qmi_qrtr_node_lookup_done_func_t func, +void *user_data,qmi_destroy_func_t destroy);struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type);
plugins/qrtrqmi.c +1 -1
@@ -215,7 +215,7 @@ static int qrtrqmi_enable(struct ofono_modem *modem)if (getenv ("OFONO_QMI_DEBUG" ))qmi_device_set_debug (data->node, qrtrqmi_debug,"QRTR: " ); - r =qmi_device_discover (data->node, lookup_done, modem,NULL ); + r =qmi_qrtr_node_lookup (data->node, lookup_done, modem,NULL );if (!r)return -EINPROGRESS ;
unit/test-qmimodem-qmi.c +13 -13
@@ -40,7 +40,7 @@ struct test_info {size_t received_len;void *received; - bool discovery_callback_called : 1; + bool lookup_callback_called : 1; bool service_send_callback_called : 1; bool internal_timeout_callback_called : 1; bool notify_callback_called : 1;
@@ -188,26 +188,26 @@ static void test_create_qrtr_node(const void *data)test_cleanup (info); } -static void discovery_complete_cb (void *user_data) +static void lookup_complete_cb (void *user_data) {struct test_info *info = user_data; - info->discovery_callback_called = true; + info->lookup_callback_called = true; } -static void perform_discovery (struct test_info *info) +static void perform_lookup (struct test_info *info) { -qmi_device_discover (info->node, discovery_complete_cb, info,NULL ); +qmi_qrtr_node_lookup (info->node, lookup_complete_cb, info,NULL ); -while (!info->discovery_callback_called) +while (!info->lookup_callback_called)l_main_iterate (-1 ); } -static void test_discovery (const void *data) +static void test_lookup (const void *data) {struct test_info *info =test_setup (); -perform_discovery (info); +perform_lookup (info);test_cleanup (info); }
@@ -228,7 +228,7 @@ static void test_create_services(const void *data)uint32_t service_type;size_t i; -perform_discovery (info); +perform_lookup (info);for (i =0 ; i <TEST_SERVICE_COUNT ; i++) {struct qmi_service *service;
@@ -428,7 +428,7 @@ static void test_send_data(const void *data)uint32_t service_type;struct qmi_service *service; -perform_discovery (info); +perform_lookup (info); service_type =unique_service_type (0 );/* Use the first service */ service =qmi_qrtr_node_get_service (info->node, service_type);
@@ -475,7 +475,7 @@ static void test_notifications(const void *data)struct qmi_service *service;struct l_timeout *receive_timeout; -perform_discovery (info); +perform_lookup (info); service_type =unique_service_type (0 );/* Use the first service */ service =qmi_qrtr_node_get_service (info->node, service_type);
@@ -528,7 +528,7 @@ static void test_service_notification_independence(const void *data)struct qmi_service *services[2 ];size_t i; -perform_discovery (info); +perform_lookup (info); service_type =unique_service_type (0 );/* Use the first service */
@@ -592,7 +592,7 @@ int main(int argc, char **argv)l_test_init (&argc, &argv);l_test_add ("QRTR node creation" , test_create_qrtr_node,NULL ); -l_test_add ("QRTR discovery" , test_discovery,NULL ); +l_test_add ("QRTR lookup" , test_lookup,NULL );l_test_add ("QRTR services may be created" , test_create_services,NULL );l_test_add ("QRTR service sends/responses" , test_send_data,NULL );l_test_add ("QRTR notifications" , test_notifications,NULL );
Signature · 1 line
2.45.0
PATCH v2 21/33 qmi: split qmi_device_has_service into QRTR and QMUX version
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 13 ++++++++++++- drivers/qmimodem/qmi.h | 4 ++-- plugins/gobi.c | 14 +++++++------- plugins/qrtrqmi.c | 10 +++++----- 4 files changed, 26 insertions(+), 15 deletions(-)
drivers/qmimodem/qmi.c +12 -1
@@ -988,8 +988,11 @@ bool qmi_qmux_device_get_service_version(struct qmi_device *device,return true; } -bool qmi_device_has_service (struct qmi_device *device,uint16_t type) +bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type) { +if (!device) +return false; +return __find_service_info_by_type (device, type); }
@@ -2266,6 +2269,14 @@ done:return service_create (family); } +bool qmi_qrtr_node_has_service (struct qmi_device *device,uint16_t type) +{ +if (!device) +return false; + +return __find_service_info_by_type (device, type); +} +struct qmi_param *qmi_param_new (void ) { return l_new(struct qmi_param, 1);
drivers/qmimodem/qmi.h +2 -2
@@ -81,6 +81,7 @@ bool qmi_qmux_device_create_client(struct qmi_device *device,bool qmi_qmux_device_get_service_version (struct qmi_device *device,uint16_t type,uint16_t *major,uint16_t *minor); +bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type);void qmi_device_set_debug (struct qmi_device *device,qmi_debug_func_t func,void *user_data);
@@ -90,8 +91,6 @@ int qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy); -bool qmi_device_has_service (struct qmi_device *device,uint16_t type); -enum qmi_device_expected_data_format qmi_device_get_expected_data_format (struct qmi_device *device); bool qmi_device_set_expected_data_format(struct qmi_device *device,
@@ -104,6 +103,7 @@ int qmi_qrtr_node_lookup(struct qmi_device *device, void *user_data, qmi_destroy_func_t destroy);struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device,uint32_t type); +bool qmi_qrtr_node_has_service (struct qmi_device *device,uint16_t type);struct qmi_param ;
plugins/gobi.c +7 -7
@@ -446,19 +446,19 @@ static void discover_cb(void *user_data)DBG ("" ); -if (qmi_device_has_service (data->device,QMI_SERVICE_DMS )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_DMS )) data->features |=GOBI_DMS ; -if (qmi_device_has_service (data->device,QMI_SERVICE_NAS )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_NAS )) data->features |=GOBI_NAS ; -if (qmi_device_has_service (data->device,QMI_SERVICE_WDS )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_WDS )) data->features |=GOBI_WDS ; -if (qmi_device_has_service (data->device,QMI_SERVICE_WDA )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_WDA )) data->features |=GOBI_WDA ; -if (qmi_device_has_service (data->device,QMI_SERVICE_PDS )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_PDS )) data->features |=GOBI_PDS ; -if (qmi_device_has_service (data->device,QMI_SERVICE_UIM )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_UIM )) data->features |=GOBI_UIM ; -if (qmi_device_has_service (data->device,QMI_SERVICE_VOICE )) +if (qmi_qmux_device_has_service (data->device,QMI_SERVICE_VOICE )) data->features |=GOBI_VOICE ; if (qmi_qmux_device_get_service_version(data->device, QMI_SERVICE_WMS,
plugins/qrtrqmi.c +5 -5
@@ -186,10 +186,10 @@ static void lookup_done(void *user_data)DBG ("" ); -if (!qmi_device_has_service (node,QMI_SERVICE_DMS ) || - !qmi_device_has_service (node,QMI_SERVICE_UIM ) || - !qmi_device_has_service (node,QMI_SERVICE_WDS ) || - !qmi_device_has_service (node,QMI_SERVICE_NAS )) +if (!qmi_qrtr_node_has_service (node,QMI_SERVICE_DMS ) || + !qmi_qrtr_node_has_service (node,QMI_SERVICE_UIM ) || + !qmi_qrtr_node_has_service (node,QMI_SERVICE_WDS ) || + !qmi_qrtr_node_has_service (node,QMI_SERVICE_NAS )) goto error; data->dms =qmi_qrtr_node_get_service (node,QMI_SERVICE_DMS );
@@ -381,7 +381,7 @@ static void qrtrqmi_post_sim(struct ofono_modem *modem)ofono_sms_create (modem,0 ,"qmimodem" , wms); -if (qmi_device_has_service (node,QMI_SERVICE_UIM )) +if (qmi_qrtr_node_has_service (node,QMI_SERVICE_UIM )) mw =ofono_message_waiting_create (modem);if (mw)
Signature · 1 line
2.45.0
PATCH v2 22/33 qmi: split qmi_device_set_debug into QRTR and QMUX versions
In reply to Denis KenziorWhile here, rework how debugging works by introducing an auxiliary structure to house debug callback and user_data. Replace __debug_device with a DEBUG macro that uses l_util_debug. The use of this macro allows function and line information to be automagically included in the debug output.
--- drivers/qmimodem/qmi.c | 177 ++++++++++++++++++++------------------- drivers/qmimodem/qmi.h | 8 +- plugins/gobi.c | 2 +- plugins/qrtrqmi.c | 2 +- unit/test-qmimodem-qmi.c | 2 +- 5 files changed, 97 insertions(+), 94 deletions(-)
drivers/qmimodem/qmi.c +90 -87
@@ -31,6 +31,10 @@#define DISCOVER_TIMEOUT 5 +#define DEBUG(debug, fmt, args...) \ + l_util_debug((debug)->func, (debug)->user_data, "%s:%i " fmt, \ + __func__, __LINE__, ## args) +typedef void (*qmi_message_func_t )(uint16_t message,uint16_t length,const void *buffer,void *user_data);
@@ -71,6 +75,11 @@ struct qmi_device_ops { void *user, qmi_destroy_func_t destroy); }; +struct debug_data { +qmi_debug_func_t func; +void *user_data; +}; +struct qmi_device {struct l_io *io;struct l_queue *req_queue;
@@ -79,8 +88,6 @@ struct qmi_device {unsigned int next_group_id;/* Matches requests with services */ unsigned int next_service_handle;uint16_t next_service_tid; -qmi_debug_func_t debug_func; -void *debug_data;struct l_queue *service_infos;struct l_hashmap *family_list;const struct qmi_device_ops *ops;
@@ -92,6 +99,7 @@ struct qmi_device_qmux {uint16_t control_major;uint16_t control_minor;char *version_str; +struct debug_data debug;qmi_shutdown_func_t shutdown_func;void *shutdown_user_data;qmi_destroy_func_t shutdown_destroy;
@@ -501,6 +509,13 @@ int qmi_error_to_ofono_cme(int qmi_error) } } +static void __debug_data_init (struct debug_data *debug, +qmi_debug_func_t func,void *user_data) +{ + debug->func = func; + debug->user_data = user_data; +} + static void __debug_msg(char dir, const struct qmi_message_hdr *msg, uint32_t service_type, uint8_t transaction_type, uint16_t tid, uint8_t client, uint16_t overall_length,
@@ -630,7 +645,7 @@ static void __qmux_debug_msg(const char dir, const void *buf, size_t len,static void __qrtr_debug_msg (const char dir,const void *buf,size_t len,uint32_t service_type, -qmi_debug_func_t function,void *user_data) +const struct debug_data *debug) {const struct qmi_service_hdr *srv;const struct qmi_message_hdr *msg;
@@ -645,23 +660,7 @@ static void __qrtr_debug_msg(const char dir, const void *buf, size_t len, tid =L_LE16_TO_CPU (srv->transaction);__debug_msg (dir, msg, service_type, srv->type >>1 , tid,0 , len, - function, user_data); -} - -static void __debug_device (struct qmi_device *device, -const char *format, ...) -{ -char strbuf[72 +16 ]; -va_list ap; - -if (!device->debug_func) -return ; - -va_start (ap, format); -vsnprintf (strbuf,sizeof (strbuf), format, ap); -va_end (ap); - - device->debug_func (strbuf, device->debug_data); + debug->func, debug->user_data); }static bool can_write_data (struct l_io *io,void *user_data)
@@ -860,8 +859,6 @@ static int qmi_device_init(struct qmi_device *device, int fd, {long flags; -__debug_device (device,"device %p new" , device); - flags =fcntl (fd,F_GETFL ,NULL );if (flags <0 )return -EIO ;
@@ -891,8 +888,6 @@ static int qmi_device_init(struct qmi_device *device, int fd,static void __qmi_device_free (struct qmi_device *device) { -__debug_device (device,"device %p free" , device); -l_queue_destroy (device->service_queue, __request_free);l_queue_destroy (device->req_queue, __request_free);l_queue_destroy (device->discovery_queue, __discovery_free);
@@ -904,16 +899,6 @@ static void __qmi_device_free(struct qmi_device *device)l_queue_destroy (device->service_infos, l_free); } -void qmi_device_set_debug (struct qmi_device *device, -qmi_debug_func_t func,void *user_data) -{ -if (device ==NULL ) -return ; - - device->debug_func = func; - device->debug_data = user_data; -} -void qmi_result_print_tlvs (struct qmi_result *result) {const void *ptr = result->data;
@@ -1253,10 +1238,10 @@ static int qmi_device_qmux_write(struct qmi_device *device,return -errno;l_util_hexdump (false, req->data, bytes_written, - device->debug_func, device->debug_data); + qmux->debug.func, qmux->debug.user_data);__qmux_debug_msg (' ' , req->data, bytes_written, - device->debug_func, device->debug_data); + qmux->debug.func, qmux->debug.user_data); hdr = (struct qmi_mux_hdr *) req->data;
@@ -1316,7 +1301,7 @@ static bool received_qmux_data(struct l_io *io, void *user_data)return true;l_util_hexdump (true, buf, bytes_read, - qmux->super.debug_func, qmux->super.debug_data); + qmux->debug.func, qmux->debug.user_data); offset =0 ;
@@ -1341,7 +1326,7 @@ static bool received_qmux_data(struct l_io *io, void *user_data)break ;__qmux_debug_msg (' ' , buf + offset, len, - qmux->super.debug_func, qmux->super.debug_data); + qmux->debug.func, qmux->debug.user_data); msg = buf + offset +QMI_MUX_HDR_SIZE ;
@@ -1431,10 +1416,6 @@ static struct service_family *service_family_create(struct qmi_device *device,memcpy (&family->info, info,sizeof (family->info)); -__debug_device (device,"service family created [client=%d,type=%d]" , - family->client_id, - family->info.service_type); -return family; }
@@ -1450,10 +1431,6 @@ static struct qmi_service *service_create(struct service_family *family) service->handle = device->next_service_handle++; service->family =service_family_ref (family); -__debug_device (device,"service created [client=%d,type=%d]" , - family->client_id, - family->info.service_type); -return service; }
@@ -1489,7 +1466,7 @@ static bool qmi_device_qmux_sync(struct qmi_device_qmux *qmux, {struct qmi_request *req; -__debug_device (&qmux->super,"Sending sync to reset QMI" ); +DEBUG (&qmux->debug,"Sending sync to reset QMI" ); req =__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 , qmux_sync_callback, data);
@@ -1536,10 +1513,10 @@ static void qmux_discover_callback(uint16_t message, uint16_t length,struct qmi_service_info info;if (name) -__debug_device (device,"found service [%s %d.%d]" , +DEBUG (&qmux->debug,"discovered service [%s %d.%d]" , name, major, minor);else -__debug_device (device,"found service [%d %d.%d]" , +DEBUG (&qmux->debug,"discovered service [%d %d.%d]" , type, major, minor);if (type ==QMI_SERVICE_CONTROL ) {
@@ -1561,7 +1538,7 @@ static void qmux_discover_callback(uint16_t message, uint16_t length, goto done; qmux->version_str =l_strndup (ptr +1 , *((uint8_t *) ptr)); -__debug_device (device,"version string: %s" , qmux->version_str); +DEBUG (&qmux->debug,"version string: %s" , qmux->version_str); done:/* if the device support the QMI call SYNC over the CTL interface */
@@ -1605,7 +1582,7 @@ static int qmi_device_qmux_discover(struct qmi_device *device,struct discover_data *data;struct qmi_request *req; -__debug_device (device,"device %p discover" , device); +DEBUG (&qmux->debug,"device %p" , qmux);if (l_queue_length (device->service_infos) >0 )return -EALREADY ;
@@ -1666,7 +1643,7 @@ static void qmux_client_create_timeout(struct l_timeout *timeout, l_container_of(device, struct qmi_device_qmux, super);struct qmi_request *req; -__debug_device (device,"client creation timed out" ); +DEBUG (&qmux->debug,"" );l_timeout_remove (data->timeout); data->timeout =NULL ;
@@ -1684,6 +1661,8 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, {struct qmux_client_create_data *data = user_data;struct qmi_device *device = data->device; +struct qmi_device_qmux *qmux = + l_container_of(device, struct qmi_device_qmux, super);struct service_family *family =NULL ;struct qmi_service *service =NULL ;struct qmi_service_info info;
@@ -1715,6 +1694,9 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, info.minor = data->minor; family =service_family_create (device, &info, client_id->client); +DEBUG (&qmux->debug,"service family created [client=%d,type=%d]" , + family->client_id, family->info.service_type); + family =service_family_ref (family); hash_id =family_list_create_hash (family->info.service_type, family->client_id);
@@ -1763,7 +1745,7 @@ bool qmi_qmux_device_create_client(struct qmi_device *device, create_data->user_data = user_data; create_data->destroy = destroy; -__debug_device (device,"service create [type=%d]" , service_type); +DEBUG (&qmux->debug,"creating client [type=%d]" , service_type); req = __control_request_alloc(QMI_CTL_GET_CLIENT_ID, client_req, sizeof(client_req),
@@ -1856,7 +1838,7 @@ static int qmi_device_qmux_shutdown(struct qmi_device *device,if (qmux->shutdown_idle)return -EALREADY ; -__debug_device (&qmux->super,"device %p shutdown" , &qmux->super); +DEBUG (&qmux->debug,"device %p" , &qmux); qmux->shutdown_idle =l_idle_create (qmux_shutdown_callback, qmux, qmux_shutdown_destroy);
@@ -1909,9 +1891,10 @@ void qmi_qmux_device_free(struct qmi_device *device)if (!device)return ; + qmux = l_container_of(device, struct qmi_device_qmux, super); +DEBUG (&qmux->debug,"device %p" , qmux);__qmi_device_free (device); - qmux = l_container_of(device, struct qmi_device_qmux, super);if (qmux->shutting_down) { qmux->destroyed = true;return ;
@@ -1920,8 +1903,21 @@ void qmi_qmux_device_free(struct qmi_device *device)__qmux_device_free (qmux); } +void qmi_qmux_device_set_debug (struct qmi_device *device, +qmi_debug_func_t func,void *user_data) +{ +struct qmi_device_qmux *qmux; + +if (device ==NULL ) +return ; + + qmux = l_container_of(device, struct qmi_device_qmux, super); +__debug_data_init (&qmux->debug, func, user_data); +} +struct qmi_device_qrtr {struct qmi_device super; +struct debug_data debug;struct {qmi_qrtr_node_lookup_done_func_t func;void *user_data;
@@ -1933,7 +1929,7 @@ struct qmi_device_qrtr {static void __qrtr_lookup_finished (struct qmi_device_qrtr *node) {if (!node->lookup.func) { -__debug_device (&node->super,"No lookup in progress" ); +DEBUG (&node->debug,"No lookup in progress" );return ; }
@@ -1949,6 +1945,8 @@ static void __qrtr_lookup_finished(struct qmi_device_qrtr *node)static int qmi_device_qrtr_write (struct qmi_device *device,struct qmi_request *req) { +struct qmi_device_qrtr *node = + l_container_of(device, struct qmi_device_qrtr, super);struct sockaddr_qrtr addr;uint8_t *data;uint16_t len;
@@ -1967,16 +1965,15 @@ static int qmi_device_qrtr_write(struct qmi_device *device, bytes_written =sendto (fd, data, len,0 , (struct sockaddr *) &addr,sizeof (addr));if (bytes_written <0 ) { -__debug_device (device,"sendto: %s" ,strerror (errno)); +DEBUG (&node->debug,"sendto: %s" ,strerror (errno));return -errno; }l_util_hexdump (false, data, bytes_written, - device->debug_func, device->debug_data); + node->debug.func, node->debug.user_data);__qrtr_debug_msg (' ' , data, bytes_written, - req->info.service_type, device->debug_func, - device->debug_data); + req->info.service_type, &node->debug);l_queue_push_tail (device->service_queue, req);
@@ -1984,13 +1981,12 @@ static int qmi_device_qrtr_write(struct qmi_device *device, }static void qrtr_debug_ctrl_request (const struct qrtr_ctrl_pkt *packet, -qmi_debug_func_t function, -void *user_data) +const struct debug_data *debug) {char strbuf[72 +16 ], *str;const char *type; -if (!function) +if (!debug->func)return ; str = strbuf;
@@ -2002,7 +1998,7 @@ static void qrtr_debug_ctrl_request(const struct qrtr_ctrl_pkt *packet, str +=sprintf (str,"%s cmd=%d" , type,L_LE32_TO_CPU (packet->cmd)); -function (strbuf, user_data); + debug->func (strbuf, debug->user_data); } static void qrtr_received_control_packet(struct qmi_device_qrtr *node,
@@ -2019,22 +2015,21 @@ static void qrtr_received_control_packet(struct qmi_device_qrtr *node,uint32_t qrtr_port;if (len <sizeof (*packet)) { -__debug_device (device,"qrtr packet is too small" ); +DEBUG (&node->debug,"packet is too small" );return ; } -qrtr_debug_ctrl_request (packet, device->debug_func, device->debug_data); +qrtr_debug_ctrl_request (packet, &node->debug); cmd =L_LE32_TO_CPU (packet->cmd);if (cmd !=QRTR_TYPE_NEW_SERVER ) { -__debug_device (device,"Unknown command: %d" , cmd); +DEBUG (&node->debug,"Unknown command: %d" , cmd);return ; }if (!packet->server.service && !packet->server.instance && !packet->server.node && !packet->server.port) { -__debug_device (device, -"Initial service discovery has completed" ); +DEBUG (&node->debug,"Service lookup complete" );__qrtr_lookup_finished (node);return ; }
@@ -2046,8 +2041,7 @@ static void qrtr_received_control_packet(struct qmi_device_qrtr *node, qrtr_node =L_LE32_TO_CPU (packet->server.node); qrtr_port =L_LE32_TO_CPU (packet->server.port); -__debug_device (device, -"New server: %d Version: %d Node/Port: %d/%d" , +DEBUG (&node->debug,"New server: %d Version: %d Node/Port: %d/%d" , type, version, qrtr_node, qrtr_port);memset (&info,0 ,sizeof (info));
@@ -2065,11 +2059,12 @@ static void qrtr_received_control_packet(struct qmi_device_qrtr *node,l_timeout_modify (node->lookup.timeout,DISCOVER_TIMEOUT ); } -static void qrtr_received_service_message (struct qmi_device *device, +static void qrtr_received_service_message (struct qmi_device_qrtr *node,uint32_t qrtr_node,uint32_t qrtr_port,const void *buf,size_t len) { +struct qmi_device *device = &node->super;const struct l_queue_entry *entry;uint32_t service_type =0 ;
@@ -2085,14 +2080,12 @@ static void qrtr_received_service_message(struct qmi_device *device, }if (!service_type) { -__debug_device (device,"Message from unknown at node/port %d/%d" , +DEBUG (&node->debug,"Message from unknown at node/port %d/%d" , qrtr_node, qrtr_port);return ; } -__qrtr_debug_msg (' ' , buf, len, service_type, - device->debug_func, device->debug_data); - +__qrtr_debug_msg (' ' , buf, len, service_type, &node->debug);__rx_message (device, service_type,0 , buf); }
@@ -2107,19 +2100,19 @@ static bool qrtr_received_data(struct l_io *io, void *user_data) addr_size =sizeof (addr); bytes_read =recvfrom (l_io_get_fd (qrtr->super.io), buf,sizeof (buf),0 , (struct sockaddr *) &addr, &addr_size); -__debug_device (&qrtr->super,"Received %zd bytes from Node: %d Port: %d" , +DEBUG (&qrtr->debug,"Received %zd bytes from Node: %d Port: %d" , bytes_read, addr.sq_node, addr.sq_port);if (bytes_read <0 )return true; -l_util_hexdump (true, buf, bytes_read, qrtr->super.debug_func, - qrtr->super.debug_data); +l_util_hexdump (true, buf, bytes_read, + qrtr->debug.func, qrtr->debug.user_data);if (addr.sq_port ==QRTR_PORT_CTRL )qrtr_received_control_packet (qrtr, buf, bytes_read);else -qrtr_received_service_message (&qrtr->super, addr.sq_node, +qrtr_received_service_message (qrtr, addr.sq_node, addr.sq_port, buf, bytes_read);return true;
@@ -2170,6 +2163,18 @@ void qmi_qrtr_node_free(struct qmi_device *device)l_free (node); } +void qmi_qrtr_node_set_debug (struct qmi_device *device, +qmi_debug_func_t func,void *user_data) +{ +struct qmi_device_qrtr *node; + +if (device ==NULL ) +return ; + + node = l_container_of(device, struct qmi_device_qrtr, super); +__debug_data_init (&node->debug, func, user_data); +} +static void qrtr_lookup_reply_timeout (struct l_timeout *timeout,void *user_data) {
@@ -2196,7 +2201,7 @@ int qmi_qrtr_node_lookup(struct qmi_device *device,if (node->lookup.func)return -EALREADY ; -__debug_device (device,"node %p discover" , node); +DEBUG (&node->debug,"node %p" , node); fd =l_io_get_fd (device->io);
@@ -2206,13 +2211,12 @@ int qmi_qrtr_node_lookup(struct qmi_device *device,*/ addr_len =sizeof (addr);if (getsockname (fd, (struct sockaddr *) &addr, &addr_len) <0 ) { -__debug_device (device,"getsockname failed: %s" , -strerror (errno)); +DEBUG (&node->debug,"getsockname failed: %s" ,strerror (errno));return -errno; }if (addr.sq_family !=AF_QIPCRTR || addr_len !=sizeof (addr)) { -__debug_device (device,"Unexpected sockaddr family: %d size: %d" , +DEBUG (&node->debug,"Unexpected sockaddr family: %d size: %d" , addr.sq_family, addr_len);return -EIO ; }
@@ -2225,13 +2229,12 @@ int qmi_qrtr_node_lookup(struct qmi_device *device,sizeof (packet),0 , (struct sockaddr *) &addr, addr_len);if (bytes_written <0 ) { -__debug_device (device,"Failure sending data: %s" , -strerror (errno)); +DEBUG (&node->debug,"sendto failed: %s" ,strerror (errno));return -errno; }l_util_hexdump (false, &packet, bytes_written, - device->debug_func, device->debug_data); + node->debug.func, node->debug.user_data); node->lookup.func = func; node->lookup.user_data = user_data;
drivers/qmimodem/qmi.h +4 -4
@@ -73,7 +73,8 @@ typedef void (*qmi_service_result_func_t)(struct qmi_result *, void *);struct qmi_device *qmi_qmux_device_new (const char *device);void qmi_qmux_device_free (struct qmi_device *device); - +void qmi_qmux_device_set_debug (struct qmi_device *device, +qmi_debug_func_t func,void *user_data); bool qmi_qmux_device_create_client(struct qmi_device *device, uint16_t service_type, qmi_qmux_device_create_client_func_t func,
@@ -83,9 +84,6 @@ bool qmi_qmux_device_get_service_version(struct qmi_device *device, uint16_t *major, uint16_t *minor);bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type); -void qmi_device_set_debug (struct qmi_device *device, -qmi_debug_func_t func,void *user_data); -int qmi_device_discover (struct qmi_device *device,qmi_discover_func_t func,void *user_data,qmi_destroy_func_t destroy); int qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,
@@ -98,6 +96,8 @@ bool qmi_device_set_expected_data_format(struct qmi_device *device,struct qmi_device *qmi_qrtr_node_new (uint32_t node);void qmi_qrtr_node_free (struct qmi_device *device); +void qmi_qrtr_node_set_debug (struct qmi_device *device, +qmi_debug_func_t func,void *user_data);int qmi_qrtr_node_lookup (struct qmi_device *device,qmi_qrtr_node_lookup_done_func_t func,void *user_data,qmi_destroy_func_t destroy);
plugins/gobi.c +1 -1
@@ -515,7 +515,7 @@ static int gobi_enable(struct ofono_modem *modem)return -EIO ;if (getenv ("OFONO_QMI_DEBUG" )) -qmi_device_set_debug (data->device, gobi_debug,"QMI: " ); +qmi_qmux_device_set_debug (data->device, gobi_debug,"QMI: " ); r =qmi_device_discover (data->device, discover_cb, modem,NULL );if (!r)
plugins/qrtrqmi.c +1 -1
@@ -213,7 +213,7 @@ static int qrtrqmi_enable(struct ofono_modem *modem)return -EIO ;if (getenv ("OFONO_QMI_DEBUG" )) -qmi_device_set_debug (data->node, qrtrqmi_debug,"QRTR: " ); +qmi_qrtr_node_set_debug (data->node, qrtrqmi_debug,"QRTR: " ); r =qmi_qrtr_node_lookup (data->node, lookup_done, modem,NULL );if (!r)
unit/test-qmimodem-qmi.c +1 -1
@@ -156,7 +156,7 @@ static struct test_info *test_setup(void)assert (info->node);/* Enable ofono logging */ -qmi_device_set_debug (info->node, debug_log,NULL ); +qmi_qrtr_node_set_debug (info->node, debug_log,NULL ); info->timeout =l_timeout_create (TEST_TIMEOUT , test_timeout_cb, info,NULL );
Signature · 1 line
2.45.0
PATCH v2 23/33 qmi: Make qmi_qrtr_node methods take struct qmi_qrtr_node
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 64 ++++++++++++++++++---------------------- drivers/qmimodem/qmi.h | 12 ++++---- plugins/qrtrqmi.c | 10 +++---- unit/test-qmimodem-qmi.c | 2 +- 4 files changed, 40 insertions(+), 48 deletions(-)
drivers/qmimodem/qmi.c +28 -36
@@ -1915,7 +1915,7 @@ void qmi_qmux_device_set_debug(struct qmi_device *device,__debug_data_init (&qmux->debug, func, user_data); } -struct qmi_device_qrtr { +struct qmi_qrtr_node {struct qmi_device super;struct debug_data debug;struct {
@@ -1926,7 +1926,7 @@ struct qmi_device_qrtr { } lookup; }; -static void __qrtr_lookup_finished (struct qmi_device_qrtr *node) +static void __qrtr_lookup_finished (struct qmi_qrtr_node *node) {if (!node->lookup.func) {DEBUG (&node->debug,"No lookup in progress" );
@@ -1942,11 +1942,11 @@ static void __qrtr_lookup_finished(struct qmi_device_qrtr *node)memset (&node->lookup,0 ,sizeof (node->lookup)); } -static int qmi_device_qrtr_write (struct qmi_device *device, +static int qmi_qrtr_node_write (struct qmi_device *device,struct qmi_request *req) { -struct qmi_device_qrtr *node = - l_container_of(device, struct qmi_device_qrtr, super); +struct qmi_qrtr_node *node = + l_container_of(device, struct qmi_qrtr_node, super);struct sockaddr_qrtr addr;uint8_t *data;uint16_t len;
@@ -2001,7 +2001,7 @@ static void qrtr_debug_ctrl_request(const struct qrtr_ctrl_pkt *packet, debug->func (strbuf, debug->user_data); } -static void qrtr_received_control_packet (struct qmi_device_qrtr *node, +static void qrtr_received_control_packet (struct qmi_qrtr_node *node,const void *buf,size_t len) {struct qmi_device *device = &node->super;
@@ -2059,7 +2059,7 @@ static void qrtr_received_control_packet(struct qmi_device_qrtr *node,l_timeout_modify (node->lookup.timeout,DISCOVER_TIMEOUT ); } -static void qrtr_received_service_message (struct qmi_device_qrtr *node, +static void qrtr_received_service_message (struct qmi_qrtr_node *node,uint32_t qrtr_node,uint32_t qrtr_port,const void *buf,size_t len)
@@ -2091,7 +2091,7 @@ static void qrtr_received_service_message(struct qmi_device_qrtr *node,static bool qrtr_received_data (struct l_io *io,void *user_data) { -struct qmi_device_qrtr *qrtr = user_data; +struct qmi_qrtr_node *qrtr = user_data;struct sockaddr_qrtr addr;unsigned char buf[2048 ];ssize_t bytes_read;
@@ -2119,21 +2119,21 @@ static bool qrtr_received_data(struct l_io *io, void *user_data) }static const struct qmi_device_ops qrtr_ops = { - .write = qmi_device_qrtr_write, + .write = qmi_qrtr_node_write, .client_release =NULL , .shutdown =NULL , }; -struct qmi_device *qmi_qrtr_node_new (uint32_t node) +struct qmi_qrtr_node *qmi_qrtr_node_new (uint32_t node) { -struct qmi_device_qrtr *qrtr; +struct qmi_qrtr_node *qrtr;int fd; fd =socket (AF_QIPCRTR ,SOCK_DGRAM ,0 );if (fd <0 )return NULL ; - qrtr = l_new(struct qmi_device_qrtr, 1); + qrtr = l_new(struct qmi_qrtr_node, 1);if (qmi_device_init (&qrtr->super, fd, &qrtr_ops) <0 ) {close (fd);
@@ -2143,19 +2143,15 @@ struct qmi_device *qmi_qrtr_node_new(uint32_t node)l_io_set_read_handler (qrtr->super.io, qrtr_received_data, qrtr,NULL ); -return &qrtr->super; +return qrtr; } -void qmi_qrtr_node_free (struct qmi_device *device) +void qmi_qrtr_node_free (struct qmi_qrtr_node *node) { -struct qmi_device_qrtr *node; - -if (!device) +if (!node)return ; -__qmi_device_free (device); - - node = l_container_of(device, struct qmi_device_qrtr, super); +__qmi_device_free (&node->super);if (node->lookup.destroy) node->lookup.destroy (node->lookup.user_data);
@@ -2163,47 +2159,42 @@ void qmi_qrtr_node_free(struct qmi_device *device)l_free (node); } -void qmi_qrtr_node_set_debug (struct qmi_device *device, +void qmi_qrtr_node_set_debug (struct qmi_qrtr_node *node,qmi_debug_func_t func,void *user_data) { -struct qmi_device_qrtr *node; - -if (device ==NULL ) +if (!node)return ; - node = l_container_of(device, struct qmi_device_qrtr, super);__debug_data_init (&node->debug, func, user_data); }static void qrtr_lookup_reply_timeout (struct l_timeout *timeout,void *user_data) { -struct qmi_device_qrtr *node = user_data; +struct qmi_qrtr_node *node = user_data;__qrtr_lookup_finished (node); } -int qmi_qrtr_node_lookup (struct qmi_device *device, +int qmi_qrtr_node_lookup (struct qmi_qrtr_node *node,qmi_qrtr_node_lookup_done_func_t func,void *user_data,qmi_destroy_func_t destroy) { -struct qmi_device_qrtr *node;struct qrtr_ctrl_pkt packet;struct sockaddr_qrtr addr;socklen_t addr_len;ssize_t bytes_written;int fd; -if (!device || !func) +if (!node || !func)return -EINVAL ; - node = l_container_of(device, struct qmi_device_qrtr, super);if (node->lookup.func)return -EALREADY ;DEBUG (&node->debug,"node %p" , node); - fd =l_io_get_fd (device->io); + fd =l_io_get_fd (node->super.io);/* * The control node is configured by the system. Use getsockname to
@@ -2246,13 +2237,14 @@ int qmi_qrtr_node_lookup(struct qmi_device *device,return 0 ; } -struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device, +struct qmi_service *qmi_qrtr_node_get_service (struct qmi_qrtr_node *node,uint32_t type) { +struct qmi_device *device = &node->super;struct service_family *family;const struct qmi_service_info *info; -if (!device) +if (!node)return NULL ;if (type ==QMI_SERVICE_CONTROL )
@@ -2272,12 +2264,12 @@ done:return service_create (family); } -bool qmi_qrtr_node_has_service (struct qmi_device *device,uint16_t type) +bool qmi_qrtr_node_has_service (struct qmi_qrtr_node *node,uint16_t type) { -if (!device) +if (!node)return false; -return __find_service_info_by_type (device, type); +return __find_service_info_by_type (&node->super, type); }struct qmi_param *qmi_param_new (void )
drivers/qmimodem/qmi.h +6 -6
@@ -94,16 +94,16 @@ enum qmi_device_expected_data_format qmi_device_get_expected_data_format(bool qmi_device_set_expected_data_format (struct qmi_device *device,enum qmi_device_expected_data_format format); -struct qmi_device *qmi_qrtr_node_new (uint32_t node); -void qmi_qrtr_node_free (struct qmi_device *device); -void qmi_qrtr_node_set_debug (struct qmi_device *device, +struct qmi_qrtr_node *qmi_qrtr_node_new (uint32_t node); +void qmi_qrtr_node_free (struct qmi_qrtr_node *node); +void qmi_qrtr_node_set_debug (struct qmi_qrtr_node *node,qmi_debug_func_t func,void *user_data); -int qmi_qrtr_node_lookup (struct qmi_device *device, +int qmi_qrtr_node_lookup (struct qmi_qrtr_node *node,qmi_qrtr_node_lookup_done_func_t func,void *user_data,qmi_destroy_func_t destroy); -struct qmi_service *qmi_qrtr_node_get_service (struct qmi_device *device, +struct qmi_service *qmi_qrtr_node_get_service (struct qmi_qrtr_node *node,uint32_t type); -bool qmi_qrtr_node_has_service (struct qmi_device *device,uint16_t type); +bool qmi_qrtr_node_has_service (struct qmi_qrtr_node *node,uint16_t type);struct qmi_param ;
plugins/qrtrqmi.c +5 -5
@@ -45,7 +45,7 @@#include <drivers/qmimodem/util.h> struct qrtrqmi_data { -struct qmi_device *node; +struct qmi_qrtr_node *node;struct qmi_service *dms;int main_net_ifindex;char main_net_name[IFNAMSIZ ];
@@ -182,7 +182,7 @@ static void lookup_done(void *user_data) {struct ofono_modem *modem = user_data;struct qrtrqmi_data *data =ofono_modem_get_data (modem); -struct qmi_device *node = data->node; +struct qmi_qrtr_node *node = data->node;DBG ("" );
@@ -288,7 +288,7 @@ static void qrtrqmi_set_online(struct ofono_modem *modem, ofono_bool_t online,static void qrtrqmi_pre_sim (struct ofono_modem *modem) {struct qrtrqmi_data *data =ofono_modem_get_data (modem); -struct qmi_device *node = data->node; +struct qmi_qrtr_node *node = data->node;struct qmi_service *voice;DBG ("%p" , modem);
@@ -363,7 +363,7 @@ static void setup_gprs(struct ofono_modem *modem)static void qrtrqmi_post_sim (struct ofono_modem *modem) {struct qrtrqmi_data *data =ofono_modem_get_data (modem); -struct qmi_device *node = data->node; +struct qmi_qrtr_node *node = data->node;struct qmi_service *wms;DBG ("%p" , modem);
@@ -394,7 +394,7 @@ static void qrtrqmi_post_sim(struct ofono_modem *modem)static void qrtrqmi_post_online (struct ofono_modem *modem) {struct qrtrqmi_data *data =ofono_modem_get_data (modem); -struct qmi_device *node = data->node; +struct qmi_qrtr_node *node = data->node;DBG ("%p" , modem);
unit/test-qmimodem-qmi.c +1 -1
@@ -32,7 +32,7 @@struct test_info {int service_fds[TEST_SERVICE_COUNT ]; -struct qmi_device *node; +struct qmi_qrtr_node *node;struct l_timeout *timeout;/* Data sent to our test service */
Signature · 1 line
2.45.0
PATCH v2 24/33 qmi: Move expected data format handling into gobi
In reply to Denis KenziorThe expected data format logic inside qmi_device was specific to the qmi_wwan driver used for USB QMI (QMUX) devices. Move it to the gobi modem driver that manages such devices. The code is greatly simplified since 'gobi' knows about the network interface name directly.
--- drivers/qmimodem/qmi.c | 197 ----------------------------------------- drivers/qmimodem/qmi.h | 11 --- plugins/gobi.c | 67 +++++++++----- 3 files changed, 47 insertions(+), 228 deletions(-)
drivers/qmimodem/qmi.c +0 -197
@@ -1028,203 +1028,6 @@ int qmi_device_shutdown(struct qmi_device *device, qmi_shutdown_func_t func,return device->ops->shutdown (device, func, user_data, destroy); } -static bool get_device_file_name (struct qmi_device *device, -char *file_name,int size) -{ -pid_t pid; -char temp[100 ]; -ssize_t result; -int fd =l_io_get_fd (device->io); - -if (size <=0 ) -return false; - - pid =getpid (); - -snprintf (temp,100 ,"/proc/%d/fd/%d" , (int ) pid, fd); - temp[99 ] =0 ; - - result =readlink (temp, file_name, size -1 ); - -if (result ==-1 || result >= size -1 ) { -DBG ("Error %d in readlink" , errno); -return false; - } - - file_name[result] =0 ; - -return true; -} - -static char *get_first_dir_in_directory (char *dir_path) -{ -DIR *dir; -struct dirent *dir_entry; -char *dir_name =NULL ; - - dir =opendir (dir_path); - -if (!dir) -return NULL ; - - dir_entry =readdir (dir); - -while ((dir_entry !=NULL )) { -if (dir_entry->d_type ==DT_DIR && -strcmp (dir_entry->d_name,"." ) !=0 && -strcmp (dir_entry->d_name,".." ) !=0 ) { - dir_name =l_strdup (dir_entry->d_name); -break ; - } - - dir_entry =readdir (dir); - } - -closedir (dir); -return dir_name; -} - -static char *get_device_interface (struct qmi_device *device) -{ -char *const driver_names[] = {"usbmisc" ,"usb" }; -unsigned int i; -char file_path[PATH_MAX ]; -const char *file_name; -char *interface =NULL ; - -if (!get_device_file_name (device, file_path,sizeof (file_path))) -return NULL ; - - file_name =l_basename (file_path); - -for (i =0 ; i <L_ARRAY_SIZE (driver_names) && !interface; i++) { -char *sysfs_path; - - sysfs_path =l_strdup_printf ("/sys/class/%s/%s/device/net/" , - driver_names[i], file_name); - interface =get_first_dir_in_directory (sysfs_path); -l_free (sysfs_path); - } - -return interface; -} - -enum qmi_device_expected_data_format qmi_device_get_expected_data_format ( -struct qmi_device *device) -{ -char *sysfs_path =NULL ; -char *interface =NULL ; -int fd =-1 ; -char value; -enum qmi_device_expected_data_format expected = -QMI_DEVICE_EXPECTED_DATA_FORMAT_UNKNOWN ; - -if (!device) - goto done; - - interface =get_device_interface (device); - -if (!interface) { -DBG ("Error while getting interface name" ); - goto done; - } - -/* Build sysfs file path and open it */ - sysfs_path =l_strdup_printf ("/sys/class/net/%s/qmi/raw_ip" , interface); - - fd =open (sysfs_path,O_RDONLY ); -if (fd <0 ) { -/* maybe not supported by kernel */ -DBG ("Error %d in open(%s)" , errno, sysfs_path); - goto done; - } - -if (read (fd, &value,1 ) !=1 ) { -DBG ("Error %d in read(%s)" , errno, sysfs_path); - goto done; - } - -if (value =='Y' ) - expected =QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP ; -else if (value =='N' ) - expected =QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3 ; -else -DBG ("Unexpected sysfs file contents" ); - -done: -if (fd >=0 ) -close (fd); - -if (sysfs_path) -l_free (sysfs_path); - -if (interface) -l_free (interface); - -return expected; -} - -bool qmi_device_set_expected_data_format (struct qmi_device *device, -enum qmi_device_expected_data_format format) -{ -bool res = false; -char *sysfs_path =NULL ; -char *interface =NULL ; -int fd =-1 ; -char value; - -if (!device) - goto done; - -switch (format) { -case QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3 : - value ='N' ; -break ; -case QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP : - value ='Y' ; -break ; -default : -DBG ("Unhandled format: %d" , (int ) format); - goto done; - } - - interface =get_device_interface (device); - -if (!interface) { -DBG ("Error while getting interface name" ); - goto done; - } - -/* Build sysfs file path and open it */ - sysfs_path =l_strdup_printf ("/sys/class/net/%s/qmi/raw_ip" , interface); - - fd =open (sysfs_path,O_WRONLY ); -if (fd <0 ) { -/* maybe not supported by kernel */ -DBG ("Error %d in open(%s)" , errno, sysfs_path); - goto done; - } - -if (write (fd, &value,1 ) !=1 ) { -DBG ("Error %d in write(%s)" , errno, sysfs_path); - goto done; - } - - res = true; - -done: -if (fd >=0 ) -close (fd); - -if (sysfs_path) -l_free (sysfs_path); - -if (interface) -l_free (interface); - -return res; -} -static int qmi_device_qmux_write (struct qmi_device *device,struct qmi_request *req) {
drivers/qmimodem/qmi.h +0 -11
@@ -41,12 +41,6 @@#define QMI_SERVICE_RMS 225/* Remote management service */ #define QMI_SERVICE_OMA 226/* OMA device management service */ -enum qmi_device_expected_data_format { -QMI_DEVICE_EXPECTED_DATA_FORMAT_UNKNOWN , -QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3 , -QMI_DEVICE_EXPECTED_DATA_FORMAT_RAW_IP , -}; -enum qmi_data_endpoint_type {QMI_DATA_ENDPOINT_TYPE_UNKNOWN =0x00 ,QMI_DATA_ENDPOINT_TYPE_HSIC =0x01 ,
@@ -89,11 +83,6 @@ int qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy); -enum qmi_device_expected_data_format qmi_device_get_expected_data_format ( -struct qmi_device *device); -bool qmi_device_set_expected_data_format (struct qmi_device *device, -enum qmi_device_expected_data_format format); -struct qmi_qrtr_node *qmi_qrtr_node_new (uint32_t node);void qmi_qrtr_node_free (struct qmi_qrtr_node *node); void qmi_qrtr_node_set_debug(struct qmi_qrtr_node *node,
plugins/gobi.c +47 -20
101 lines not on this page · raw message
Signature · 1 line
2.45.0
PATCH v2 25/33 qmi: Rename and refactor qmi_device_discover
In reply to Denis KenziorRefactor the discover implementation to not use struct discover_data or the discovery queue. Use a dedicated 'discover' structure instead. Remove the now unused discover() method from qmi_device_ops.
--- drivers/qmimodem/qmi.c | 153 ++++++++++++++++------------------------- drivers/qmimodem/qmi.h | 7 +- plugins/gobi.c | 5 +- 3 files changed, 66 insertions(+), 99 deletions(-)
drivers/qmimodem/qmi.c +59 -94
@@ -65,9 +65,6 @@ struct qmi_request {struct qmi_device_ops {int (*write)(struct qmi_device *device,struct qmi_request *req); -int (*discover)(struct qmi_device *device, -qmi_discover_func_t discover_func, -void *user,qmi_destroy_func_t destroy);void (*client_release)(struct qmi_device *device,uint16_t service_type,uint16_t client_id); int (*shutdown)(struct qmi_device *device,
@@ -105,6 +102,13 @@ struct qmi_device_qmux {qmi_destroy_func_t shutdown_destroy;struct l_idle *shutdown_idle;unsigned int release_users; +struct { +qmi_qmux_device_discover_func_t func; +void *user_data; +qmi_destroy_func_t destroy; +struct l_timeout *timeout; +uint16_t tid; + } discover;uint8_t next_control_tid;struct l_queue *control_queue; bool shutting_down : 1;
@@ -981,41 +985,6 @@ bool qmi_qmux_device_has_service(struct qmi_device *device, uint16_t type)return __find_service_info_by_type (device, type); } -struct discover_data { -struct discovery super; -struct qmi_device *device; -qmi_discover_func_t func; -void *user_data; -qmi_destroy_func_t destroy; -uint16_t tid; -struct l_timeout *timeout; -}; - -static void discover_data_free (void *user_data) -{ -struct discover_data *data = user_data; - -if (data->timeout) -l_timeout_remove (data->timeout); - -if (data->destroy) - data->destroy (data->user_data); - -l_free (data); -} - -int qmi_device_discover (struct qmi_device *device,qmi_discover_func_t func, -void *user_data,qmi_destroy_func_t destroy) -{ -if (!device) -return -EINVAL ; - -if (!device->ops->discover) -return -ENOTSUP ; - -return device->ops->discover (device, func, user_data, destroy); -} -int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy) {
@@ -1255,37 +1224,30 @@ static struct qmi_request *find_control_request(struct qmi_device_qmux *qmux,return req; } -static void qmux_sync_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void __qmux_discovery_finished (struct qmi_device_qmux *qmux) { -struct discover_data *data = user_data; +l_timeout_remove (qmux->discover.timeout); + qmux->discover.func (qmux->discover.user_data); -DISCOVERY_DONE (data, data->user_data); +if (qmux->discover.destroy) + qmux->discover.destroy (qmux->discover.user_data); + +memset (&qmux->discover,0 ,sizeof (qmux->discover)); } -/* sync will release all previous clients */ -static bool qmi_device_qmux_sync (struct qmi_device_qmux *qmux, -struct discover_data *data) +static void qmux_sync_callback (uint16_t message,uint16_t length, +const void *buffer,void *user_data) { -struct qmi_request *req; - -DEBUG (&qmux->debug,"Sending sync to reset QMI" ); - - req =__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 , - qmux_sync_callback, data); - -__ctl_request_submit (qmux, req); +struct qmi_device_qmux *qmux = user_data; -return true; +__qmux_discovery_finished (qmux); }static void qmux_discover_callback (uint16_t message,uint16_t length,const void *buffer,void *user_data) { -struct discover_data *data = user_data; -struct qmi_device *device = data->device; -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_device_qmux *qmux = user_data; +struct qmi_device *device = &qmux->super;const struct qmi_result_code *result_code;const struct qmi_service_list *service_list;const void *ptr;
@@ -1344,69 +1306,68 @@ static void qmux_discover_callback(uint16_t message, uint16_t length,DEBUG (&qmux->debug,"version string: %s" , qmux->version_str); done: -/* if the device support the QMI call SYNC over the CTL interface */ +/* +* If the device support the QMI call SYNC over the CTL interface, +* invoke it to reset the state, including release all previously +* allocated clients +*/ if ((qmux->control_major ==1 && qmux->control_minor >=5 ) || qmux->control_major >1 ) { -qmi_device_qmux_sync (qmux, data); +struct qmi_request *req = +__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 , + qmux_sync_callback, qmux); + +DEBUG (&qmux->debug,"Sending sync to reset QMI" ); + qmux->discover.tid =__ctl_request_submit (qmux, req);return ; } -DISCOVERY_DONE (data, data->user_data); +__qmux_discovery_finished (qmux); }static void qmux_discover_reply_timeout (struct l_timeout *timeout,void *user_data) { -struct discover_data *data = user_data; -struct qmi_device *device = data->device; +struct qmi_device *device = user_data;struct qmi_device_qmux *qmux = l_container_of(device, struct qmi_device_qmux, super);struct qmi_request *req; -l_timeout_remove (data->timeout); - data->timeout =NULL ; -/* remove request from queues */ - req =find_control_request (qmux, data->tid); - -DISCOVERY_DONE (data, data->user_data); - + req =find_control_request (qmux, qmux->discover.tid);if (req)__request_free (req); + +__qmux_discovery_finished (qmux); } -static int qmi_device_qmux_discover (struct qmi_device *device, -qmi_discover_func_t func, -void *user_data, -qmi_destroy_func_t destroy) +int qmi_qmux_device_discover (struct qmi_device *device, +qmi_qmux_device_discover_func_t func, +void *user_data,qmi_destroy_func_t destroy) { -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); -struct discover_data *data; +struct qmi_device_qmux *qmux;struct qmi_request *req; -DEBUG (&qmux->debug,"device %p" , qmux); +if (!device) +return -EINVAL ; -if (l_queue_length (device->service_infos) >0 ) -return -EALREADY ; + qmux = l_container_of(device, struct qmi_device_qmux, super); - data = l_new(struct discover_data, 1); +DEBUG (&qmux->debug,"device %p" , qmux); - data->super.destroy = discover_data_free; - data->device = device; - data->func = func; - data->user_data = user_data; - data->destroy = destroy; +if (l_queue_length (device->service_infos) >0 || qmux->discover.tid) +return -EALREADY ; req =__control_request_alloc (QMI_CTL_GET_VERSION_INFO ,NULL ,0 , - qmux_discover_callback, data); - - data->tid =__ctl_request_submit (qmux, req); - data->timeout =l_timeout_create (DISCOVER_TIMEOUT , - qmux_discover_reply_timeout, - data,NULL ); + qmux_discover_callback, qmux); -__qmi_device_discovery_started (device, &data->super); + qmux->discover.func = func; + qmux->discover.user_data = user_data; + qmux->discover.destroy = destroy; + qmux->discover.tid =__ctl_request_submit (qmux, req); + qmux->discover.timeout = +l_timeout_create (DISCOVER_TIMEOUT , qmux_discover_reply_timeout, + qmux,NULL );return 0 ; }
@@ -1593,6 +1554,11 @@ static void __qmux_device_free(struct qmi_device_qmux *qmux) {l_queue_destroy (qmux->control_queue, __request_free); +l_timeout_remove (qmux->discover.timeout); + +if (qmux->discover.destroy) + qmux->discover.destroy (qmux->discover.user_data); +if (qmux->shutdown_idle)l_idle_remove (qmux->shutdown_idle);
@@ -1658,7 +1624,6 @@ static int qmi_device_qmux_shutdown(struct qmi_device *device,static const struct qmi_device_ops qmux_ops = { .write = qmi_device_qmux_write, - .discover = qmi_device_qmux_discover, .client_release = qmi_device_qmux_client_release, .shutdown = qmi_device_qmux_shutdown, };
drivers/qmimodem/qmi.h +4 -3
@@ -58,7 +58,7 @@ struct qmi_service;typedef void (*qmi_debug_func_t )(const char *str,void *user_data);typedef void (*qmi_shutdown_func_t )(void *user_data); -typedef void (*qmi_discover_func_t )(void *user_data); +typedef void (*qmi_qmux_device_discover_func_t )(void *user_data);typedef void (*qmi_qmux_device_create_client_func_t )(struct qmi_service *,void *user_data);typedef void (*qmi_qrtr_node_lookup_done_func_t )(void *);
@@ -69,6 +69,9 @@ struct qmi_device *qmi_qmux_device_new(const char *device);void qmi_qmux_device_free (struct qmi_device *device);void qmi_qmux_device_set_debug (struct qmi_device *device,qmi_debug_func_t func,void *user_data); +int qmi_qmux_device_discover (struct qmi_device *device, +qmi_qmux_device_discover_func_t func, +void *user_data,qmi_destroy_func_t destroy); bool qmi_qmux_device_create_client(struct qmi_device *device, uint16_t service_type, qmi_qmux_device_create_client_func_t func,
@@ -78,8 +81,6 @@ bool qmi_qmux_device_get_service_version(struct qmi_device *device, uint16_t *major, uint16_t *minor);bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type); -int qmi_device_discover (struct qmi_device *device,qmi_discover_func_t func, -void *user_data,qmi_destroy_func_t destroy);int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy);
plugins/gobi.c +3 -2
@@ -499,7 +499,8 @@ static void discover_cb(void *user_data)if (!(data->features &GOBI_DMS )) {if (++data->discover_attempts <3 && - !qmi_device_discover (data->device, discover_cb, + !qmi_qmux_device_discover (data->device, + discover_cb, modem,NULL ))return ;
@@ -544,7 +545,7 @@ static int gobi_enable(struct ofono_modem *modem)if (getenv ("OFONO_QMI_DEBUG" ))qmi_qmux_device_set_debug (data->device, gobi_debug,"QMI: " ); - r =qmi_device_discover (data->device, discover_cb, modem,NULL ); + r =qmi_qmux_device_discover (data->device, discover_cb, modem,NULL );if (!r)return -EINPROGRESS ;
Signature · 1 line
2.45.0
PATCH v2 26/33 qmi: Rename qmi_device_shutdown
In reply to Denis KenziorRename qmi_device_shutdown to qmi_qmux_device_shutdown to make it clear that only the QMUX implementation requires this operation. Remove the shutdown() method from qmi_device_ops since it is no longer needed.
While here, move shutdown operation related members to a dedicated 'shutdown' structure inside qmi_device_qmux. This makes it more consistent with how discovery related members are setup.
--- drivers/qmimodem/qmi.c | 75 ++++++++++++++++++------------------------ drivers/qmimodem/qmi.h | 6 ++-- plugins/gobi.c | 2 +- 3 files changed, 36 insertions(+), 47 deletions(-)
drivers/qmimodem/qmi.c +32 -43
@@ -67,9 +67,6 @@ struct qmi_device_ops {int (*write)(struct qmi_device *device,struct qmi_request *req);void (*client_release)(struct qmi_device *device,uint16_t service_type,uint16_t client_id); -int (*shutdown)(struct qmi_device *device, -qmi_shutdown_func_t shutdown_func, -void *user,qmi_destroy_func_t destroy); };struct debug_data {
@@ -97,11 +94,6 @@ struct qmi_device_qmux {uint16_t control_minor;char *version_str;struct debug_data debug; -qmi_shutdown_func_t shutdown_func; -void *shutdown_user_data; -qmi_destroy_func_t shutdown_destroy; -struct l_idle *shutdown_idle; -unsigned int release_users;struct {qmi_qmux_device_discover_func_t func;void *user_data;
@@ -109,6 +101,13 @@ struct qmi_device_qmux {struct l_timeout *timeout;uint16_t tid; } discover; +struct { +qmi_qmux_device_shutdown_func_t func; +void *user_data; +qmi_destroy_func_t destroy; +struct l_idle *idle; +unsigned int release_users; + } shutdown;uint8_t next_control_tid;struct l_queue *control_queue; bool shutting_down : 1;
@@ -985,18 +984,6 @@ bool qmi_qmux_device_has_service(struct qmi_device *device, uint16_t type)return __find_service_info_by_type (device, type); } -int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func, -void *user_data,qmi_destroy_func_t destroy) -{ -if (!device) -return -EINVAL ; - -if (!device->ops->shutdown) -return -ENOTSUP ; - -return device->ops->shutdown (device, func, user_data, destroy); -} -static int qmi_device_qmux_write (struct qmi_device *device,struct qmi_request *req) {
@@ -1529,7 +1516,7 @@ static void qmux_client_release_callback(uint16_t message, uint16_t length, {struct qmi_device_qmux *qmux = user_data; - qmux->release_users--; + qmux->shutdown.release_users--; } static void qmi_device_qmux_client_release(struct qmi_device *device,
@@ -1541,7 +1528,7 @@ static void qmi_device_qmux_client_release(struct qmi_device *device,uint8_t release_req[] = {0x01 ,0x02 ,0x00 , service_type, client_id };struct qmi_request *req; - qmux->release_users++; + qmux->shutdown.release_users++; req = __control_request_alloc(QMI_CTL_RELEASE_CLIENT_ID, release_req, sizeof(release_req),
@@ -1559,8 +1546,8 @@ static void __qmux_device_free(struct qmi_device_qmux *qmux)if (qmux->discover.destroy) qmux->discover.destroy (qmux->discover.user_data); -if (qmux->shutdown_idle) -l_idle_remove (qmux->shutdown_idle); +if (qmux->shutdown.idle) +l_idle_remove (qmux->shutdown.idle);l_free (qmux->version_str);l_free (qmux);
@@ -1570,10 +1557,10 @@ static void qmux_shutdown_destroy(void *user_data) {struct qmi_device_qmux *qmux = user_data; -if (qmux->shutdown_destroy) - qmux->shutdown_destroy (qmux->shutdown_user_data); +if (qmux->shutdown.destroy) + qmux->shutdown.destroy (qmux->shutdown.user_data); - qmux->shutdown_idle =NULL ; + qmux->shutdown.idle =NULL ;if (qmux->destroyed)__qmux_device_free (qmux);
@@ -1583,41 +1570,45 @@ static void qmux_shutdown_callback(struct l_idle *idle, void *user_data) {struct qmi_device_qmux *qmux = user_data; -if (qmux->release_users >0 ) +if (qmux->shutdown.release_users >0 )return ; qmux->shutting_down = true; -if (qmux->shutdown_func) - qmux->shutdown_func (qmux->shutdown_user_data); +if (qmux->shutdown.func) + qmux->shutdown.func (qmux->shutdown.user_data); qmux->shutting_down = false; -l_idle_remove (qmux->shutdown_idle); +l_idle_remove (qmux->shutdown.idle); } -static int qmi_device_qmux_shutdown (struct qmi_device *device, -qmi_shutdown_func_t func, +int qmi_qmux_device_shutdown (struct qmi_device *device, +qmi_qmux_device_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy) { -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_device_qmux *qmux; + +if (!device) +return -EINVAL ; + + qmux = l_container_of(device, struct qmi_device_qmux, super); -if (qmux->shutdown_idle) +if (qmux->shutdown.idle)return -EALREADY ;DEBUG (&qmux->debug,"device %p" , &qmux); - qmux->shutdown_idle =l_idle_create (qmux_shutdown_callback, qmux, + qmux->shutdown.idle =l_idle_create (qmux_shutdown_callback, qmux, qmux_shutdown_destroy); -if (!qmux->shutdown_idle) +if (!qmux->shutdown.idle)return -EIO ; - qmux->shutdown_func = func; - qmux->shutdown_user_data = user_data; - qmux->shutdown_destroy = destroy; + qmux->shutdown.func = func; + qmux->shutdown.user_data = user_data; + qmux->shutdown.destroy = destroy;return 0 ; }
@@ -1625,7 +1616,6 @@ static int qmi_device_qmux_shutdown(struct qmi_device *device,static const struct qmi_device_ops qmux_ops = { .write = qmi_device_qmux_write, .client_release = qmi_device_qmux_client_release, - .shutdown = qmi_device_qmux_shutdown, };struct qmi_device *qmi_qmux_device_new (const char *device)
@@ -1889,7 +1879,6 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)static const struct qmi_device_ops qrtr_ops = { .write = qmi_qrtr_node_write, .client_release =NULL , - .shutdown =NULL , };struct qmi_qrtr_node *qmi_qrtr_node_new (uint32_t node)
drivers/qmimodem/qmi.h +3 -3
@@ -57,10 +57,10 @@ struct qmi_result;struct qmi_service ;typedef void (*qmi_debug_func_t )(const char *str,void *user_data); -typedef void (*qmi_shutdown_func_t )(void *user_data);typedef void (*qmi_qmux_device_discover_func_t )(void *user_data);typedef void (*qmi_qmux_device_create_client_func_t )(struct qmi_service *,void *user_data); +typedef void (*qmi_qmux_device_shutdown_func_t )(void *user_data);typedef void (*qmi_qrtr_node_lookup_done_func_t )(void *);typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *);
@@ -80,8 +80,8 @@ bool qmi_qmux_device_get_service_version(struct qmi_device *device,uint16_t type, uint16_t *major, uint16_t *minor);bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type); - -int qmi_device_shutdown (struct qmi_device *device,qmi_shutdown_func_t func, +int qmi_qmux_device_shutdown (struct qmi_device *device, +qmi_qmux_device_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy);struct qmi_qrtr_node *qmi_qrtr_node_new (uint32_t node);
plugins/gobi.c +1 -1
@@ -234,7 +234,7 @@ static void shutdown_device(struct ofono_modem *modem)cleanup_services (data); -if (qmi_device_shutdown (data->device, shutdown_cb, modem,NULL ) <0 ) +if (qmi_qmux_device_shutdown (data->device, shutdown_cb, modem,NULL ) <0 )shutdown_cb (modem); }
Signature · 1 line
2.45.0
PATCH v2 27/33 qmi: Rename qmi_device_qmux to qmi_qmux_device
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/qmimodem/qmi.c +38 -38
@@ -88,7 +88,7 @@ struct qmi_device { bool writer_active : 1; }; -struct qmi_device_qmux { +struct qmi_qmux_device {struct qmi_device super;uint16_t control_major;uint16_t control_minor;
@@ -984,11 +984,11 @@ bool qmi_qmux_device_has_service(struct qmi_device *device, uint16_t type)return __find_service_info_by_type (device, type); } -static int qmi_device_qmux_write (struct qmi_device *device, +static int qmi_qmux_device_write (struct qmi_device *device,struct qmi_request *req) { -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_qmux_device *qmux = + l_container_of(device, struct qmi_qmux_device, super);struct qmi_mux_hdr *hdr;ssize_t bytes_written;
@@ -1012,7 +1012,7 @@ static int qmi_device_qmux_write(struct qmi_device *device,return 0 ; } -static void __rx_ctl_message (struct qmi_device_qmux *qmux, +static void __rx_ctl_message (struct qmi_qmux_device *qmux,uint8_t service_type,uint8_t client_id,const void *buf) {
@@ -1049,7 +1049,7 @@ static void __rx_ctl_message(struct qmi_device_qmux *qmux,static bool received_qmux_data (struct l_io *io,void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data;struct qmi_mux_hdr *hdr;unsigned char buf[2048 ];ssize_t bytes_read;
@@ -1138,7 +1138,7 @@ done:l_free (family); } -static uint8_t __ctl_request_submit (struct qmi_device_qmux *qmux, +static uint8_t __ctl_request_submit (struct qmi_qmux_device *qmux,struct qmi_request *req) { struct qmi_control_hdr *hdr =
@@ -1193,7 +1193,7 @@ static struct qmi_service *service_create(struct service_family *family)return service; } -static struct qmi_request *find_control_request (struct qmi_device_qmux *qmux, +static struct qmi_request *find_control_request (struct qmi_qmux_device *qmux,uint16_t tid) {struct qmi_request *req;
@@ -1211,7 +1211,7 @@ static struct qmi_request *find_control_request(struct qmi_device_qmux *qmux,return req; } -static void __qmux_discovery_finished (struct qmi_device_qmux *qmux) +static void __qmux_discovery_finished (struct qmi_qmux_device *qmux) {l_timeout_remove (qmux->discover.timeout); qmux->discover.func (qmux->discover.user_data);
@@ -1225,7 +1225,7 @@ static void __qmux_discovery_finished(struct qmi_device_qmux *qmux)static void qmux_sync_callback (uint16_t message,uint16_t length,const void *buffer,void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data;__qmux_discovery_finished (qmux); }
@@ -1233,7 +1233,7 @@ static void qmux_sync_callback(uint16_t message, uint16_t length,static void qmux_discover_callback (uint16_t message,uint16_t length,const void *buffer,void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data;struct qmi_device *device = &qmux->super;const struct qmi_result_code *result_code;const struct qmi_service_list *service_list;
@@ -1316,8 +1316,8 @@ static void qmux_discover_reply_timeout(struct l_timeout *timeout, void *user_data) {struct qmi_device *device = user_data; -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_qmux_device *qmux = + l_container_of(device, struct qmi_qmux_device, super);struct qmi_request *req;/* remove request from queues */
@@ -1332,13 +1332,13 @@ int qmi_qmux_device_discover(struct qmi_device *device,qmi_qmux_device_discover_func_t func, void *user_data, qmi_destroy_func_t destroy) { - struct qmi_device_qmux *qmux; + struct qmi_qmux_device *qmux;struct qmi_request *req;if (!device)return -EINVAL ; - qmux = l_container_of(device, struct qmi_device_qmux, super); + qmux = l_container_of(device, struct qmi_qmux_device, super);DEBUG (&qmux->debug,"device %p" , qmux);
@@ -1390,8 +1390,8 @@ static void qmux_client_create_timeout(struct l_timeout *timeout, {struct qmux_client_create_data *data = user_data;struct qmi_device *device = data->device; -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_qmux_device *qmux = + l_container_of(device, struct qmi_qmux_device, super);struct qmi_request *req;DEBUG (&qmux->debug,"" );
@@ -1412,8 +1412,8 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, {struct qmux_client_create_data *data = user_data;struct qmi_device *device = data->device; -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_qmux_device *qmux = + l_container_of(device, struct qmi_qmux_device, super);struct service_family *family =NULL ;struct qmi_service *service =NULL ;struct qmi_service_info info;
@@ -1470,7 +1470,7 @@ bool qmi_qmux_device_create_client(struct qmi_device *device, {unsigned char client_req[] = {0x01 ,0x01 ,0x00 , service_type };const struct qmi_service_info *info; -struct qmi_device_qmux *qmux; +struct qmi_qmux_device *qmux;struct qmi_request *req;struct qmux_client_create_data *create_data;
@@ -1484,7 +1484,7 @@ bool qmi_qmux_device_create_client(struct qmi_device *device,if (!info)return false; - qmux = l_container_of(device, struct qmi_device_qmux, super); + qmux = l_container_of(device, struct qmi_qmux_device, super); create_data = l_new(struct qmux_client_create_data, 1); create_data->super.destroy = qmux_client_create_data_free;
@@ -1514,17 +1514,17 @@ bool qmi_qmux_device_create_client(struct qmi_device *device,static void qmux_client_release_callback (uint16_t message,uint16_t length,const void *buffer,void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data; qmux->shutdown.release_users--; } -static void qmi_device_qmux_client_release (struct qmi_device *device, +static void qmi_qmux_device_client_release (struct qmi_device *device,uint16_t service_type,uint16_t client_id) { -struct qmi_device_qmux *qmux = - l_container_of(device, struct qmi_device_qmux, super); +struct qmi_qmux_device *qmux = + l_container_of(device, struct qmi_qmux_device, super);uint8_t release_req[] = {0x01 ,0x02 ,0x00 , service_type, client_id };struct qmi_request *req;
@@ -1537,7 +1537,7 @@ static void qmi_device_qmux_client_release(struct qmi_device *device,__ctl_request_submit (qmux, req); } -static void __qmux_device_free (struct qmi_device_qmux *qmux) +static void __qmux_device_free (struct qmi_qmux_device *qmux) {l_queue_destroy (qmux->control_queue, __request_free);
@@ -1555,7 +1555,7 @@ static void __qmux_device_free(struct qmi_device_qmux *qmux)static void qmux_shutdown_destroy (void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data;if (qmux->shutdown.destroy) qmux->shutdown.destroy (qmux->shutdown.user_data);
@@ -1568,7 +1568,7 @@ static void qmux_shutdown_destroy(void *user_data)static void qmux_shutdown_callback (struct l_idle *idle,void *user_data) { -struct qmi_device_qmux *qmux = user_data; +struct qmi_qmux_device *qmux = user_data;if (qmux->shutdown.release_users >0 )return ;
@@ -1588,12 +1588,12 @@ int qmi_qmux_device_shutdown(struct qmi_device *device, void *user_data, qmi_destroy_func_t destroy) { -struct qmi_device_qmux *qmux; +struct qmi_qmux_device *qmux;if (!device)return -EINVAL ; - qmux = l_container_of(device, struct qmi_device_qmux, super); + qmux = l_container_of(device, struct qmi_qmux_device, super);if (qmux->shutdown.idle)return -EALREADY ;
@@ -1614,20 +1614,20 @@ int qmi_qmux_device_shutdown(struct qmi_device *device, }static const struct qmi_device_ops qmux_ops = { - .write = qmi_device_qmux_write, - .client_release = qmi_device_qmux_client_release, + .write = qmi_qmux_device_write, + .client_release = qmi_qmux_device_client_release, };struct qmi_device *qmi_qmux_device_new (const char *device) { -struct qmi_device_qmux *qmux; +struct qmi_qmux_device *qmux;int fd; fd =open (device,O_RDWR |O_NONBLOCK |O_CLOEXEC );if (fd <0 )return NULL ; - qmux = l_new(struct qmi_device_qmux, 1); + qmux = l_new(struct qmi_qmux_device, 1);if (qmi_device_init (&qmux->super, fd, &qmux_ops) <0 ) {close (fd);
@@ -1644,12 +1644,12 @@ struct qmi_device *qmi_qmux_device_new(const char *device)void qmi_qmux_device_free (struct qmi_device *device) { -struct qmi_device_qmux *qmux; +struct qmi_qmux_device *qmux;if (!device)return ; - qmux = l_container_of(device, struct qmi_device_qmux, super); + qmux = l_container_of(device, struct qmi_qmux_device, super);DEBUG (&qmux->debug,"device %p" , qmux);__qmi_device_free (device);
@@ -1664,12 +1664,12 @@ void qmi_qmux_device_free(struct qmi_device *device)void qmi_qmux_device_set_debug (struct qmi_device *device,qmi_debug_func_t func,void *user_data) { -struct qmi_device_qmux *qmux; +struct qmi_qmux_device *qmux;if (device ==NULL )return ; - qmux = l_container_of(device, struct qmi_device_qmux, super); + qmux = l_container_of(device, struct qmi_qmux_device, super);__debug_data_init (&qmux->debug, func, user_data); }
Signature · 1 line
2.45.0
PATCH v2 28/33 qmi: Make qmux methods operate on 'qmi_qmux_device'
In reply to Denis Kenzior--- drivers/qmimodem/qmi.c | 70 ++++++++++++++++++------------------------ drivers/qmimodem/qmi.h | 19 ++++++------ plugins/gobi.c | 2 +- 3 files changed, 40 insertions(+), 51 deletions(-)
drivers/qmimodem/qmi.c +30 -40
@@ -38,6 +38,8 @@typedef void (*qmi_message_func_t )(uint16_t message,uint16_t length,const void *buffer,void *user_data); +struct qmi_device ; +struct discovery {qmi_destroy_func_t destroy; };
@@ -961,13 +963,16 @@ static const struct qmi_service_info *__find_service_info_by_type(return info; } -bool qmi_qmux_device_get_service_version (struct qmi_device *device, +bool qmi_qmux_device_get_service_version (struct qmi_qmux_device *qmux,uint16_t type,uint16_t *major,uint16_t *minor) {const struct qmi_service_info *info; - info =__find_service_info_by_type (device, type); +if (!qmux) +return false; + + info =__find_service_info_by_type (&qmux->super, type);if (!info)return false;
@@ -976,12 +981,12 @@ bool qmi_qmux_device_get_service_version(struct qmi_device *device,return true; } -bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type) +bool qmi_qmux_device_has_service (struct qmi_qmux_device *qmux,uint16_t type) { -if (!device) +if (!qmux)return false; -return __find_service_info_by_type (device, type); +return __find_service_info_by_type (&qmux->super, type); } static int qmi_qmux_device_write(struct qmi_device *device,
@@ -1328,21 +1333,18 @@ static void qmux_discover_reply_timeout(struct l_timeout *timeout,__qmux_discovery_finished (qmux); } -int qmi_qmux_device_discover (struct qmi_device *device, +int qmi_qmux_device_discover (struct qmi_qmux_device *qmux,qmi_qmux_device_discover_func_t func,void *user_data,qmi_destroy_func_t destroy) { -struct qmi_qmux_device *qmux;struct qmi_request *req; -if (!device) +if (!qmux)return -EINVAL ; - qmux = l_container_of(device, struct qmi_qmux_device, super); -DEBUG (&qmux->debug,"device %p" , qmux); -if (l_queue_length (device->service_infos) >0 || qmux->discover.tid) +if (l_queue_length (qmux->super.service_infos) >0 || qmux->discover.tid)return -EALREADY ; req = __control_request_alloc(QMI_CTL_GET_VERSION_INFO, NULL, 0,
@@ -1444,14 +1446,15 @@ static void qmux_client_create_callback(uint16_t message, uint16_t length, info.major = data->major; info.minor = data->minor; - family =service_family_create (device, &info, client_id->client); + family =service_family_create (&qmux->super, &info, client_id->client);DEBUG (&qmux->debug,"service family created [client=%d,type=%d]" , family->client_id, family->info.service_type); family =service_family_ref (family); hash_id =family_list_create_hash (family->info.service_type, family->client_id); -l_hashmap_insert (device->family_list,L_UINT_TO_PTR (hash_id), family); +l_hashmap_insert (qmux->super.family_list, +L_UINT_TO_PTR (hash_id), family); done:if (family)
@@ -1463,32 +1466,29 @@ done:service_family_unref (family); } -bool qmi_qmux_device_create_client (struct qmi_device *device, +bool qmi_qmux_device_create_client (struct qmi_qmux_device *qmux,uint16_t service_type,qmi_qmux_device_create_client_func_t func,void *user_data,qmi_destroy_func_t destroy) {unsigned char client_req[] = {0x01 ,0x01 ,0x00 , service_type };const struct qmi_service_info *info; -struct qmi_qmux_device *qmux;struct qmi_request *req;struct qmux_client_create_data *create_data; -if (!device || !func) +if (!qmux || !func)return false;if (service_type ==QMI_SERVICE_CONTROL )return false; - info =__find_service_info_by_type (device, service_type); + info =__find_service_info_by_type (&qmux->super, service_type);if (!info)return false; - qmux = l_container_of(device, struct qmi_qmux_device, super); - create_data = l_new(struct qmux_client_create_data, 1); create_data->super.destroy = qmux_client_create_data_free; - create_data->device = device; + create_data->device = &qmux->super; create_data->type = service_type; create_data->major = info->major; create_data->minor = info->minor;
@@ -1507,7 +1507,7 @@ bool qmi_qmux_device_create_client(struct qmi_device *device, create_data->timeout =l_timeout_create (8 , qmux_client_create_timeout, create_data,NULL ); -__qmi_device_discovery_started (device, &create_data->super); +__qmi_device_discovery_started (&qmux->super, &create_data->super);return true; }
@@ -1583,18 +1583,14 @@ static void qmux_shutdown_callback(struct l_idle *idle, void *user_data)l_idle_remove (qmux->shutdown.idle); } -int qmi_qmux_device_shutdown (struct qmi_device *device, +int qmi_qmux_device_shutdown (struct qmi_qmux_device *qmux,qmi_qmux_device_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy) { -struct qmi_qmux_device *qmux; - -if (!device) +if (!qmux)return -EINVAL ; - qmux = l_container_of(device, struct qmi_qmux_device, super); -if (qmux->shutdown.idle)return -EALREADY ;
@@ -1618,7 +1614,7 @@ static const struct qmi_device_ops qmux_ops = { .client_release = qmi_qmux_device_client_release, }; -struct qmi_device *qmi_qmux_device_new (const char *device) +struct qmi_qmux_device *qmi_qmux_device_new (const char *device) {struct qmi_qmux_device *qmux;int fd;
@@ -1639,19 +1635,16 @@ struct qmi_device *qmi_qmux_device_new(const char *device) qmux->control_queue =l_queue_new ();l_io_set_read_handler (qmux->super.io, received_qmux_data, qmux,NULL ); -return &qmux->super; +return qmux; } -void qmi_qmux_device_free (struct qmi_device *device) +void qmi_qmux_device_free (struct qmi_qmux_device *qmux) { -struct qmi_qmux_device *qmux; - -if (!device) +if (!qmux)return ; - qmux = l_container_of(device, struct qmi_qmux_device, super);DEBUG (&qmux->debug,"device %p" , qmux); -__qmi_device_free (device); +__qmi_device_free (&qmux->super);if (qmux->shutting_down) { qmux->destroyed = true;
@@ -1661,15 +1654,12 @@ void qmi_qmux_device_free(struct qmi_device *device)__qmux_device_free (qmux); } -void qmi_qmux_device_set_debug (struct qmi_device *device, +void qmi_qmux_device_set_debug (struct qmi_qmux_device *qmux,qmi_debug_func_t func,void *user_data) { -struct qmi_qmux_device *qmux; - -if (device ==NULL ) +if (!qmux)return ; - qmux = l_container_of(device, struct qmi_qmux_device, super);__debug_data_init (&qmux->debug, func, user_data); }
drivers/qmimodem/qmi.h +9 -10
@@ -52,9 +52,8 @@ enum qmi_data_endpoint_type {typedef void (*qmi_destroy_func_t )(void *user_data); -struct qmi_device ; -struct qmi_result ;struct qmi_service ; +struct qmi_result ;typedef void (*qmi_debug_func_t )(const char *str,void *user_data);typedef void (*qmi_qmux_device_discover_func_t )(void *user_data);
@@ -65,22 +64,22 @@ typedef void (*qmi_qrtr_node_lookup_done_func_t)(void *);typedef void (*qmi_service_result_func_t )(struct qmi_result *,void *); -struct qmi_device *qmi_qmux_device_new (const char *device); -void qmi_qmux_device_free (struct qmi_device *device); -void qmi_qmux_device_set_debug (struct qmi_device *device, +struct qmi_qmux_device *qmi_qmux_device_new (const char *device); +void qmi_qmux_device_free (struct qmi_qmux_device *qmux); +void qmi_qmux_device_set_debug (struct qmi_qmux_device *qmux,qmi_debug_func_t func,void *user_data); -int qmi_qmux_device_discover (struct qmi_device *device, +int qmi_qmux_device_discover (struct qmi_qmux_device *qmux,qmi_qmux_device_discover_func_t func,void *user_data,qmi_destroy_func_t destroy); -bool qmi_qmux_device_create_client (struct qmi_device *device, +bool qmi_qmux_device_create_client (struct qmi_qmux_device *qmux,uint16_t service_type,qmi_qmux_device_create_client_func_t func,void *user_data,qmi_destroy_func_t destroy); -bool qmi_qmux_device_get_service_version (struct qmi_device *device, +bool qmi_qmux_device_get_service_version (struct qmi_qmux_device *qmux,uint16_t type,uint16_t *major,uint16_t *minor); -bool qmi_qmux_device_has_service (struct qmi_device *device,uint16_t type); -int qmi_qmux_device_shutdown (struct qmi_device *device, +bool qmi_qmux_device_has_service (struct qmi_qmux_device *qmux,uint16_t type); +int qmi_qmux_device_shutdown (struct qmi_qmux_device *qmux,qmi_qmux_device_shutdown_func_t func,void *user_data,qmi_destroy_func_t destroy);
plugins/gobi.c +1 -1
@@ -61,7 +61,7 @@ struct service_request { };struct gobi_data { -struct qmi_device *device; +struct qmi_qmux_device *device;struct qmi_service *dms;struct qmi_service *wda;struct qmi_service *nas;
Signature · 1 line
2.45.0
PATCH v2 29/33 qmi: combine service_send_data into qmi_request
In reply to Denis KenziorInstead of allocating a separate service_send_data structure for each request, simply extend the qmi_request structure with the needed parameters. This saves an extra memory allocation since service_send_data lifetime was already tied to the qmi_request lifetime. While here, remove __service_request_alloc function. This helper was used in a single location and is unlikely to be used elsewhere.
--- drivers/qmimodem/qmi.c | 194 +++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 102 deletions(-)
drivers/qmimodem/qmi.c +92 -102
@@ -10,6 +10,7 @@#endif #define _GNU_SOURCE +#include <stddef.h> #include <stdio.h> #include <ctype.h> #include <dirent.h>
@@ -35,10 +36,11 @@l_util_debug ((debug)->func, (debug)->user_data,"%s:%i " fmt, \ __func__, __LINE__, ## args) -typedef void (*qmi_message_func_t)(uint16_t message, uint16_t length, - const void *buffer, void *user_data); - struct qmi_device; +struct qmi_request ; + +typedef void (*response_func_t )(struct qmi_request *,uint16_t message, +uint16_t length,const void *buffer);struct discovery {qmi_destroy_func_t destroy;
@@ -59,12 +61,20 @@ struct qmi_request {unsigned int service_handle;/* Always 0 for control */ uint8_t client;/* Always 0 for control and qrtr */ struct qmi_service_info info;/* Not used for control requests */ -qmi_message_func_t callback;void *user_data; +response_func_t callback; +void (*free_request)(struct qmi_request *req);uint16_t len;uint8_t data[]; }; +struct qmi_service_request { +qmi_service_result_func_t func; +void *user_data; +qmi_destroy_func_t destroy; +struct qmi_request super; +}; +struct qmi_device_ops {int (*write)(struct qmi_device *device,struct qmi_request *req); void (*client_release)(struct qmi_device *device,
@@ -215,12 +225,12 @@ static void __qmi_service_appeared(struct qmi_device *device, l_memdup(info, sizeof(struct qmi_service_info))); } -static struct qmi_request *__request_alloc (uint32_t service_type, -uint8_t client,uint16_t message, -const void *data, -uint16_t length,qmi_message_func_t func, -void *user_data) +static void *__request_alloc (uint32_t service_type, +uint8_t client,uint16_t message, +const void *data,uint16_t length, +size_t offset) { +void *mem;struct qmi_request *req;struct qmi_mux_hdr *hdr;struct qmi_message_hdr *msg;
@@ -233,10 +243,9 @@ static struct qmi_request *__request_alloc(uint32_t service_type, hdrlen +=QMI_SERVICE_HDR_SIZE ; msglen = hdrlen +QMI_MESSAGE_HDR_SIZE + length; - req =l_malloc (sizeof (struct qmi_request ) + msglen); - req->tid =0 ; - req->group_id =0 ; - req->service_handle =0 ; + mem =l_malloc (offset +sizeof (struct qmi_request ) + msglen); + req = mem + offset; +memset (req,0 ,sizeof (struct qmi_request )); req->len = msglen; req->client = client;
@@ -256,40 +265,24 @@ static struct qmi_request *__request_alloc(uint32_t service_type,if (data && length >0 )memcpy (req->data + hdrlen +QMI_MESSAGE_HDR_SIZE , data, length); - req->callback = func; - req->user_data = user_data; - -return req; +return mem; }static struct qmi_request *__control_request_alloc (uint16_t message, -const void *data,uint16_t length, -qmi_message_func_t func,void *user_data) +const void *data,uint16_t length) {return __request_alloc (QMI_SERVICE_CONTROL ,0x00 , message, - data, length, func, user_data); -} - -static struct qmi_request *__service_request_alloc ( -struct qmi_service_info *info, -uint8_t client,uint16_t message, -const void *data,uint16_t length, -qmi_message_func_t func,void *user_data) -{ -struct qmi_request *req; - - req =__request_alloc (info->service_type, client, message, - data, length, func, user_data); -memcpy (&req->info, info,sizeof (req->info)); - -return req; + data, length,0 ); }static void __request_free (void *data) {struct qmi_request *req = data; -l_free (req); +if (req->free_request) + req->free_request (req); +else +l_free (req); }static bool __request_compare (const void *a,const void *b)
@@ -817,7 +810,7 @@ static void __rx_message(struct qmi_device *device,return ;if (req->callback) - req->callback (message, length, data, req->user_data); + req->callback (req, message, length, data);__request_free (req); }
@@ -1047,7 +1040,7 @@ static void __rx_ctl_message(struct qmi_qmux_device *qmux,return ;if (req->callback) - req->callback (message, length, data, req->user_data); + req->callback (req, message, length, data);__request_free (req); }
@@ -1144,7 +1137,8 @@ done: }static uint8_t __ctl_request_submit (struct qmi_qmux_device *qmux, -struct qmi_request *req) +struct qmi_request *req, +response_func_t callback) {struct qmi_control_hdr *hdr = (struct qmi_control_hdr *) &req->data[QMI_MUX_HDR_SIZE ];
@@ -1156,6 +1150,7 @@ static uint8_t __ctl_request_submit(struct qmi_qmux_device *qmux, qmux->next_control_tid =1 ; req->tid = hdr->transaction; + req->callback = callback;l_queue_push_tail (qmux->super.req_queue, req);wakeup_writer (&qmux->super);
@@ -1227,18 +1222,18 @@ static void __qmux_discovery_finished(struct qmi_qmux_device *qmux)memset (&qmux->discover,0 ,sizeof (qmux->discover)); } -static void qmux_sync_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void qmux_sync_callback (struct qmi_request *req,uint16_t message, +uint16_t length,const void *buffer) { -struct qmi_qmux_device *qmux = user_data; +struct qmi_qmux_device *qmux = req->user_data;__qmux_discovery_finished (qmux); } -static void qmux_discover_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void qmux_discover_callback (struct qmi_request *req,uint16_t message, +uint16_t length,const void *buffer) { -struct qmi_qmux_device *qmux = user_data; +struct qmi_qmux_device *qmux = req->user_data;struct qmi_device *device = &qmux->super;const struct qmi_result_code *result_code;const struct qmi_service_list *service_list;
@@ -1306,11 +1301,14 @@ done:if ((qmux->control_major ==1 && qmux->control_minor >=5 ) || qmux->control_major >1 ) {struct qmi_request *req = -__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 , - qmux_sync_callback, qmux); +__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 ); + + req->user_data = qmux;DEBUG (&qmux->debug,"Sending sync to reset QMI" ); - qmux->discover.tid =__ctl_request_submit (qmux, req); + qmux->discover.tid =__ctl_request_submit (qmux, req, + qmux_sync_callback); +return ; }
@@ -1347,13 +1345,14 @@ int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,if (l_queue_length (qmux->super.service_infos) >0 || qmux->discover.tid)return -EALREADY ; - req =__control_request_alloc (QMI_CTL_GET_VERSION_INFO ,NULL ,0 , - qmux_discover_callback, qmux); + req =__control_request_alloc (QMI_CTL_GET_VERSION_INFO ,NULL ,0 ); + req->user_data = qmux; qmux->discover.func = func; qmux->discover.user_data = user_data; qmux->discover.destroy = destroy; - qmux->discover.tid =__ctl_request_submit (qmux, req); + qmux->discover.tid =__ctl_request_submit (qmux, req, + qmux_discover_callback); qmux->discover.timeout =l_timeout_create (DISCOVER_TIMEOUT , qmux_discover_reply_timeout, qmux,NULL );
@@ -1409,10 +1408,11 @@ static void qmux_client_create_timeout(struct l_timeout *timeout,DISCOVERY_DONE (data,NULL , data->user_data); } -static void qmux_client_create_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void qmux_client_create_callback (struct qmi_request *req, +uint16_t message,uint16_t length, +const void *buffer) { -struct qmux_client_create_data *data = user_data; +struct qmux_client_create_data *data = req->user_data;struct qmi_device *device = data->device;struct qmi_qmux_device *qmux = l_container_of(device, struct qmi_qmux_device, super);
@@ -1499,11 +1499,11 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux,DEBUG (&qmux->debug,"creating client [type=%d]" , service_type); req =__control_request_alloc (QMI_CTL_GET_CLIENT_ID , - client_req,sizeof (client_req), - qmux_client_create_callback, - create_data); + client_req,sizeof (client_req)); + req->user_data = create_data; - create_data->tid =__ctl_request_submit (qmux, req); + create_data->tid =__ctl_request_submit (qmux, req, + qmux_client_create_callback); create_data->timeout =l_timeout_create (8 , qmux_client_create_timeout, create_data,NULL );
@@ -1511,10 +1511,11 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux,return true; } -static void qmux_client_release_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void qmux_client_release_callback (struct qmi_request *req, +uint16_t message,uint16_t length, +const void *buffer) { -struct qmi_qmux_device *qmux = user_data; +struct qmi_qmux_device *qmux = req->user_data; qmux->shutdown.release_users--; }
@@ -1531,10 +1532,10 @@ static void qmi_qmux_device_client_release(struct qmi_device *device, qmux->shutdown.release_users++; req =__control_request_alloc (QMI_CTL_RELEASE_CLIENT_ID , - release_req,sizeof (release_req), - qmux_client_release_callback, qmux); + release_req,sizeof (release_req)); + req->user_data = qmux; -__ctl_request_submit (qmux, req); +__ctl_request_submit (qmux, req, qmux_client_release_callback); }static void __qmux_device_free (struct qmi_qmux_device *qmux)
@@ -2322,24 +2323,22 @@ bool qmi_service_get_version(struct qmi_service *service, uint8_t *out_version)return true; } -struct service_send_data { -qmi_service_result_func_t func; -void *user_data; -qmi_destroy_func_t destroy; -}; - -static void service_send_free (struct service_send_data *data) +static void qmi_service_request_free (struct qmi_request *req) { -if (data->destroy) - data->destroy (data->user_data); +struct qmi_service_request *sreq =l_container_of (req, + struct qmi_service_request, super); -l_free (data); +if (sreq->destroy) + sreq->destroy (sreq->user_data); + +l_free (sreq); } -static void service_send_callback (uint16_t message,uint16_t length, -const void *buffer,void *user_data) +static void service_send_callback (struct qmi_request *req,uint16_t message, +uint16_t length,const void *buffer) { -struct service_send_data *data = user_data; +struct qmi_service_request *sreq =l_container_of (req, + struct qmi_service_request, super);const struct qmi_result_code *result_code;uint16_t len;struct qmi_result result;
@@ -2359,10 +2358,8 @@ static void service_send_callback(uint16_t message, uint16_t length, result.error =L_LE16_TO_CPU (result_code->error); done: -if (data->func) - data->func (&result, data->user_data); - -service_send_free (data); +if (sreq->func) + sreq->func (&result, sreq->user_data); } uint16_t qmi_service_send(struct qmi_service *service,
@@ -2372,15 +2369,13 @@ uint16_t qmi_service_send(struct qmi_service *service, {struct qmi_device *device;struct service_family *family; -struct service_send_data *data; -struct qmi_request *req; -uint16_t tid; +struct qmi_service_request *sreq; +struct qmi_service_info *info;if (!service)return 0 ; family = service->family; -if (!family->group_id)return 0 ;
@@ -2388,23 +2383,21 @@ uint16_t qmi_service_send(struct qmi_service *service,if (!device)return 0 ; - data = l_new(struct service_send_data, 1); - - data->func = func; - data->user_data = user_data; - data->destroy = destroy; - - req =__service_request_alloc (&family->info, - family->client_id, message, - param ? param->data :NULL , - param ? param->length :0 , - service_send_callback, data); - + info = &family->info; + sreq =__request_alloc (info->service_type, family->client_id, message, + param ? param->data :NULL , + param ? param->length :0 , + offsetof(struct qmi_service_request , super));qmi_param_free (param); - tid =__service_request_submit (device, service, req); +memcpy (&sreq->super.info, info,sizeof (*info)); + sreq->super.callback = service_send_callback; + sreq->super.free_request = qmi_service_request_free; + sreq->func = func; + sreq->user_data = user_data; + sreq->destroy = destroy; -return tid; +return __service_request_submit (device, service, &sreq->super); }bool qmi_service_cancel (struct qmi_service *service,uint16_t id)
@@ -2435,8 +2428,6 @@ bool qmi_service_cancel(struct qmi_service *service, uint16_t id)return false; } -service_send_free (req->user_data); -__request_free (req);return true;
@@ -2450,7 +2441,6 @@ static bool remove_req_if_match(void *data, void *user_data)if (req->service_handle != service_handle)return false; -service_send_free (req->user_data);__request_free (req);return true;
Signature · 1 line
2.45.0
PATCH v2 30/33 qmi: combine qmux_client_create_data into qmi_request
In reply to Denis KenziorSimilarly to the previous commit, do not allocate a separate data structure to hold client creation details, and instead allocate it as a qmi_request specialization. Since the lifetime of struct qmux_client_create_data was already tied to the lifetime of the request (and vice-versa), this change allows the extra allocation to be optimized away.
While here, remove all vestiges of discovery and discovery_queue. This functionality is no longer needed since any data associated with the request will be freed when struct qmi_request is freed.
--- drivers/qmimodem/qmi.c | 153 ++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 102 deletions(-)
drivers/qmimodem/qmi.c +51 -102
@@ -42,10 +42,6 @@ struct qmi_request;typedef void (*response_func_t )(struct qmi_request *,uint16_t message,uint16_t length,const void *buffer); -struct discovery { -qmi_destroy_func_t destroy; -}; -struct qmi_service_info {uint32_t service_type;uint32_t qrtr_port;/* Always 0 on qmux */
@@ -90,7 +86,6 @@ struct qmi_device {struct l_io *io;struct l_queue *req_queue;struct l_queue *service_queue; -struct l_queue *discovery_queue;unsigned int next_group_id;/* Matches requests with services */ unsigned int next_service_handle;uint16_t next_service_tid;
@@ -268,11 +263,12 @@ static void *__request_alloc(uint32_t service_type,return mem; } -static struct qmi_request *__control_request_alloc (uint16_t message, -const void *data,uint16_t length) +static void *__control_request_alloc (uint16_t message, +const void *data,uint16_t length, +size_t offset) {return __request_alloc (QMI_SERVICE_CONTROL ,0x00 , message, - data, length,0 ); + data, length, offset); }static void __request_free (void *data)
@@ -293,14 +289,6 @@ static bool __request_compare(const void *a, const void *b)return req->tid == tid; } -static void __discovery_free (void *data) -{ -struct discovery *d = data; -qmi_destroy_func_t destroy = d->destroy; - -destroy (d); -} -static void __notify_free (void *data) {struct qmi_notify *notify = data;
@@ -815,33 +803,6 @@ static void __rx_message(struct qmi_device *device,__request_free (req); } -static void __qmi_device_discovery_started (struct qmi_device *device, -struct discovery *d) -{ -l_queue_push_tail (device->discovery_queue, d); -} - -static void __qmi_device_discovery_complete (struct qmi_device *device, -struct discovery *d) -{ -if (!l_queue_remove (device->discovery_queue, d)) -return ; -} - -/* -* Prevents re-entrancy problems by removing the entry from the discovery_queue -* before calling the callback. -*/ -#define DISCOVERY_DONE (data, ...)\ -do {\ - __qmi_device_discovery_complete(data->device, &data->super);\ -\ - if (data->func)\ - data->func(__VA_ARGS__);\ -\ - __discovery_free(&data->super);\ -} while (0) -static void family_destroy (void *data) {struct service_family *family = data;
@@ -873,7 +834,6 @@ static int qmi_device_init(struct qmi_device *device, int fd, device->req_queue =l_queue_new (); device->service_queue =l_queue_new (); - device->discovery_queue =l_queue_new (); device->service_infos =l_queue_new (); device->family_list =l_hashmap_new ();
@@ -888,7 +848,6 @@ static void __qmi_device_free(struct qmi_device *device) {l_queue_destroy (device->service_queue, __request_free);l_queue_destroy (device->req_queue, __request_free); -l_queue_destroy (device->discovery_queue, __discovery_free);l_io_destroy (device->io);
@@ -1301,7 +1260,7 @@ done:if ((qmux->control_major ==1 && qmux->control_minor >=5 ) || qmux->control_major >1 ) {struct qmi_request *req = -__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 ); +__control_request_alloc (QMI_CTL_SYNC ,NULL ,0 ,0 ); req->user_data = qmux;
@@ -1345,7 +1304,7 @@ int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,if (l_queue_length (qmux->super.service_infos) >0 || qmux->discover.tid)return -EALREADY ; - req =__control_request_alloc (QMI_CTL_GET_VERSION_INFO ,NULL ,0 ); + req =__control_request_alloc (QMI_CTL_GET_VERSION_INFO ,NULL ,0 ,0 ); req->user_data = qmux; qmux->discover.func = func;
@@ -1360,9 +1319,8 @@ int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,return 0 ; } -struct qmux_client_create_data { -struct discovery super; -struct qmi_device *device; +struct qmux_create_client_request { +struct qmi_qmux_device *qmux;uint8_t type;uint16_t major;uint16_t minor;
@@ -1370,52 +1328,46 @@ struct qmux_client_create_data {void *user_data;qmi_destroy_func_t destroy;struct l_timeout *timeout; -uint16_t tid; +struct qmi_request super; }; -static void qmux_client_create_data_free (void *user_data) +static void qmux_create_client_request_free (struct qmi_request *r) { -struct qmux_client_create_data *data = user_data; +struct qmux_create_client_request *req = + l_container_of(r, struct qmux_create_client_request, super); -if (data->timeout) -l_timeout_remove (data->timeout); +if (req->timeout) +l_timeout_remove (req->timeout); -if (data->destroy) - data->destroy (data->user_data); +if (req->destroy) + req->destroy (req->user_data); -l_free (data); +l_free (req); } -static void qmux_client_create_timeout (struct l_timeout *timeout, +static void qmux_create_client_timeout (struct l_timeout *timeout,void *user_data) { -struct qmux_client_create_data *data = user_data; -struct qmi_device *device = data->device; -struct qmi_qmux_device *qmux = - l_container_of(device, struct qmi_qmux_device, super); -struct qmi_request *req; +struct qmux_create_client_request *req = user_data; +struct qmi_qmux_device *qmux = req->qmux;DEBUG (&qmux->debug,"" ); -l_timeout_remove (data->timeout); - data->timeout =NULL ; +l_timeout_remove (req->timeout); + req->timeout =NULL ;/* remove request from queues */ - req =find_control_request (qmux, data->tid); -if (req) -__request_free (req); - -DISCOVERY_DONE (data,NULL , data->user_data); +find_control_request (qmux, req->super.tid); +__request_free (&req->super); } -static void qmux_client_create_callback (struct qmi_request *req, +static void qmux_create_client_callback (struct qmi_request *r,uint16_t message,uint16_t length,const void *buffer) { -struct qmux_client_create_data *data = req->user_data; -struct qmi_device *device = data->device; -struct qmi_qmux_device *qmux = - l_container_of(device, struct qmi_qmux_device, super); +struct qmux_create_client_request *req = + l_container_of(r, struct qmux_create_client_request, super); +struct qmi_qmux_device *qmux = req->qmux;struct service_family *family =NULL ;struct qmi_service *service =NULL ;struct qmi_service_info info;
@@ -1438,13 +1390,13 @@ static void qmux_client_create_callback(struct qmi_request *req,if (len !=QMI_CLIENT_ID_SIZE ) goto done; -if (client_id->service != data->type) +if (client_id->service != req->type) goto done;memset (&info,0 ,sizeof (family->info)); - info.service_type = data->type; - info.major = data->major; - info.minor = data->minor; + info.service_type = req->type; + info.major = req->major; + info.minor = req->minor; family =service_family_create (&qmux->super, &info, client_id->client); DEBUG(&qmux->debug, "service family created [client=%d,type=%d]",
@@ -1460,7 +1412,8 @@ done:if (family) service =service_create (family); -DISCOVERY_DONE (data, service, data->user_data); +if (req->func) + req->func (service, req->user_data);if (family)service_family_unref (family);
@@ -1473,8 +1426,7 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux, {unsigned char client_req[] = {0x01 ,0x01 ,0x00 , service_type };const struct qmi_service_info *info; -struct qmi_request *req; -struct qmux_client_create_data *create_data; +struct qmux_create_client_request *req;if (!qmux || !func)return false;
@@ -1486,28 +1438,25 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux,if (!info)return false; - create_data = l_new(struct qmux_client_create_data, 1); - create_data->super.destroy = qmux_client_create_data_free; - create_data->device = &qmux->super; - create_data->type = service_type; - create_data->major = info->major; - create_data->minor = info->minor; - create_data->func = func; - create_data->user_data = user_data; - create_data->destroy = destroy; -DEBUG (&qmux->debug,"creating client [type=%d]" , service_type); req =__control_request_alloc (QMI_CTL_GET_CLIENT_ID , - client_req,sizeof (client_req)); - req->user_data = create_data; - - create_data->tid =__ctl_request_submit (qmux, req, - qmux_client_create_callback); - create_data->timeout =l_timeout_create (8 , qmux_client_create_timeout, - create_data,NULL ); + client_req,sizeof (client_req), + offsetof(struct qmux_create_client_request , + super)); + req->super.free_request = qmux_create_client_request_free; + req->qmux = qmux; + req->type = service_type; + req->major = info->major; + req->minor = info->minor; + req->func = func; + req->user_data = user_data; + req->destroy = destroy; + req->timeout =l_timeout_create (8 , qmux_create_client_timeout, + req,NULL ); + +__ctl_request_submit (qmux, &req->super, qmux_create_client_callback); -__qmi_device_discovery_started (&qmux->super, &create_data->super);return true; }
@@ -1532,7 +1481,7 @@ static void qmi_qmux_device_client_release(struct qmi_device *device, qmux->shutdown.release_users++; req =__control_request_alloc (QMI_CTL_RELEASE_CLIENT_ID , - release_req,sizeof (release_req)); + release_req,sizeof (release_req),0 ); req->user_data = qmux;__ctl_request_submit (qmux, req, qmux_client_release_callback);
Signature · 1 line
2.45.0
PATCH v2 31/33 gprs: Fix memory leak
In reply to Denis KenziorAs reported by lsan:
==1120532==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 24 byte(s) in 1 object(s) allocated from:
#0 0x761c0dadf359 in __interceptor_malloc /usr/src/debug/gcc/gcc/libsanitizer/asan/asan_malloc_linux.cpp:69
#1 0x9ae9b9 in l_malloc ell/util.c:49
#2 0x9f41a7 in l_uintset_new_from_range ell/uintset.c:181
#3 0x8e486f in ofono_gprs_set_cid_range src/gprs.c:2669
#4 0x55b8d0 in get_default_profile_number_cb drivers/qmimodem/gprs.c:399
#5 0x52f822 in service_send_callback drivers/qmimodem/qmi.c:2311
#6 0x51f461 in __rx_message drivers/qmimodem/qmi.c:801
#7 0x521d22 in received_qmux_data drivers/qmimodem/qmi.c:1052
#8 0x9da348 in io_callback ell/io.c:105
#9 0x9d5077 in l_main_iterate ell/main.c:461
#10 0x7811df in event_check src/main.c:182
#11 0x761c0e1260ed (/usr/lib/libglib-2.0.so.0+0x5b0ed) (BuildId: e717410de6953d0e1e85882d796204ca2675f1d4)
#12 0x7ffe00000000 (<unknown module>)Indirect leak of 8 byte(s) in 1 object(s) allocated from:
#0 0x761c0dadf359 in __interceptor_malloc /usr/src/debug/gcc/gcc/libsanitizer/asan/asan_malloc_linux.cpp:69
#1 0x9ae9b9 in l_malloc ell/util.c:49
#2 0x9f4211 in l_uintset_new_from_range ell/uintset.c:182
#3 0x8e486f in ofono_gprs_set_cid_range src/gprs.c:2669
#4 0x55b8d0 in get_default_profile_number_cb drivers/qmimodem/gprs.c:399
#5 0x52f822 in service_send_callback drivers/qmimodem/qmi.c:2311
#6 0x51f461 in __rx_message drivers/qmimodem/qmi.c:801
#7 0x521d22 in received_qmux_data drivers/qmimodem/qmi.c:1052
#8 0x9da348 in io_callback ell/io.c:105
#9 0x9d5077 in l_main_iterate ell/main.c:461
#10 0x7811df in event_check src/main.c:182
#11 0x761c0e1260ed (/usr/lib/libglib-2.0.so.0+0x5b0ed) (BuildId: e717410de6953d0e1e85882d796204ca2675f1d4)
#12 0x7ffe00000000 (<unknown module>)The cid range can be set by the driver at any time. If the gprs atom is removed prior to being registered, the memory is not freed. Fix that by moving uintset deallocation to the remove method.
--- src/gprs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
src/gprs.c +3 -3
@@ -3014,9 +3014,6 @@ static void gprs_unregister(struct ofono_atom *atom)free_contexts (gprs); -l_uintset_free (gprs->used_cids); - gprs->used_cids =NULL ; -if (gprs->netreg_watch) {if (gprs->status_watch) { __ofono_netreg_remove_status_watch(gprs->netreg,
@@ -3055,6 +3052,9 @@ static void gprs_remove(struct ofono_atom *atom)if (gprs->suspend_timeout)g_source_remove (gprs->suspend_timeout); +l_uintset_free (gprs->used_cids); + gprs->used_cids =NULL ; +l_uintset_free (gprs->used_pids); gprs->used_pids =NULL ;
Signature · 1 line
2.45.0
PATCH v2 32/33 qmi:gprs: Don't fail on unsupported INDICATION_REGISTER
In reply to Denis KenziorSome modems (like Sierra MC7710) seemingly do not support INDICATION_REGISTER request on WDS. Do not fail gprs atom registration if so. Only indications of interest are currently used only for informational output to syslog.
ofonod[1120532]: drivers/qmimodem/gprs.c:set_event_report_cb() ofonod[1120532]: drivers/qmimodem/lte.c:modify_profile_cb() ofonod[1120532]: drivers/qmimodem/gprs.c:indication_register_cb() ofonod[1120532]: indication_register_cb: 71 ofonod[1120532]: src/gprs.c:gprs_remove() atom: 0x504000022a90 ofonod[1120532]: drivers/qmimodem/gprs.c:qmi_gprs_remove()
--- drivers/qmimodem/gprs.c | 8 ++++++-- drivers/qmimodem/qmi.h | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/qmimodem/gprs.c +6 -2
@@ -279,8 +279,12 @@ static void indication_register_cb(struct qmi_result *result, void *user_data)DBG ("" );if (qmi_result_set_error (result, &error)) { -ofono_error ("indication_register_cb: %hd" , error); - goto error; +ofono_error ("indication_register_cb: %s(%hd)" , +qmi_result_get_error (result), error); + +/* Some modems do not support indications, ignore */ +if (error !=QMI_ERROR_INVALID_QMI_COMMAND ) + goto error; }/*
drivers/qmimodem/qmi.h +4 -0
@@ -50,6 +50,10 @@ enum qmi_data_endpoint_type { QMI_DATA_ENDPOINT_TYPE_BAM_DMUX = 0x05, }; +enum qmi_error { +QMI_ERROR_INVALID_QMI_COMMAND =71 , +}; +typedef void (*qmi_destroy_func_t )(void *user_data);struct qmi_service ;
Signature · 1 line
2.45.0
PATCH v2 33/33 qmi: non-premultiplexed MHI devices
In reply to Denis KenziorMHI devices by default create a single main interface and support a single bearer over it. However, this requires a WDS Bind Data Mux command to be issued with 'mux_id' 0. Update the qmi gprs_context atom driver to support multiple arguments, one of them being the mux_id and the other being the WDS service lightweight handle. If mux_id is -1, then the WDS Bind Data Mux command is skipped. Update gobi and qrtrqmi drivers to the new API.
--- drivers/qmimodem/gprs-context.c | 15 ++++++++------- plugins/gobi.c | 4 ++-- plugins/qrtrqmi.c | 9 ++++++++- 3 files changed, 18 insertions(+), 10 deletions(-)
drivers/qmimodem/gprs-context.c +8 -7
@@ -550,16 +550,17 @@ static int qmi_gprs_context_bind_mux(struct ofono_gprs_context *gc,return -EIO ; } -static int qmi_gprs_context_probe (struct ofono_gprs_context *gc, -unsigned int vendor,void *user_data) +static int qmi_gprs_context_probev (struct ofono_gprs_context *gc, +unsigned int vendor,va_list args) { -struct qmi_service *wds = user_data; +int mux_id =va_arg (args, int); + struct qmi_service *wds = va_arg(args, struct qmi_service *);struct gprs_context_data *data;DBG ("" ); -if (vendor) { -int r =qmi_gprs_context_bind_mux (gc, wds, vendor); +if (mux_id !=-1 ) { +int r =qmi_gprs_context_bind_mux (gc, wds, mux_id);if (r <0 ) {qmi_service_free (wds);
@@ -569,7 +570,7 @@ static int qmi_gprs_context_probe(struct ofono_gprs_context *gc, data = l_new(struct gprs_context_data, 1); data->wds = wds; - data->mux_id = vendor; + data->mux_id = mux_id;qmi_service_register (data->wds,QMI_WDS_PACKET_SERVICE_STATUS , pkt_status_notify, gc,NULL );
@@ -593,7 +594,7 @@ static void qmi_gprs_context_remove(struct ofono_gprs_context *gc)static const struct ofono_gprs_context_driver driver = { .flags =OFONO_ATOM_DRIVER_FLAG_REGISTER_ON_PROBE , - .probe = qmi_gprs_context_probe, + .probev = qmi_gprs_context_probev, .remove = qmi_gprs_context_remove, .activate_primary = qmi_activate_primary, .deactivate_primary = qmi_deactivate_primary,
plugins/gobi.c +2 -2
@@ -762,7 +762,7 @@ static void gobi_setup_gprs(struct ofono_modem *modem)if (n_premux ==0 ) { interface =ofono_modem_get_string (modem,"NetworkInterface" ); - gc =ofono_gprs_context_create (modem,0 ,"qmimodem" , + gc =ofono_gprs_context_create (modem,0 ,"qmimodem" ,-1 ,qmi_service_clone (data->wds));if (!gc) { ofono_warn("Unable to create gprs-context for: %s",
@@ -788,7 +788,7 @@ static void gobi_setup_gprs(struct ofono_modem *modem)sprintf (buf,"PremuxInterface%dMuxId" , i +1 ); mux_id =ofono_modem_get_integer (modem, buf); - gc =ofono_gprs_context_create (modem, mux_id,"qmimodem" , + gc =ofono_gprs_context_create (modem,0 ,"qmimodem" , mux_id,qmi_service_clone (data->wds));if (!gc) {
plugins/qrtrqmi.c +8 -1
@@ -315,7 +315,7 @@ static int setup_gprs_context(uint8_t mux_id, const char *interface,struct qmi_qrtr_node *node = data->node;struct ofono_gprs_context *gc; - gc =ofono_gprs_context_create (modem,0 ,"qmimodem" , + gc =ofono_gprs_context_create (modem,0 ,"qmimodem" , mux_id,qmi_qrtr_node_get_service (node,QMI_SERVICE_WDS ));if (!gc) { ofono_warn("Unable to create gprs-context for: %s, %s[%hhu]",
@@ -347,6 +347,13 @@ static void setup_gprs(struct ofono_modem *modem)return ; } +/* Upstream driver default, single interface, single context */ +if (!n_premux) { + interface =ofono_modem_get_string (modem,"NetworkInterface" ); +setup_gprs_context (0 , interface, gprs); +return ; + } +for (i =0 ; i < n_premux; i++) {int mux_id;
Signature · 1 line
2.45.0