[1/2] qmimodem: Support 16-bit service types

Commit Message

Steve Schrock Feb. 17, 2024, 12:30 a.m. UTC

Prepare for QRTR which has service types greater than 255.
---
 drivers/qmimodem/qmi.c | 8 ++++----
 drivers/qmimodem/qmi.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

[e-mail] Feb. 20, 2024, 3:30 p.m. UTC | #1

Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <[e-mail]>:

On Sat, 17 Feb 2024 00:30:31 +0000 you wrote:
> Prepare for QRTR which has service types greater than 255.
> ---
>  drivers/qmimodem/qmi.c | 8 ++++----
>  drivers/qmimodem/qmi.h | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)

Here is the summary with links:
  - [1/2] qmimodem: Support 16-bit service types
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=6984ddd42694
  - [2/2] qmimodem: Fix checkpatch.pl warnings and errors
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=00444ee7c8bf

You are awesome, thank you!

Patch

diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 7f0d6054..3c8c00a6 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -1115,7 +1115,7 @@  static const void *tlv_get(const void *data, uint16_t size,
 	return NULL;
 }
 
-bool qmi_device_get_service_version(struct qmi_device *device, uint8_t type,
+bool qmi_device_get_service_version(struct qmi_device *device, uint16_t type,
 					uint16_t *major, uint16_t *minor)
 {
 	struct qmi_version *info;
@@ -1134,7 +1134,7 @@  bool qmi_device_get_service_version(struct qmi_device *device, uint8_t type,
 	return false;
 }
 
-bool qmi_device_has_service(struct qmi_device *device, uint8_t type)
+bool qmi_device_has_service(struct qmi_device *device, uint16_t type)
 {
 	struct qmi_version *info;
 	int i;
@@ -2171,7 +2171,7 @@  static void service_create_shared_data_free(gpointer user_data)
 	g_free(data);
 }
 
-bool qmi_service_create_shared(struct qmi_device *device, uint8_t type,
+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)
 {
@@ -2227,7 +2227,7 @@  bool qmi_service_create_shared(struct qmi_device *device, uint8_t type,
 }
 
 bool qmi_service_create(struct qmi_device *device,
-				uint8_t type, qmi_create_func_t func,
+				uint16_t type, qmi_create_func_t func,
 				void *user_data, qmi_destroy_func_t destroy)
 {
 	return qmi_service_create_shared(device, type, func,
diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
index 8006e015..3fdf960b 100644
--- a/drivers/qmimodem/qmi.h
+++ b/drivers/qmimodem/qmi.h
@@ -97,8 +97,8 @@  bool qmi_device_discover(struct qmi_device *device, qmi_discover_func_t func,
 bool 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, uint8_t type);
-bool qmi_device_get_service_version(struct qmi_device *device, uint8_t type,
+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);
 
 bool qmi_device_sync(struct qmi_device *device,
@@ -158,10 +158,10 @@  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(struct qmi_device *device,
-				uint8_t type, qmi_create_func_t func,
+				uint16_t type, qmi_create_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);
 bool qmi_service_create_shared(struct qmi_device *device,
-				uint8_t type, qmi_create_func_t func,
+				uint16_t type, qmi_create_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);
 
 struct qmi_service *qmi_service_ref(struct qmi_service *service);