From 22746824c57add16c927af2061162700858cf62d Mon Sep 17 00:00:00 2001 From: AmadeusGhost <2789289348@qq.com> Date: Sat, 3 Dec 2022 23:40:12 +0800 Subject: [PATCH] mtwifi: formatted version output Signed-off-by: AmadeusGhost --- .../src/mt7603_wifi/common/rtmp_init.c | 2 +- .../mt7603e/src/mt7603_wifi/mcu/andes_mt.c | 12 +++--- .../mt7612e/src/mt76x2/common/rtmp_init.c | 2 +- .../drivers/mt7612e/src/mt76x2/mcu/mcu_and.c | 38 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/common/rtmp_init.c b/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/common/rtmp_init.c index a0d9eb2ad..3a9411a86 100644 --- a/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/common/rtmp_init.c +++ b/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/common/rtmp_init.c @@ -114,7 +114,7 @@ NDIS_STATUS RTMPAllocAdapterBlock(VOID *handle, VOID **ppAdapter) pAd->OS_Cookie = handle; ((POS_COOKIE)(handle))->pAd_va = (UINT32)pAd; } - DBGPRINT(RT_DEBUG_OFF, ("\n\n=== pAd = %p, size = %d ===\n\n", pAd, sizeof(RTMP_ADAPTER))); + DBGPRINT(RT_DEBUG_OFF, ("\n=== pAd = %p, size = %d ===\n", pAd, sizeof(RTMP_ADAPTER))); if (RtmpOsStatsAlloc(&pAd->stats, &pAd->iw_stats) == FALSE) { diff --git a/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/mcu/andes_mt.c b/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/mcu/andes_mt.c index cd3b3c371..376f49aa4 100644 --- a/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/mcu/andes_mt.c +++ b/package/lean/mt/drivers/mt7603e/src/mt7603_wifi/mcu/andes_mt.c @@ -2253,15 +2253,15 @@ static NDIS_STATUS AndesMTLoadFwMethod1(RTMP_ADAPTER *ad) Ctl->Stage = FW_DOWNLOAD; - DBGPRINT(RT_DEBUG_OFF, ("FW Version:")); + printk(KERN_CONT "FW Version:"); for (loop = 0; loop < 10; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%c", *(cap->FWImageName + cap->fw_len - 29 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%c", *(cap->FWImageName + cap->fw_len - 29 + loop)); + printk(KERN_CONT "\n"); - DBGPRINT(RT_DEBUG_OFF, ("FW Build Date:")); + printk(KERN_CONT "FW Build Date:"); for (loop = 0; loop < 15; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%c", *(cap->FWImageName + cap->fw_len - 19 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%c", *(cap->FWImageName + cap->fw_len - 19 + loop)); + printk(KERN_CONT "\n"); dl_len = (*(cap->FWImageName + cap->fw_len - 1) << 24) | (*(cap->FWImageName + cap->fw_len - 2) << 16) | diff --git a/package/lean/mt/drivers/mt7612e/src/mt76x2/common/rtmp_init.c b/package/lean/mt/drivers/mt7612e/src/mt76x2/common/rtmp_init.c index ca2d3f965..8ac539d71 100644 --- a/package/lean/mt/drivers/mt7612e/src/mt76x2/common/rtmp_init.c +++ b/package/lean/mt/drivers/mt7612e/src/mt76x2/common/rtmp_init.c @@ -124,7 +124,7 @@ NDIS_STATUS RTMPAllocAdapterBlock(VOID *handle, VOID **ppAdapter) #endif /* WORKQUEUE_BH */ } pAd->BeaconBuf = pBeaconBuf; - DBGPRINT(RT_DEBUG_OFF, ("\n\n=== pAd = %p, size = %d ===\n\n", pAd, sizeof(RTMP_ADAPTER))); + DBGPRINT(RT_DEBUG_OFF, ("\n=== pAd = %p, size = %d ===\n", pAd, sizeof(RTMP_ADAPTER))); if (RtmpOsStatsAlloc(&pAd->iw_stats) == FALSE) { diff --git a/package/lean/mt/drivers/mt7612e/src/mt76x2/mcu/mcu_and.c b/package/lean/mt/drivers/mt7612e/src/mt76x2/mcu/mcu_and.c index 79adb54ed..daa70a59a 100644 --- a/package/lean/mt/drivers/mt7612e/src/mt76x2/mcu/mcu_and.c +++ b/package/lean/mt/drivers/mt7612e/src/mt76x2/mcu/mcu_and.c @@ -100,10 +100,10 @@ loadfw_protect: #ifdef DBG /* get rom patch information */ - DBGPRINT(RT_DEBUG_OFF, ("build time = ")); + printk(KERN_CONT "build time = "); for (loop = 0; loop < 16; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%c", *(cap->rom_patch + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%c", *(cap->rom_patch + loop)); + printk(KERN_CONT "\n"); #endif if (IS_MT76x2(ad)) { @@ -121,22 +121,22 @@ loadfw_protect: } #ifdef DBG - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "\n"); - DBGPRINT(RT_DEBUG_OFF, ("platform = ")); + printk(KERN_CONT "platform = "); for (loop = 0; loop < 4; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%c", *(cap->rom_patch + 16 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%c", *(cap->rom_patch + 16 + loop)); + printk(KERN_CONT "\n"); - DBGPRINT(RT_DEBUG_OFF, ("hw/sw version = ")); + printk(KERN_CONT "hw/sw version = "); for (loop = 0; loop < 4; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%x", *(cap->rom_patch + 20 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%x", *(cap->rom_patch + 20 + loop)); + printk(KERN_CONT "\n"); - DBGPRINT(RT_DEBUG_OFF, ("patch version = ")); + printk(KERN_CONT "patch version = "); for (loop = 0; loop < 4; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%x", *(cap->rom_patch + 24 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%x", *(cap->rom_patch + 24 + loop)); + printk(KERN_CONT "\n"); #endif RTMP_IO_WRITE32(ad, PCIE_REMAP_BASE4, cap->rom_patch_offset - 10000); @@ -239,10 +239,10 @@ int andes_pci_erasefw(RTMP_ADAPTER *ad) (fw_ver & 0x0f00) >> 8, fw_ver & 0x00ff)); DBGPRINT(RT_DEBUG_TRACE, ("Build:%x\n", build_ver)); - DBGPRINT(RT_DEBUG_TRACE, ("Build Time:")); + printk(KERN_CONT "Build Time:"); for (loop = 0; loop < 16; loop++) - DBGPRINT(RT_DEBUG_TRACE, ("%c", *(cap->FWImageName + 16 + loop))); - DBGPRINT(RT_DEBUG_TRACE, ("\n")); + printk(KERN_CONT "%c", *(cap->FWImageName + 16 + loop)); + printk(KERN_CONT "\n"); DBGPRINT(RT_DEBUG_TRACE, ("ILM Length = %d(bytes)\n", ilm_len)); DBGPRINT(RT_DEBUG_TRACE, ("DLM Length = %d(bytes)\n", dlm_len)); @@ -386,10 +386,10 @@ loadfw_protect: (fw_ver & 0x0f00) >> 8, fw_ver & 0x00ff)); DBGPRINT(RT_DEBUG_OFF, ("Build:%x\n", build_ver)); - DBGPRINT(RT_DEBUG_OFF, ("Build Time:")); + printk(KERN_CONT "Build Time:"); for (loop = 0; loop < 16; loop++) - DBGPRINT(RT_DEBUG_OFF, ("%c", *(cap->FWImageName + 16 + loop))); - DBGPRINT(RT_DEBUG_OFF, ("\n")); + printk(KERN_CONT "%c", *(cap->FWImageName + 16 + loop)); + printk(KERN_CONT "\n"); #endif if (IS_MT76x2(ad)) {