From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (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 2836C41A559; Thu, 16 Jul 2026 11:24:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784201048; cv=none; b=TSXOs958d2jJAWOxri0oc8w5FwvDxooJggeE8wr9rFPsm25slVlhZkYW/3rMCb4iUIddwhYiSSPhlSauEmVf7DhFhtqcVFtKamQCZYCknwGihcHZCkmmw6l51Z11372A0MJ3hFbbcuSvfqASdWap9s04G1M8XkB8n/sqx6K8VC4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784201048; c=relaxed/simple; bh=CXZw16nF47ro55YLlnkq0+5AXwVPQ0Sbw2nBULUs5fw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u/FHBeZM6D2ngzhnrrie+4CuhBFDDVDO0G9JTzT8AQTss5svqmT7RePluKq4KV0Kumc958/dPAmbK2OVFLbFPhnML8cR/+MTxCvbN2+4Ffq9DMZbwoeBZ2uLpnn7fIEzDXuPJ576L0nLXu4ReKWIqsvdABmoOl+HczbUnT6uWKg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=Tdl1XMwW; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Tdl1XMwW" X-UUID: d6151910810811f1b1788b6acf885367-20260716 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=nO4iw7FfBkyOHJAjjnbya3620DOrnkSFerGvpQtGq4I=; b=Tdl1XMwW22SMSnrFMxoNWKzQPPpepiqgxA3+boKYQZlByVolEtseeBZ/0dqq18b8IEba0ie75zL8gk1M8THDSRJ5mMisupI0GqEYoCtYnjTeFo7Rk2ebNpj+k1xbT8/Cnq9a/BO7X05FZuSzgUdqmU2r0TclgCRn40Muq1JVRGk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.18,REQID:684130f0-d3d4-488a-b8e4-7f72e0944fb9,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:8a735a6,CLOUDID:325f563f-46cf-453a-bd84-ad9fc7cb0e8c,B ulkID:nil,BulkQuantity:0,SF:81|82|102|836|865|888|898,TC:-5,Content:0|15|5 0|99|200|213,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,COL: 0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: d6151910810811f1b1788b6acf885367-20260716 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1675314842; Thu, 16 Jul 2026 19:23:57 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.29; Thu, 16 Jul 2026 19:23:56 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.2562.29 via Frontend Transport; Thu, 16 Jul 2026 19:23:56 +0800 From: Chris Lu To: Marcel Holtmann , Johan Hedberg , Luiz Von Dentz CC: Sean Wang , Will Lee , SS Wu , Steve Lee , Paul Menzel , linux-bluetooth , linux-kernel , linux-mediatek , Chris Lu Subject: [PATCH v13 6/7] Bluetooth: btmtk: Replace magic numbers with WMT packet flag enum Date: Thu, 16 Jul 2026 19:23:51 +0800 Message-ID: <20260716112353.2192865-7-chris.lu@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260716112353.2192865-1-chris.lu@mediatek.com> References: <20260716112353.2192865-1-chris.lu@mediatek.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Add BTMTK_WMT_PKT_* enum to represent WMT download packet sequence flags, improving code readability. Replace magic numbers (1, 2, 3) in btmtk_setup_firmware_79xx() and btmtk_setup_firmware() with descriptive enum values: - BTMTK_WMT_PKT_START (1): First packet of a sequence - BTMTK_WMT_PKT_CONTINUE (2): Continuation packet - BTMTK_WMT_PKT_END (3): Final packet of a sequence Signed-off-by: Chris Lu Reviewed-by: Paul Menzel Assisted-by: Claude:Sonnet-4.5 --- drivers/bluetooth/btmtk.c | 12 ++++++------ drivers/bluetooth/btmtk.h | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c index 595e346accc3..75519765bb49 100644 --- a/drivers/bluetooth/btmtk.c +++ b/drivers/bluetooth/btmtk.c @@ -271,12 +271,12 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname, while (dl_size > 0) { dlen = min_t(int, 250, dl_size); if (first_block == 1) { - flag = 1; + flag = BTMTK_WMT_PKT_START; first_block = 0; } else if (dl_size - dlen <= 0) { - flag = 3; + flag = BTMTK_WMT_PKT_END; } else { - flag = 2; + flag = BTMTK_WMT_PKT_CONTINUE; } wmt_params.flag = flag; @@ -355,7 +355,7 @@ int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname, fw_size -= 30; fw_ptr += 30; - flag = 1; + flag = BTMTK_WMT_PKT_START; wmt_params.op = BTMTK_WMT_PATCH_DWNLD; wmt_params.status = NULL; @@ -365,9 +365,9 @@ int btmtk_setup_firmware(struct hci_dev *hdev, const char *fwname, /* Tell device the position in sequence */ if (fw_size - dlen <= 0) - flag = 3; + flag = BTMTK_WMT_PKT_END; else if (fw_size < fw->size - 30) - flag = 2; + flag = BTMTK_WMT_PKT_CONTINUE; wmt_params.flag = flag; wmt_params.dlen = dlen; diff --git a/drivers/bluetooth/btmtk.h b/drivers/bluetooth/btmtk.h index c83c24897c95..51c18dde0a80 100644 --- a/drivers/bluetooth/btmtk.h +++ b/drivers/bluetooth/btmtk.h @@ -66,6 +66,12 @@ enum { BTMTK_WMT_ON_PROGRESS, }; +enum { + BTMTK_WMT_PKT_START = 1, + BTMTK_WMT_PKT_CONTINUE = 2, + BTMTK_WMT_PKT_END = 3, +}; + struct btmtk_wmt_hdr { u8 dir; u8 op; -- 2.45.2