From patchwork Sat Feb 17 00:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Schrock X-Patchwork-Id: 13561120 Received: from mx0a-003ede02.pphosted.com (mx0a-003ede02.pphosted.com [205.220.169.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41A763D71 for ; Sat, 17 Feb 2024 00:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.169.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708130938; cv=none; b=AhthITu2NqmKDS1od701j5esUQu7fftLn6sOZGj3A2jRNWvXYsxcHGS/ioOrpAIISsITXI7VENL+ro8KfVkk9w22xWCvveNDaYc4wtypaPQFzKo/0m75KkfcrFpYeO4HHOoHmvk9oQaYiArJNIy/qY03aWYG9IcF46rujk0YqPw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708130938; c=relaxed/simple; bh=5IDLS/4KKexI8Mp9AJBEk8V6lRGv2liwq19dAk/+L3A=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=STzXwCtWW7UF8J85rvE9uRZy5AWdIV8yERXT0qv1g6khf/21wHRigkjY/bPh5J02euXwSWJuxCXXzIQ4Qx/c/Ae+ZU+opWubBdnnrvhPwi3g5XXgvcMx6YxfG9NXFnQpTvekWQEyIC6+3QN+CdTcz/qAJLap1L/8/2oJBw0/Iso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com; spf=pass smtp.mailfrom=getcruise.com; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=bc9b5gCi; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=P2CEDtgM; arc=none smtp.client-ip=205.220.169.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=getcruise.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="bc9b5gCi"; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="P2CEDtgM" Received: from pps.filterd (m0286617.ppops.net [127.0.0.1]) by mx0b-003ede02.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41GEgfe6000425 for ; Fri, 16 Feb 2024 16:32:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; h=from:to:cc:subject:date:message-id:mime-version:content-type; s=ppemail; bh=BqaOMPxxr7BjrQFzF2vrdwo1ZfXpKmRI3sB+yyHkQ4Y=; b=b c9b5gCitX8xspiO+7gsWWKu/NeWQDZ6v5rPQJlKZjSwhn7H1S8M175V2001GOJDn mVdPUyTDHvzdyR14BGGzF0ZSpEV6J7YOSxAnGk5hobhfVgnEOgLVTjS9/oXKOaEm BvY8jXXl/Y9VtVmd5GG46jGfKu2IpkCsWmptfY9pzb8JjseCubyASU/ahSq+QCBo 1IzOu1TcXGDEr7AjHylkVj2Nbm0L643L1TYtyq19YE1NGlT3WZvHKJe2wse1UTkO +dA69YCa4KpEjdcnRqJaJ5Tpw2pEjZneZboM84GnIqZstgBbp9SDQBJ5mmstAlzq 1b9l+go2ibMtlvnkHyQHw== Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by mx0b-003ede02.pphosted.com (PPS) with ESMTPS id 3w715mwmsf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Feb 2024 16:32:01 -0800 (PST) Received: by mail-yb1-f199.google.com with SMTP id 3f1490d57ef6-dcd1779adbeso5437209276.3 for ; Fri, 16 Feb 2024 16:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; s=google; t=1708129920; x=1708734720; darn=lists.linux.dev; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=BqaOMPxxr7BjrQFzF2vrdwo1ZfXpKmRI3sB+yyHkQ4Y=; b=P2CEDtgMA4eCybWDlNB+qAgHdm8sZuMpmJPVYgM9I/+q8qG3fBHqQBKCjA7hswa6q1 tMXmcKy4HmszZ/P+BexS+bTbLYk0LbGjXzndqY7R+0xvLBcLvpZhQp3tfyes2K9smSdz mxnA5bvqIOEJkw7v9SEzasMcyHjHHBrdxqfuCPwl3/O7J+AJYi2PdyCDbs4P37bo/u1J O0VXBV09lOmpyOhMGSG2LY+17ALaOXT2hoVwWgM4OFJ2faubaeetEar38QPQr6lWCn54 f35miiVFCC3yPYnIJ7ZuEcCU23dMD5NwjWuW9560s09EQOs6UStgTe6dtAEMremS9Mw9 SPKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708129920; x=1708734720; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BqaOMPxxr7BjrQFzF2vrdwo1ZfXpKmRI3sB+yyHkQ4Y=; b=CTv+WZEFiP/WvK8MZaTHj4KWY5m7PoNeAZQMTCPfGs+6OB7Y/gZzWnTN+a79eES9Tm wfP2ppTcsDgHusK4h4GW85k09XMkM7hVE6mhvDbmHxVj1fm6P358LDxL9eMXumTL0D0c bi/2miRwlAvvFP4fkNcsjDIOwEQMPFfGLZBZcdmbULO1BIrKGc/DHGhSvQJm8G/l4SZG SQxX+dnIMjQyGPyHY48LuUa6tsVRBeVWv7wGLeHt1D56m+skJiGMLPWDcFLR0fBqgGgh DiwOATN4xqKFBPmrgO8VihpiCGj16XgACK1TGyrd8ApVYyMIQKx2NAeMsLKFZ8oCTnBV 0vVA== X-Gm-Message-State: AOJu0YzrkQk8x4CK9BgLCJpJ7kmdbem2aH/pEXU1kIkfjLBrbAfJDI4U qh1CUcy2tNMJJiG68+LJgBhncPrc07OT5F4uexT5+bOdIzcMHLzBCYHxW/t88AvuZA8jG0WdDmF Li0KpcRHuaL250tRoOauZT/yDXwXYLCNsztFXne82r4EsiIKhViHpsxwJ7TgS3Jdxc7C137Kcra E5sMLZNFICRlCE/yEKiglRyQURbpXEbRxGujfpsH8SFA6Fx9Q= X-Received: by 2002:a05:6902:4ca:b0:dcc:8e02:a6b6 with SMTP id v10-20020a05690204ca00b00dcc8e02a6b6mr6993814ybs.2.1708129919698; Fri, 16 Feb 2024 16:31:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH23MS60QTUmLDKWnFnNHnT1RUe+nadlNlA5M2PysLpb3enAo6/1USL9Kklg5tjnkxhWpfbUw== X-Received: by 2002:a05:6902:4ca:b0:dcc:8e02:a6b6 with SMTP id v10-20020a05690204ca00b00dcc8e02a6b6mr6993804ybs.2.1708129919325; Fri, 16 Feb 2024 16:31:59 -0800 (PST) Received: from localhost.localdomain ([140.177.143.152]) by smtp.gmail.com with ESMTPSA id e3-20020a05620a12c300b0078606e85a8esm400312qkl.107.2024.02.16.16.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 16:31:59 -0800 (PST) From: Steve Schrock To: ofono@lists.linux.dev Cc: Steve Schrock Subject: [PATCH 1/2] qmimodem: Support 16-bit service types Date: Sat, 17 Feb 2024 00:30:31 +0000 Message-Id: <20240217003032.76366-1-steve.schrock@getcruise.com> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: Kxi4HloLsN2ITHxA7NqxVFfV1c3pl9pq X-Proofpoint-ORIG-GUID: Kxi4HloLsN2ITHxA7NqxVFfV1c3pl9pq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-16_24,2024-02-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 lowpriorityscore=0 clxscore=1011 mlxlogscore=999 malwarescore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402170001 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(-) 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); From patchwork Sat Feb 17 00:30:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Schrock X-Patchwork-Id: 13561108 Received: from mx0a-003ede02.pphosted.com (mx0a-003ede02.pphosted.com [205.220.169.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0072D2FA for ; Sat, 17 Feb 2024 00:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.169.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708129935; cv=none; b=t0+Yr/SxGbHoBM/4ogxmJmavNBHa/O3smBnN1ykQ1/YZyc01pFhuAOOBp2OA35GnwKONicOWiktYV9uUSlQ0iMRVyrPch/YeL8Gvs0SEM5mNvnbCqS97y3u1sDUhVWjQF2cPbArwIt53g9V8JRO1sadebuNwLovdbSSmPdAQah0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708129935; c=relaxed/simple; bh=mulejdpJzC35GRiNBHhdoqWd+iidSB0nPA40zPn97tA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Xgmf6w4UgKWD4TNlABfuKycHqeBUYNczf7tf4GKe3trvA+LCbjQkbOZMUgIDTEkoAxWAGQ7a5ubrlbgCFX+BAa9u3R1sdlPmGP0n163upAPM6g8KB45mEUKY79Ulqg+CZdWmWKgST/fAVVuLXZgEB8EqFPn0IqOJRBYtagy0TjQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com; spf=pass smtp.mailfrom=getcruise.com; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=LGHkLeDj; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b=IgeKgMNT; arc=none smtp.client-ip=205.220.169.153 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=getcruise.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=getcruise.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="LGHkLeDj"; dkim=pass (2048-bit key) header.d=getcruise.com header.i=@getcruise.com header.b="IgeKgMNT" Received: from pps.filterd (m0286617.ppops.net [127.0.0.1]) by mx0b-003ede02.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41GFkm2l006691 for ; Fri, 16 Feb 2024 16:32:11 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=ppemail; bh=sP//DawenCm9Q9Idqm9VLY 53yi34Bi5tG/3ybyVmS0Y=; b=LGHkLeDjRg9Xtvj6Kj25Ruu7nN5OILlWRBbZ9J L6Hh9rPcRkldBeYiR1G4/aYUmxDMtMJHpQQhM9C6mh47vMVYLSUzxKbr7O25XSBp KihjxpiyzacMei0G1hsZBVBqKh/R5ZPJtMKNE7qag01xp8X195hS5rxr8WaiBSwk macxd6c9ZsDtez756BtxCoDtty+nbShKeII0oAK5pCYvjcgUXB516jxD6gETuP2C Ae873KDDR4UBr+ygaQlIxwPFz8DDrKPyEJVx0yJm8Dz1BsOh5mBZWSg72bww31CC jrTGP5Mx6p2bHhKbpFivmaA33dBGbG/vA462iGAdSIb5+vhQ== Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by mx0b-003ede02.pphosted.com (PPS) with ESMTPS id 3w715mwmsm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Feb 2024 16:32:10 -0800 (PST) Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-608080f8e2eso11475017b3.0 for ; Fri, 16 Feb 2024 16:32:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=getcruise.com; s=google; t=1708129929; x=1708734729; darn=lists.linux.dev; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=sP//DawenCm9Q9Idqm9VLY53yi34Bi5tG/3ybyVmS0Y=; b=IgeKgMNTtyntzg1hiepGL0N9kS0KfV/o3ofDb1STaG3EYnUdXdlfMwK2ci6UwGSfRD 6WoKSxnKWXy6OWEfR62M1+hGIekrsUZ6//oxOj/MDbPR0b93EkkHXca4dnuFFZ8Rzf7Y V5utn/ywTgZivslZxvtGvXppCcBZhJmHE/UQS4Rlo56h4q3lA7lJQ7JpY7+Cchz2EdZQ FQMqqfDjv3PmOTLOczi0RAhCwLrZNYvI1p7Tkp03k7EjR3NCkY+55ScCT7HAzH4KX8cf j81pUqIDkDjUxAj4X5w3Nq2PBMUtqNu5vHlmZMQ6sctjNTHHs8gjk2YUTIhAIVqrqPjo fsbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708129929; x=1708734729; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sP//DawenCm9Q9Idqm9VLY53yi34Bi5tG/3ybyVmS0Y=; b=k/yz3RqK7pn6+xUVmNgNB/Ss3PP3EZLKM3BEzWAwnKKh4ForRmMT4fAMj4bk62Eh99 gsnbesAULSRbdF1YK2A1hR3z6SGpxuKT/mvLpBPS+Z3ddP6WEZXcFsjc/TWTa+gT02pR S6nlQ87RzNs53zDOsYrqWcOt3lmqkc0ku9344aKwPHBhaDvooSUwcnTDHe6U+JTA8Z4N zFXF44Rju8oa0vvCo55bLPZBAtl6SASXub7mIMDA0IPDKyOUMIopNO1+wgf/VeD3GDxp GpIaJyvaOqun6utvAkrQQJLXH8q3iKw906zrFMCkqL+0BnC/uM+Dbdvxo8kroSvFhKQi EmQQ== X-Gm-Message-State: AOJu0Yz78gtbXc+6sB2ur4yoYPK6JHz+ZmBZsQIDLCDZ1twlq+GEsmQL MvCBNw17H62s6tDLAGbC+27mx17I9b4F17LUN+L7Yxc26i8oDK5zAOuMMHbk+wgx2QDlRcngORf u1VcteaZe2H3tY7rmMIcVPymQEeaBEVXk85L3VxAKsrbA6T6sOaAzNFBBb7AG0DGkIc/9cf6xGB iyV/swOmUg+qP3iaMIfTYr83tsWNbc7zLJPsftkPepme6eKWY= X-Received: by 2002:a25:d80a:0:b0:dca:c369:face with SMTP id p10-20020a25d80a000000b00dcac369facemr6601224ybg.18.1708129929633; Fri, 16 Feb 2024 16:32:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMg2wj1oeDtcdR6uptm8MjJc+/a6hr0GJPkejp8joUet+ZnNYO/dm6gJQGAb+11+08rdKo7w== X-Received: by 2002:a25:d80a:0:b0:dca:c369:face with SMTP id p10-20020a25d80a000000b00dcac369facemr6601211ybg.18.1708129929277; Fri, 16 Feb 2024 16:32:09 -0800 (PST) Received: from localhost.localdomain ([140.177.143.152]) by smtp.gmail.com with ESMTPSA id e3-20020a05620a12c300b0078606e85a8esm400312qkl.107.2024.02.16.16.32.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 16:32:09 -0800 (PST) From: Steve Schrock To: ofono@lists.linux.dev Cc: Steve Schrock Subject: [PATCH 2/2] qmimodem: Fix checkpatch.pl warnings and errors Date: Sat, 17 Feb 2024 00:30:32 +0000 Message-Id: <20240217003032.76366-2-steve.schrock@getcruise.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240217003032.76366-1-steve.schrock@getcruise.com> References: <20240217003032.76366-1-steve.schrock@getcruise.com> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-GUID: 013WRQ5jOJ0hj7isbeX-dwTlrZ0NZVQQ X-Proofpoint-ORIG-GUID: 013WRQ5jOJ0hj7isbeX-dwTlrZ0NZVQQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-16_24,2024-02-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 mlxlogscore=999 malwarescore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402170001 --- drivers/qmimodem/qmi.c | 7 ++++--- drivers/qmimodem/qmi.h | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c index 3c8c00a6..c9c80975 100644 --- a/drivers/qmimodem/qmi.c +++ b/drivers/qmimodem/qmi.c @@ -299,6 +299,7 @@ static void __hexdump(const char dir, const unsigned char *buf, size_t len, if (i % 16 > 0) { size_t j; + for (j = (i % 16); j < 16; j++) { str[(j * 3) + 1] = ' '; str[(j * 3) + 2] = ' '; @@ -720,6 +721,7 @@ static uint16_t __request_submit(struct qmi_device *device, req->tid = hdr->transaction; } else { struct qmi_service_hdr *hdr; + hdr = req->buf + QMI_MUX_HDR_SIZE; hdr->type = 0x00; hdr->transaction = device->next_service_tid++; @@ -1142,9 +1144,8 @@ bool qmi_device_has_service(struct qmi_device *device, uint16_t type) for (i = 0, info = device->version_list; i < device->version_count; i++, info++) { - if (info->type == type) { + if (info->type == type) return true; - } } return false; @@ -2260,7 +2261,7 @@ void qmi_service_unref(struct qmi_service *service) unsigned int hash_id; if (!service) - return; + return; if (__sync_sub_and_fetch(&service->ref_count, 1)) return; diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h index 3fdf960b..21537a76 100644 --- a/drivers/qmimodem/qmi.h +++ b/drivers/qmimodem/qmi.h @@ -62,12 +62,12 @@ enum qmi_device_expected_data_format { }; enum qmi_data_endpoint_type { - QMI_DATA_ENDPOINT_TYPE_UNKNOWN = 0x00, - QMI_DATA_ENDPOINT_TYPE_HSIC = 0x01, - QMI_DATA_ENDPOINT_TYPE_HSUSB = 0x02, - QMI_DATA_ENDPOINT_TYPE_PCIE = 0x03, - QMI_DATA_ENDPOINT_TYPE_EMBEDDED = 0x04, - QMI_DATA_ENDPOINT_TYPE_BAM_DMUX = 0x05, + QMI_DATA_ENDPOINT_TYPE_UNKNOWN = 0x00, + QMI_DATA_ENDPOINT_TYPE_HSIC = 0x01, + QMI_DATA_ENDPOINT_TYPE_HSUSB = 0x02, + QMI_DATA_ENDPOINT_TYPE_PCIE = 0x03, + QMI_DATA_ENDPOINT_TYPE_EMBEDDED = 0x04, + QMI_DATA_ENDPOINT_TYPE_BAM_DMUX = 0x05, }; void qmi_free(void *ptr);