diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 63344cc..cfd839b 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -2383,7 +2383,7 @@ u8 rtw_ap_bmc_frames_hdl(_adapter *padapter) } - printk("check if hiq empty=%d\n", empty); + RTW_INFO("check if hiq empty=%d\n", empty); #endif return H2C_SUCCESS; diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index b330edf..b3ee178 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -542,7 +542,7 @@ static void __nat25_db_print(_adapter *priv) while (db != NULL) { #ifdef CL_IPV6_PASS - panic_printk("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" + panic_RTW_INFO("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" "%02x%02x%02x%02x%02x%02x\n", j, i, @@ -571,7 +571,7 @@ static void __nat25_db_print(_adapter *priv) db->networkAddr[15], db->networkAddr[16]); #else - panic_printk("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + panic_RTW_INFO("NAT25: DB(%d) H(%02d) C(%d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", j, i, atomic_read(&db->use_count), @@ -659,7 +659,7 @@ void nat25_db_expire(_adapter *priv) if (atomic_dec_and_test(&f->use_count)) { #ifdef BR_EXT_DEBUG #ifdef CL_IPV6_PASS - panic_printk("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" + panic_RTW_INFO("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" "%02x%02x%02x%02x%02x%02x\n", i, f->macAddr[0], @@ -687,7 +687,7 @@ void nat25_db_expire(_adapter *priv) f->networkAddr[16]); #else - panic_printk("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", + panic_RTW_INFO("NAT25 Expire H(%02d) M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", i, f->macAddr[0], f->macAddr[1], @@ -819,7 +819,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) RTW_INFO("NAT25: Replace DA with BR's MAC\n"); if ((*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac + 4)) == 0) { void netdev_br_init(struct net_device *netdev); - printk("Re-init netdev_br_init() due to br_mac==0!\n"); + RTW_INFO("Re-init netdev_br_init() due to br_mac==0!\n"); netdev_br_init(priv->pnetdev); } memcpy(skb->data, priv->br_mac, ETH_ALEN); @@ -1389,7 +1389,7 @@ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) { #ifdef BR_EXT_DEBUG if ((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1))) { - panic_printk("NAT25: Input Frame: DA=%02x%02x%02x%02x%02x%02x SA=%02x%02x%02x%02x%02x%02x\n", + panic_RTW_INFO("NAT25: Input Frame: DA=%02x%02x%02x%02x%02x%02x SA=%02x%02x%02x%02x%02x%02x\n", skb->data[0], skb->data[1], skb->data[2], diff --git a/core/rtw_btcoex.c b/core/rtw_btcoex.c index 7f37ff1..82c9966 100644 --- a/core/rtw_btcoex.c +++ b/core/rtw_btcoex.c @@ -1588,8 +1588,8 @@ void rtw_btcoex_dump_tx_msg(u8 *tx_msg, u8 len, u8 *msg_name) u8 i = 0; RTW_INFO("======> Msg name: %s\n", msg_name); for (i = 0; i < len; i++) - printk("%02x ", tx_msg[i]); - printk("\n"); + RTW_INFO("%02x ", tx_msg[i]); + RTW_INFO("\n"); RTW_INFO("Msg name: %s <======\n", msg_name); } diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 054be72..92b2505 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -279,17 +279,17 @@ sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj, bool to_head) #ifdef DBG_CMD_QUEUE if (dump_cmd_id) { - printk("%s===> cmdcode:0x%02x\n", __FUNCTION__, obj->cmdcode); + RTW_INFO("%s===> cmdcode:0x%02x\n", __FUNCTION__, obj->cmdcode); if (obj->cmdcode == GEN_CMD_CODE(_Set_MLME_EVT)) { if (obj->parmbuf) { struct C2HEvent_Header *pc2h_evt_hdr = (struct C2HEvent_Header *)(obj->parmbuf); - printk("pc2h_evt_hdr->ID:0x%02x(%d)\n", pc2h_evt_hdr->ID, pc2h_evt_hdr->ID); + RTW_INFO("pc2h_evt_hdr->ID:0x%02x(%d)\n", pc2h_evt_hdr->ID, pc2h_evt_hdr->ID); } } if (obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) { if (obj->parmbuf) { struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)(obj->parmbuf); - printk("pdrvextra_cmd_parm->ec_id:0x%02x\n", pdrvextra_cmd_parm->ec_id); + RTW_INFO("pdrvextra_cmd_parm->ec_id:0x%02x\n", pdrvextra_cmd_parm->ec_id); } } } @@ -365,7 +365,7 @@ struct cmd_obj *_rtw_dequeue_cmd(_queue *queue) if (obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) { if (obj->parmbuf) { struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)(obj->parmbuf); - printk("pdrvextra_cmd_parm->ec_id:0x%02x\n", pdrvextra_cmd_parm->ec_id); + RTW_INFO("pdrvextra_cmd_parm->ec_id:0x%02x\n", pdrvextra_cmd_parm->ec_id); } } diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 5f07516..5e24787 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -2451,7 +2451,7 @@ ssize_t proc_set_bw_mode(struct file *file, const char __user *buffer, size_t co if (pregpriv && bw_2g <= 4 && bw_5g <= 4) { pregpriv->bw_mode = mode; - printk("bw_mode=0x%x\n", mode); + RTW_INFO("bw_mode=0x%x\n", mode); } } @@ -2494,7 +2494,7 @@ ssize_t proc_set_ampdu_enable(struct file *file, const char __user *buffer, size if (pregpriv && mode < 2) { pregpriv->ampdu_enable = mode; - printk("ampdu_enable=%d\n", mode); + RTW_INFO("ampdu_enable=%d\n", mode); } } @@ -3059,7 +3059,7 @@ ssize_t proc_set_rx_stbc(struct file *file, const char __user *buffer, size_t co if (pregpriv && (mode == 0 || mode == 1 || mode == 2 || mode == 3)) { pregpriv->rx_stbc = mode; - printk("rx_stbc=%d\n", mode); + RTW_INFO("rx_stbc=%d\n", mode); } } diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index cedafc9..cb2e213 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -552,8 +552,8 @@ static inline void dump_buf(u8 *buf, u32 len) RTW_INFO("-----------------Len %d----------------\n", len); for (i = 0; i < len; i++) - printk("%2.2x-", *(buf + i)); - printk("\n"); + RTW_INFO("%2.2x-", *(buf + i)); + RTW_INFO("\n"); } /* @@ -724,8 +724,8 @@ u8 rtw_BT_efuse_map_write(PADAPTER adapter, u16 addr, u16 cnts, u8 *data) { #define RT_ASSERT_RET(expr) \ if (!(expr)) { \ - printk("Assertion failed! %s at ......\n", #expr); \ - printk(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ + RTW_INFO("Assertion failed! %s at ......\n", #expr); \ + RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ return _FAIL; \ } @@ -2024,8 +2024,8 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) { #define RT_ASSERT_RET(expr) \ if (!(expr)) { \ - printk("Assertion failed! %s at ......\n", #expr); \ - printk(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ + RTW_INFO("Assertion failed! %s at ......\n", #expr); \ + RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ return _FAIL; \ } @@ -2168,8 +2168,8 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) { #define RT_ASSERT_RET(expr) \ if (!(expr)) { \ - printk("Assertion failed! %s at ......\n", #expr); \ - printk(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ + RTW_INFO("Assertion failed! %s at ......\n", #expr); \ + RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ return _FAIL; \ } diff --git a/core/rtw_iol.c b/core/rtw_iol.c index 42d0b6b..9e97777 100644 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -237,7 +237,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame) rtw_IOL_append_END_cmd(pxmit_frame); pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen + 32) / 256) + 1) * 256); - /* printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); */ + /* RTW_INFO("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); */ pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen; is_cmd_bndy = _TRUE; } @@ -249,16 +249,16 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter, int buf_len, u8 *pbuf) int i; int j = 1; - printk("###### %s ######\n", __FUNCTION__); + RTW_INFO("###### %s ######\n", __FUNCTION__); for (i = 0; i < buf_len; i++) { - printk("%02x-", *(pbuf + i)); + RTW_INFO("%02x-", *(pbuf + i)); if (j % 32 == 0) - printk("\n"); + RTW_INFO("\n"); j++; } - printk("\n"); - printk("============= ioreg_cmd len = %d ===============\n", buf_len); + RTW_INFO("\n"); + RTW_INFO("============= ioreg_cmd len = %d ===============\n", buf_len); } diff --git a/core/rtw_mem.c b/core/rtw_mem.c index b68a456..0db65ed 100644 --- a/core/rtw_mem.c +++ b/core/rtw_mem.c @@ -12,7 +12,7 @@ struct u8 *rtk_buf_mem[NR_RECVBUFF]; struct u8 *rtw_get_buf_premem(int index) { - printk("%s, rtk_buf_mem index : %d\n", __func__, index); + RTW_INFO("%s, rtk_buf_mem index : %d\n", __func__, index); return rtk_buf_mem[index]; } @@ -40,7 +40,7 @@ struct sk_buff *rtw_alloc_skb_premem(u16 in_size) skb = skb_dequeue(&rtk_skb_mem_q); - printk("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); + RTW_INFO("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); return skb; } @@ -56,7 +56,7 @@ int rtw_free_skb_premem(struct sk_buff *pskb) skb_queue_tail(&rtk_skb_mem_q, pskb); - printk("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); + RTW_INFO("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); return 0; } @@ -69,7 +69,7 @@ static int __init rtw_mem_init(void) SIZE_PTR alignment = 0; struct sk_buff *pskb = NULL; - printk("%s\n", __func__); + RTW_INFO("%s\n", __func__); pr_info("MAX_RTKM_NR_PREALLOC_RECV_SKB: %d\n", MAX_RTKM_NR_PREALLOC_RECV_SKB); pr_info("MAX_RTKM_RECVBUF_SZ: %d\n", MAX_RTKM_RECVBUF_SZ); @@ -89,12 +89,12 @@ static int __init rtw_mem_init(void) skb_queue_tail(&rtk_skb_mem_q, pskb); } else - printk("%s, alloc skb memory fail!\n", __func__); + RTW_INFO("%s, alloc skb memory fail!\n", __func__); pskb = NULL; } - printk("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); + RTW_INFO("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); return 0; @@ -103,11 +103,11 @@ static int __init rtw_mem_init(void) static void __exit rtw_mem_exit(void) { if (skb_queue_len(&rtk_skb_mem_q)) - printk("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); + RTW_INFO("%s, rtk_skb_mem_q len : %d\n", __func__, skb_queue_len(&rtk_skb_mem_q)); skb_queue_purge(&rtk_skb_mem_q); - printk("%s\n", __func__); + RTW_INFO("%s\n", __func__); } module_init(rtw_mem_init); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index c91cb1d..f50e88d 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -3706,10 +3706,10 @@ sint rtw_restruct_sec_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len) /* debug for CONFIG_IEEE80211W { int jj; - printk("supplicant_ie_length=%d &&&&&&&&&&&&&&&&&&&\n", psecuritypriv->supplicant_ie[1]+2); + RTW_INFO("supplicant_ie_length=%d &&&&&&&&&&&&&&&&&&&\n", psecuritypriv->supplicant_ie[1]+2); for(jj=0; jj < psecuritypriv->supplicant_ie[1]+2; jj++) - printk(" %02x ", psecuritypriv->supplicant_ie[jj]); - printk("\n"); + RTW_INFO(" %02x ", psecuritypriv->supplicant_ie[jj]); + RTW_INFO("\n"); }*/ ielength += psecuritypriv->supplicant_ie[1] + 2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 602e92d..32928f9 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -1630,7 +1630,7 @@ _continue: if ((target_ie && (target_ielen == 4)) && (_TRUE == _rtw_memcmp((void *)target_ie, "Ozmo", 4))) { /* psta->flag_atmel_rc = 1; */ unsigned char *sa_addr = get_sa(pframe); - printk("%s: Find Ozmo RC -- %02x:%02x:%02x:%02x:%02x:%02x \n\n", + RTW_INFO("%s: Find Ozmo RC -- %02x:%02x:%02x:%02x:%02x:%02x \n\n", __func__, *sa_addr, *(sa_addr + 1), *(sa_addr + 2), *(sa_addr + 3), *(sa_addr + 4), *(sa_addr + 5)); _rtw_memcpy(pstapriv->atmel_rc_pattern, get_sa(pframe), ETH_ALEN); } @@ -7072,10 +7072,10 @@ unsigned int OnAction_sa_query(_adapter *padapter, union recv_frame *precv_frame } if (0) { int pp; - printk("pattrib->pktlen = %d =>", pattrib->pkt_len); + RTW_INFO("pattrib->pktlen = %d =>", pattrib->pkt_len); for (pp = 0; pp < pattrib->pkt_len; pp++) - printk(" %02x ", pframe[pp]); - printk("\n"); + RTW_INFO(" %02x ", pframe[pp]); + RTW_INFO("\n"); } return _SUCCESS; diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 32bd0f1..16c1389 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -2701,11 +2701,11 @@ u8 rtw_mpRateParseFunc(PADAPTER pAdapter, u8 *targetStr) } } - printk("%s ,please input a Data RATE String as:", __func__); + RTW_INFO("%s ,please input a Data RATE String as:", __func__); for (i = 0; i <= 83; i++) { - printk("%s ", rateindex_Array[i]); + RTW_INFO("%s ", rateindex_Array[i]); if (i % 10 == 0) - printk("\n"); + RTW_INFO("\n"); } return _FAIL; } diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index e58b592..932a5b3 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -85,7 +85,7 @@ void _ips_enter(_adapter *padapter) if (rf_off == pwrpriv->change_rfpwrstate) { pwrpriv->bpower_saving = _TRUE; - RTW_PRINT("nolinked power save enter\n"); + RTW_INFO("nolinked power save enter\n"); if (pwrpriv->ips_mode == IPS_LEVEL_2) pwrpriv->bkeepfwalive = _TRUE; @@ -125,7 +125,7 @@ int _ips_leave(_adapter *padapter) result = rtw_ips_pwr_up(padapter); if (result == _SUCCESS) pwrpriv->rf_pwrstate = rf_on; - RTW_PRINT("nolinked power save leave\n"); + RTW_INFO("nolinked power save leave\n"); RTW_INFO("==> ips_leave.....LED(0x%08x)...\n", rtw_read32(padapter, 0x4c)); pwrpriv->bips_processing = _FALSE; @@ -2092,13 +2092,13 @@ void rtw_free_pwrctrl_priv(PADAPTER adapter) #ifdef CONFIG_WOWLAN #ifdef CONFIG_PNO_SUPPORT if (pwrctrlpriv->pnlo_info != NULL) - printk("****** pnlo_info memory leak********\n"); + RTW_INFO("****** pnlo_info memory leak********\n"); if (pwrctrlpriv->pscan_info != NULL) - printk("****** pscan_info memory leak********\n"); + RTW_INFO("****** pscan_info memory leak********\n"); if (pwrctrlpriv->pno_ssid_list != NULL) - printk("****** pno_ssid_list memory leak********\n"); + RTW_INFO("****** pno_ssid_list memory leak********\n"); #endif #ifdef CONFIG_WOW_PATTERN_HW_CAM _rtw_mutex_free(&pwrctrlpriv->wowlan_pattern_cam_mutex); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index bd7a05d..c8265bf 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -2024,10 +2024,10 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram /* dump the packet content before decrypt */ { int pp; - printk("pattrib->pktlen = %d =>", pattrib->pkt_len); + RTW_INFO("pattrib->pktlen = %d =>", pattrib->pkt_len); for (pp = 0; pp < pattrib->pkt_len; pp++) - printk(" %02x ", ptr[pp]); - printk("\n"); + RTW_INFO(" %02x ", ptr[pp]); + RTW_INFO("\n"); } #endif @@ -2043,10 +2043,10 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram /* print packet content after decryption */ { int pp; - printk("after decryption pattrib->pktlen = %d @@=>", pattrib->pkt_len); + RTW_INFO("after decryption pattrib->pktlen = %d @@=>", pattrib->pkt_len); for (pp = 0; pp < pattrib->pkt_len; pp++) - printk(" %02x ", ptr[pp]); - printk("\n"); + RTW_INFO(" %02x ", ptr[pp]); + RTW_INFO("\n"); } #endif if (!precv_frame) { diff --git a/core/rtw_security.c b/core/rtw_security.c index df88f53..f165d54 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -2005,23 +2005,23 @@ u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe) #if 0 /* add for CONFIG_IEEE80211W, debug */ if (0) - printk("@@@@@@@@@@@@@@@@@@ length=%d, prxattrib->hdrlen=%d, prxattrib->pkt_len=%d\n" + RTW_INFO("@@@@@@@@@@@@@@@@@@ length=%d, prxattrib->hdrlen=%d, prxattrib->pkt_len=%d\n" , length, prxattrib->hdrlen, prxattrib->pkt_len); if (0) { int no; /* test print PSK */ - printk("PSK key below:\n"); + RTW_INFO("PSK key below:\n"); for (no = 0; no < 16; no++) - printk(" %02x ", prwskey[no]); - printk("\n"); + RTW_INFO(" %02x ", prwskey[no]); + RTW_INFO("\n"); } if (0) { int no; /* test print PSK */ - printk("frame:\n"); + RTW_INFO("frame:\n"); for (no = 0; no < prxattrib->pkt_len; no++) - printk(" %02x ", pframe[no]); - printk("\n"); + RTW_INFO(" %02x ", pframe[no]); + RTW_INFO("\n"); } #endif @@ -2103,7 +2103,7 @@ u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe) int pp; RTW_INFO("pkt: "); for (pp = 0; pp < pattrib->pkt_len; pp++) - printk(" %02x ", pframe[pp]); + RTW_INFO(" %02x ", pframe[pp]); RTW_INFO("\n"); /* BIP AAD + management frame body + MME(MIC is zero) */ RTW_INFO("AAD+PKT: "); diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index fb5589e..2d791d9 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -2685,10 +2685,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /* dump total packet include MME with zero MIC */ { int i; - printk("Total packet: "); + RTW_INFO("Total packet: "); for (i = 0; i < BIP_AAD_SIZE + frame_body_len; i++) - printk(" %02x ", BIP_AAD[i]); - printk("\n"); + RTW_INFO(" %02x ", BIP_AAD[i]); + RTW_INFO("\n"); } #endif /* calculate mic */ @@ -2700,10 +2700,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /* dump calculated mic result */ { int i; - printk("Calculated mic result: "); + RTW_INFO("Calculated mic result: "); for (i = 0; i < 16; i++) - printk(" %02x ", mic[i]); - printk("\n"); + RTW_INFO(" %02x ", mic[i]); + RTW_INFO("\n"); } #endif /* copy right BIP mic value, total is 128bits, we use the 0~63 bits */ @@ -2711,10 +2711,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /*/dump all packet after mic ok { int pp; - printk("pattrib->pktlen = %d\n", pattrib->pktlen); + RTW_INFO("pattrib->pktlen = %d\n", pattrib->pktlen); for(pp=0;pp< pattrib->pktlen; pp++) - printk(" %02x ", mem_start[pp]); - printk("\n"); + RTW_INFO(" %02x ", mem_start[pp]); + RTW_INFO("\n"); }*/ } else { /* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ @@ -2748,10 +2748,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /* before encrypt dump the management packet content */ /*{ int i; - printk("Management pkt: "); + RTW_INFO("Management pkt: "); for(i=0; ipktlen; i++) - printk(" %02x ", pframe[i]); - printk("=======\n"); + RTW_INFO(" %02x ", pframe[i]); + RTW_INFO("=======\n"); }*/ if (pattrib->encrypt > 0) _rtw_memcpy(pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey, 16); @@ -2793,10 +2793,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /* dump management packet include AES IV header */ { int i; - printk("Management pkt + IV: "); + RTW_INFO("Management pkt + IV: "); /* for(i=0; ipktlen; i++) */ - printk("@@@@@@@@@@@@@\n"); + RTW_INFO("@@@@@@@@@@@@@\n"); } #endif @@ -2815,10 +2815,10 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame /* dump management packet include AES header */ { int i; - printk("prepare to enc Management pkt + IV: "); + RTW_INFO("prepare to enc Management pkt + IV: "); for (i = 0; i < pattrib->pktlen; i++) - printk(" %02x ", mem_start[i]); - printk("@@@@@@@@@@@@@\n"); + RTW_INFO(" %02x ", mem_start[i]); + RTW_INFO("@@@@@@@@@@@@@\n"); } #endif /* software encrypt */ diff --git a/hal/hal_com.c b/hal/hal_com.c index e8d529d..e64cc63 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -1138,8 +1138,8 @@ void rtw_hal_dump_macaddr(void *sel, _adapter *adapter) iface = dvobj->padapters[i]; if (iface) { rtw_hal_get_macaddr_port(iface, mac_addr); - RTW_PRINT_SEL(sel, ADPT_FMT"- hw port(%d) mac_addr ="MAC_FMT"\n", - ADPT_ARG(iface), iface->hw_port, MAC_ARG(mac_addr)); + RTW_INFO(ADPT_FMT"- hw port(%d) mac_addr ="MAC_FMT"\n", + ADPT_ARG(iface), iface->hw_port, MAC_ARG(mac_addr)); } } #endif diff --git a/hal/rtl8188e/rtl8188e_hal_init.c b/hal/rtl8188e/rtl8188e_hal_init.c index e2e22b2..4abdc41 100644 --- a/hal/rtl8188e/rtl8188e_hal_init.c +++ b/hal/rtl8188e/rtl8188e_hal_init.c @@ -39,7 +39,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable) rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 | SW_OFFLOAD_EN); if (padapter->bFWReady == _FALSE) { - printk("bFWReady == _FALSE call reset 8051...\n"); + RTW_INFO("bFWReady == _FALSE call reset 8051...\n"); _8051Reset88E(padapter); } @@ -78,8 +78,6 @@ static s32 iol_execute(PADAPTER padapter, u8 control) if (reg_0x88 & control << 4) status = _FAIL; t2 = rtw_get_current_time(); - /* printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0)); */ - /* RTW_INFO("%s in %u ms, reg_0x88:0x%02x\n", __FUNCTION__, passing_time, reg_0x88); */ return status; } @@ -136,7 +134,6 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8 *pbuf) rtemp8 = *(phymap + eFuse_Addr); if (rtemp8 != 0xFF) { efuse_utilized++; - /* printk("efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8); */ eFuse_Addr++; } else { RTW_INFO("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, rtemp8); @@ -422,7 +419,6 @@ static s32 iol_read_efuse( s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) { s32 result = _SUCCESS; - printk("==> %s\n", __FUNCTION__); if (rtw_IOL_applied(padapter)) { iol_mode_enable(padapter, 1); @@ -458,7 +454,6 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, int ret = _FAIL; u32 t1, t2; - /* printk("===> %s ,bndy_cnt = %d\n",__FUNCTION__,bndy_cnt); */ if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS) goto exit; #ifdef CONFIG_USB_HCI @@ -482,14 +477,12 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, for (i = 0; i < bndy_cnt; i++) { u8 page_no = 0; page_no = i * 2 ; - /* printk(" i = %d, page_no = %d\n",i,page_no); */ ret = iol_ioconfig(adapter, page_no); if (ret != _SUCCESS) break; } iol_mode_enable(adapter, 0); t2 = rtw_get_current_time(); - /* printk("==> %s : %5u\n",__FUNCTION__,rtw_get_time_interval_ms(t1,t2)); */ exit: /* restore BCN_HEAD */ rtw_write8(adapter, REG_TDECTRL + 1, 0); @@ -503,25 +496,21 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len) u16 data_cnts = (data_len / 8) + 1; u8 *pbuf = rtw_zvmalloc(data_len + 10); - printk("###### %s ######\n", __FUNCTION__); + RTW_INFO("###### %s ######\n", __FUNCTION__); rtw_write8(Adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); if (pbuf) { for (addr = 0; addr < data_cnts; addr++) { - /* printk("==> addr:0x%02x\n",addr); */ rtw_write32(Adapter, 0x140, addr); rtw_usleep_os(2); loop = 0; do { rstatus = (reg_140 = rtw_read32(Adapter, REG_PKTBUF_DBG_CTRL) & BIT24); - /* printk("rstatus = %02x, reg_140:0x%08x\n",rstatus,reg_140); */ if (rstatus) { fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_L); - /* printk("fifo_data_144:0x%08x\n",fifo_data); */ _rtw_memcpy(pbuf + (addr * 8), &fifo_data , 4); fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_H); - /* printk("fifo_data_148:0x%08x\n",fifo_data); */ _rtw_memcpy(pbuf + (addr * 8 + 4), &fifo_data, 4); } @@ -532,7 +521,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len) rtw_vmfree(pbuf, data_len + 10); } - printk("###### %s ######\n", __FUNCTION__); + RTW_INFO("###### %s ######\n", __FUNCTION__); } #endif /* defined(CONFIG_IOL) */ diff --git a/os_dep/linux/custom_gpio_linux.c b/os_dep/linux/custom_gpio_linux.c index 4f10bbe..c7d09b7 100644 --- a/os_dep/linux/custom_gpio_linux.c +++ b/os_dep/linux/custom_gpio_linux.c @@ -317,7 +317,7 @@ int register_net_gpio_init(void) { rtl_net = dev_get_by_name(&init_net, "wlan0"); if (!rtl_net) { - RTW_PRINT("rtl_net init fail!\n"); + RTW_INFO("rtl_net init fail!\n"); return -1; } return rtw_register_gpio_interrupt(rtl_net, 7, gpio_int); @@ -326,7 +326,7 @@ int unregister_net_gpio_init(void) { rtl_net = dev_get_by_name(&init_net, "wlan0"); if (!rtl_net) { - RTW_PRINT("rtl_net init fail!\n"); + RTW_INFO("rtl_net init fail!\n"); return -1; } return rtw_disable_gpio_interrupt(rtl_net, 7); diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 54bc21d..7a54ef8 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -658,7 +658,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter) } if (!rtw_cfg80211_check_bss(padapter)) - RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); + RTW_INFO(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); } /* notify cfg80211 that device joined an IBSS */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) @@ -733,7 +733,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) check_bss: if (!rtw_cfg80211_check_bss(padapter)) - RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); + RTW_INFO(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); if (rtw_to_roam(padapter) > 0) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) @@ -1968,7 +1968,7 @@ u32 rtw_cfg80211_wait_scan_req_empty(_adapter *adapter, u32 timeout_ms) pass_ms = rtw_get_passing_time_ms(start); if (empty == _FALSE && pass_ms > timeout_ms) - RTW_PRINT(FUNC_ADPT_FMT" pass_ms:%u, timeout\n" + RTW_INFO(FUNC_ADPT_FMT" pass_ms:%u, timeout\n" , FUNC_ADPT_ARG(adapter), pass_ms); return pass_ms; @@ -5056,7 +5056,7 @@ static s32 cfg80211_rtw_update_ft_ies(struct wiphy *wiphy, } if ((rtw_to_roam(padapter) > 0) && rtw_chk_ft_status(padapter, RTW_FT_AUTHENTICATED_STA)) { - RTW_PRINT("auth success, start reassoc\n"); + RTW_INFO("auth success, start reassoc\n"); _enter_critical_bh(&pmlmepriv->lock, &irqL); rtw_set_ft_status(padapter, RTW_FT_ASSOCIATING_STA); _exit_critical_bh(&pmlmepriv->lock, &irqL); diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index ba3463d..79fe27b 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -240,7 +240,7 @@ void rtw_indicate_wx_assoc_event(_adapter *padapter) else _rtw_memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN); - RTW_PRINT("assoc success\n"); + RTW_INFO("assoc success\n"); #ifndef CONFIG_IOCTL_CFG80211 wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL); #endif @@ -256,7 +256,7 @@ void rtw_indicate_wx_disassoc_event(_adapter *padapter) _rtw_memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); #ifndef CONFIG_IOCTL_CFG80211 - RTW_PRINT("indicate disassoc\n"); + RTW_INFO("indicate disassoc\n"); wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL); #endif } @@ -8699,7 +8699,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, /* mutex_lock(&ioctl_mutex); */ _rtw_wowlan_ctrl_exit_free: RTW_INFO("-rtw_wowlan_ctrl( subcode = %d)\n", poidparam.subcode); - RTW_PRINT("%s in %d ms\n", __func__, + RTW_INFO("%s in %d ms\n", __func__, rtw_get_passing_time_ms(start_time)); _rtw_wowlan_ctrl_exit: return ret; @@ -8828,7 +8828,7 @@ static int rtw_ap_wowlan_ctrl(struct net_device *dev, /* mutex_lock(&ioctl_mutex); */ _rtw_ap_wowlan_ctrl_exit_free: RTW_INFO("-rtw_ap_wowlan_ctrl( subcode = %d)\n", poidparam.subcode); - RTW_PRINT("%s in %d ms\n", __func__, + RTW_INFO("%s in %d ms\n", __func__, rtw_get_passing_time_ms(start_time)); _rtw_ap_wowlan_ctrl_exit: return ret; diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index edd3646..58f3067 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1191,7 +1191,7 @@ int rtw_ndev_init(struct net_device *dev) { _adapter *adapter = rtw_netdev_priv(dev); - RTW_PRINT(FUNC_ADPT_FMT" if%d mac_addr="MAC_FMT"\n" + RTW_INFO(FUNC_ADPT_FMT" if%d mac_addr="MAC_FMT"\n" , FUNC_ADPT_ARG(adapter), (adapter->iface_id + 1), MAC_ARG(dev->dev_addr)); strncpy(adapter->old_ifname, dev->name, IFNAMSIZ); adapter->old_ifname[IFNAMSIZ - 1] = '\0'; @@ -1204,7 +1204,7 @@ void rtw_ndev_uninit(struct net_device *dev) { _adapter *adapter = rtw_netdev_priv(dev); - RTW_PRINT(FUNC_ADPT_FMT" if%d\n" + RTW_INFO(FUNC_ADPT_FMT" if%d\n" , FUNC_ADPT_ARG(adapter), (adapter->iface_id + 1)); rtw_adapter_proc_deinit(dev); } @@ -3533,10 +3533,10 @@ void rtw_dev_unload(_adapter *padapter) /* check the status of IPS */ if (rtw_hal_check_ips_status(padapter) == _TRUE || pwrctl->rf_pwrstate == rf_off) { /* check HW status and SW state */ - RTW_PRINT("%s: driver in IPS-FWLPS\n", __func__); + RTW_INFO("%s: driver in IPS-FWLPS\n", __func__); pdbgpriv->dbg_dev_unload_inIPS_cnt++; } else - RTW_PRINT("%s: driver not in IPS\n", __func__); + RTW_INFO("%s: driver not in IPS\n", __func__); if (!rtw_is_surprise_removed(padapter)) { #ifdef CONFIG_BT_COEXIST @@ -3545,7 +3545,7 @@ void rtw_dev_unload(_adapter *padapter) #ifdef CONFIG_WOWLAN if (pwrctl->bSupportRemoteWakeup == _TRUE && pwrctl->wowlan_mode == _TRUE) - RTW_PRINT("%s bSupportRemoteWakeup==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); + RTW_INFO("%s bSupportRemoteWakeup==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); else #endif { @@ -3614,13 +3614,13 @@ int rtw_suspend_free_assoc_resource(_adapter *padapter) rtw_free_network_queue(padapter, _TRUE); if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { - RTW_PRINT("%s: fw_under_survey\n", __func__); + RTW_INFO("%s: fw_under_survey\n", __func__); rtw_indicate_scan_done(padapter, 1); clr_fwstate(pmlmepriv, _FW_UNDER_SURVEY); } if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { - RTW_PRINT("%s: fw_under_linking\n", __FUNCTION__); + RTW_INFO("%s: fw_under_linking\n", __FUNCTION__); rtw_indicate_disconnect(padapter, 0, _FALSE); } @@ -3714,10 +3714,10 @@ int rtw_suspend_wow(_adapter *padapter) } } - RTW_PRINT("%s: wowmode suspending\n", __func__); + RTW_INFO("%s: wowmode suspending\n", __func__); if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) { - RTW_PRINT("%s: fw_under_survey\n", __func__); + RTW_INFO("%s: fw_under_survey\n", __func__); rtw_indicate_scan_done(padapter, 1); clr_fwstate(pmlmepriv, _FW_UNDER_SURVEY); } @@ -3745,7 +3745,7 @@ int rtw_suspend_wow(_adapter *padapter) #endif if (pwrpriv->wowlan_pno_enable) { - RTW_PRINT("%s: pno: %d\n", __func__, + RTW_INFO("%s: pno: %d\n", __func__, pwrpriv->wowlan_pno_enable); #ifdef CONFIG_FWLPS_IN_IPS rtw_set_fw_in_ips_mode(padapter, _TRUE); @@ -3757,7 +3757,7 @@ int rtw_suspend_wow(_adapter *padapter) #endif /* #ifdef CONFIG_LPS */ } else - RTW_PRINT("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); + RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); RTW_INFO("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); return ret; } @@ -3823,7 +3823,7 @@ int rtw_suspend_ap_wow(_adapter *padapter) poidparam.subcode = WOWLAN_AP_ENABLE; rtw_hal_set_hwreg(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam); - RTW_PRINT("%s: wowmode suspending\n", __func__); + RTW_INFO("%s: wowmode suspending\n", __func__); #if 1 if (rtw_mi_check_status(padapter, MI_LINKED)) { ch = rtw_mi_get_union_chan(padapter); @@ -3886,7 +3886,7 @@ int rtw_suspend_normal(_adapter *padapter) if ((rtw_hal_check_ips_status(padapter) == _TRUE) || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) - RTW_PRINT("%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __FUNCTION__); + RTW_INFO("%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __FUNCTION__); #ifdef CONFIG_CONCURRENT_MODE @@ -3917,7 +3917,7 @@ int rtw_suspend_common(_adapter *padapter) int ret = 0; u32 start_time = rtw_get_current_time(); - RTW_PRINT(" suspend start\n"); + RTW_INFO(" suspend start\n"); RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); pdbgpriv->dbg_suspend_cnt++; @@ -3980,7 +3980,7 @@ int rtw_suspend_common(_adapter *padapter) } - RTW_PRINT("rtw suspend success in %d ms\n", + RTW_INFO("rtw suspend success in %d ms\n", rtw_get_passing_time_ms(start_time)); exit: @@ -4080,7 +4080,7 @@ int rtw_resume_process_wow(_adapter *padapter) rtw_netif_wake_queue(pnetdev); } else - RTW_PRINT("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); + RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); if (padapter->pid[1] != 0) { RTW_INFO("pid[1]:%d\n", padapter->pid[1]); @@ -4137,7 +4137,7 @@ int rtw_resume_process_wow(_adapter *padapter) rtw_set_pwr_state_check_timer(pwrpriv); #endif } else - RTW_PRINT("do not reset timer\n"); + RTW_INFO("do not reset timer\n"); pwrpriv->wowlan_mode = _FALSE; @@ -4385,7 +4385,7 @@ int rtw_resume_common(_adapter *padapter) if (pwrpriv->bInSuspend == _FALSE) return 0; - RTW_PRINT("resume start\n"); + RTW_INFO("resume start\n"); RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); if (rtw_mi_check_status(padapter, WIFI_AP_STATE) == _FALSE) { @@ -4410,7 +4410,7 @@ int rtw_resume_common(_adapter *padapter) pwrpriv->wowlan_in_resume = _FALSE; #endif } - RTW_PRINT("%s:%d in %d ms\n", __FUNCTION__ , ret, + RTW_INFO("%s:%d in %d ms\n", __FUNCTION__ , ret, rtw_get_passing_time_ms(start_time)); diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c index d4eb96f..8f425af 100644 --- a/os_dep/linux/recv_linux.c +++ b/os_dep/linux/recv_linux.c @@ -756,7 +756,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) if (pattrib->eth_type == 0x888e) - RTW_PRINT("recv eapol packet\n"); + RTW_INFO("recv eapol packet\n"); #ifdef CONFIG_AUTO_AP_MODE #if 1 /* for testing */ diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c index b8497d9..f4e7651 100644 --- a/os_dep/linux/rtw_cfgvendor.c +++ b/os_dep/linux/rtw_cfgvendor.c @@ -1118,7 +1118,7 @@ static int wl_cfgvendor_priv_string_handler(struct wiphy *wiphy, int err = 0; u8 resp[1] = {'\0'}; - RTW_PRINT(FUNC_NDEV_FMT" %s\n", FUNC_NDEV_ARG(wdev_to_ndev(wdev)), (char *)data); + RTW_INFO(FUNC_NDEV_FMT" %s\n", FUNC_NDEV_ARG(wdev_to_ndev(wdev)), (char *)data); err = rtw_cfgvendor_send_cmd_reply(wiphy, wdev_to_ndev(wdev), resp, 1); if (unlikely(err)) RTW_ERR(FUNC_NDEV_FMT"Vendor Command reply failed ret:%d\n" diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c index 6052c2f..c28d630 100644 --- a/os_dep/linux/rtw_proc.c +++ b/os_dep/linux/rtw_proc.c @@ -300,13 +300,13 @@ static void *proc_start_seq_file_test(struct seq_file *m, loff_t *pos) struct net_device *dev = m->private; _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); - RTW_PRINT(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); + RTW_INFO(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); if (*pos >= RTW_SEQ_FILE_TEST_SHOW_LIMIT) { - RTW_PRINT(FUNC_ADPT_FMT" pos:%llu, out of range return\n", FUNC_ADPT_ARG(adapter), *pos); + RTW_INFO(FUNC_ADPT_FMT" pos:%llu, out of range return\n", FUNC_ADPT_ARG(adapter), *pos); return NULL; } - RTW_PRINT(FUNC_ADPT_FMT" return pos:%lld\n", FUNC_ADPT_ARG(adapter), *pos); + RTW_INFO(FUNC_ADPT_FMT" return pos:%lld\n", FUNC_ADPT_ARG(adapter), *pos); return pos; } void proc_stop_seq_file_test(struct seq_file *m, void *v) @@ -314,7 +314,7 @@ void proc_stop_seq_file_test(struct seq_file *m, void *v) struct net_device *dev = m->private; _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); - RTW_PRINT(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); + RTW_INFO(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); } void *proc_next_seq_file_test(struct seq_file *m, void *v, loff_t *pos) @@ -324,11 +324,11 @@ void *proc_next_seq_file_test(struct seq_file *m, void *v, loff_t *pos) (*pos)++; if (*pos >= RTW_SEQ_FILE_TEST_SHOW_LIMIT) { - RTW_PRINT(FUNC_ADPT_FMT" pos:%lld, out of range return\n", FUNC_ADPT_ARG(adapter), *pos); + RTW_INFO(FUNC_ADPT_FMT" pos:%lld, out of range return\n", FUNC_ADPT_ARG(adapter), *pos); return NULL; } - RTW_PRINT(FUNC_ADPT_FMT" return pos:%lld\n", FUNC_ADPT_ARG(adapter), *pos); + RTW_INFO(FUNC_ADPT_FMT" return pos:%lld\n", FUNC_ADPT_ARG(adapter), *pos); return pos; } @@ -338,7 +338,7 @@ static int proc_get_seq_file_test(struct seq_file *m, void *v) _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); u32 pos = *((loff_t *)(v)); - RTW_PRINT(FUNC_ADPT_FMT" pos:%d\n", FUNC_ADPT_ARG(adapter), pos); + RTW_INFO(FUNC_ADPT_FMT" pos:%d\n", FUNC_ADPT_ARG(adapter), pos); RTW_PRINT_SEL(m, FUNC_ADPT_FMT" pos:%d\n", FUNC_ADPT_ARG(adapter), pos); return 0; } diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c index e09673d..3ac40b1 100644 --- a/os_dep/linux/usb_intf.c +++ b/os_dep/linux/usb_intf.c @@ -69,7 +69,7 @@ static void rtw_dev_shutdown(struct device *dev) struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(adapter); #ifdef CONFIG_WOWLAN if (pwrctl->wowlan_mode == _TRUE) - RTW_PRINT("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); + RTW_INFO("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); else #endif { @@ -1520,10 +1520,10 @@ static int __init rtw_drv_entry(void) { int ret = 0; - RTW_PRINT("module init start\n"); + RTW_INFO("module init start\n"); dump_drv_version(RTW_DBGDUMP); #ifdef BTCOEXVERSION - RTW_PRINT(DRV_NAME" BT-Coex version = %s\n", BTCOEXVERSION); + RTW_INFO(DRV_NAME" BT-Coex version = %s\n", BTCOEXVERSION); #endif /* BTCOEXVERSION */ ret = platform_wifi_power_on(); @@ -1552,13 +1552,13 @@ static int __init rtw_drv_entry(void) } exit: - RTW_PRINT("module init ret=%d\n", ret); + RTW_INFO("module init ret=%d\n", ret); return ret; } static void __exit rtw_drv_halt(void) { - RTW_PRINT("module exit start\n"); + RTW_INFO("module exit start\n"); usb_drv.drv_registered = _FALSE; @@ -1570,7 +1570,7 @@ static void __exit rtw_drv_halt(void) rtw_drv_proc_deinit(); rtw_ndev_notifier_unregister(); - RTW_PRINT("module exit success\n"); + RTW_INFO("module exit success\n"); rtw_mstat_dump(RTW_DBGDUMP); }