From cab4e4ec56884f65e0c279c1b5ceaf70dbe79be0 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Mon, 6 Jun 2022 05:15:15 +0200 Subject: [PATCH] Remove more Windows code --- include/osdep_intf.h | 21 ------------------- include/osdep_service.h | 8 ------- include/rtw_mp.h | 46 +---------------------------------------- include/rtw_xmit.h | 24 +-------------------- 4 files changed, 2 insertions(+), 97 deletions(-) diff --git a/include/osdep_intf.h b/include/osdep_intf.h index 7be0880..cd6ba2e 100644 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -57,29 +57,8 @@ struct intf_priv { #endif #endif -#ifdef PLATFORM_OS_XP -#ifdef CONFIG_SDIO_HCI - /* below is for io_rwmem... */ - PMDL pmdl; - PSDBUS_REQUEST_PACKET sdrp; - PSDBUS_REQUEST_PACKET recv_sdrp; - PSDBUS_REQUEST_PACKET xmit_sdrp; - - PIRP piorw_irp; - -#endif -#ifdef CONFIG_USB_HCI - PURB piorw_urb; - PIRP piorw_irp; - u8 io_irp_cnt; - u8 bio_irp_pending; - _sema io_retevt; -#endif -#endif - }; - #ifdef CONFIG_R871X_TEST int rtw_start_pseudo_adhoc(_adapter *padapter); int rtw_stop_pseudo_adhoc(_adapter *padapter); diff --git a/include/osdep_service.h b/include/osdep_service.h index 5d2fb52..f7b4de3 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -58,14 +58,6 @@ #include #endif -#ifdef PLATFORM_OS_XP - #include -#endif - -#ifdef PLATFORM_OS_CE - #include -#endif - /* #include */ #ifndef BIT diff --git a/include/rtw_mp.h b/include/rtw_mp.h index 6dbdd87..ef16eaa 100644 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -39,14 +39,10 @@ struct mp_xmit_frame { u8 *mem_addr; u32 sz[8]; -#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) +#if defined(PLATFORM_LINUX) PURB pxmit_urb[8]; #endif -#ifdef PLATFORM_OS_XP - PIRP pxmit_irp[8]; -#endif - u8 bpending[8]; sint ac_tag[8]; sint last[8]; @@ -66,21 +62,6 @@ struct mp_wiparam { typedef void(*wi_act_func)(void *padapter); -#ifdef PLATFORM_WINDOWS -struct mp_wi_cntx { - u8 bmpdrv_unload; - - /* Work Item */ - NDIS_WORK_ITEM mp_wi; - NDIS_EVENT mp_wi_evt; - _lock mp_wi_lock; - u8 bmp_wi_progress; - wi_act_func curractfunc; - /* Variable needed in each implementation of CurrActFunc. */ - struct mp_wiparam param; -}; -#endif - struct mp_tx { u8 stop; u32 count, sended; @@ -383,31 +364,6 @@ struct mp_priv { struct wlan_network mp_network; NDIS_802_11_MAC_ADDRESS network_macaddr; -#ifdef PLATFORM_WINDOWS - u32 rx_testcnt; - u32 rx_testcnt1; - u32 rx_testcnt2; - u32 tx_testcnt; - u32 tx_testcnt1; - - struct mp_wi_cntx wi_cntx; - - u8 h2c_result; - u8 h2c_seqnum; - u16 h2c_cmdcode; - u8 h2c_resp_parambuf[512]; - _lock h2c_lock; - _lock wkitm_lock; - u32 h2c_cmdcnt; - NDIS_EVENT h2c_cmd_evt; - NDIS_EVENT c2h_set; - NDIS_EVENT h2c_clr; - NDIS_EVENT cpwm_int; - - NDIS_EVENT scsir_full_evt; - NDIS_EVENT scsiw_empty_evt; -#endif - u8 *pallocated_mp_xmitframe_buf; u8 *pmp_xmtframe_buf; _queue free_mp_xmitqueue; diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index c1cd928..660a29a 100644 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -594,19 +594,10 @@ struct xmit_buf { u8 bulkout_id; /* for halmac */ #endif /* RTW_HALMAC */ -#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) +#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) PURB pxmit_urb[8]; dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ #endif - -#ifdef PLATFORM_OS_XP - PIRP pxmit_irp[8]; -#endif - -#ifdef PLATFORM_OS_CE - USB_TRANSFER usb_transfer_write_port; -#endif - u8 bpending[8]; sint last[8]; @@ -621,11 +612,6 @@ struct xmit_buf { u32 ff_hwaddr; u8 pg_num; u8 agg_num; -#ifdef PLATFORM_OS_XP - PMDL pxmitbuf_mdl; - PIRP pxmitbuf_irp; - PSDBUS_REQUEST_PACKET pxmitbuf_sdrp; -#endif #endif #ifdef CONFIG_PCI_HCI @@ -639,10 +625,8 @@ struct xmit_buf { #if defined(DBG_XMIT_BUF) || defined(DBG_XMIT_BUF_EXT) u8 no; #endif - }; - struct xmit_frame { _list list; @@ -691,7 +675,6 @@ struct sta_xmit_priv { sint option; sint apsd_setting; /* When bit mask is on, the associated edca queue supports APSD. */ - /* struct tx_servq blk_q[MAX_NUMBLKS]; */ struct tx_servq be_q; /* priority == 0,3 */ struct tx_servq bk_q; /* priority == 1,2 */ @@ -706,7 +689,6 @@ struct sta_xmit_priv { /* u64 sta_tx_pkts; */ /* uint sta_tx_fail; */ - }; @@ -792,10 +774,6 @@ struct xmit_priv { _sema tx_retevt;/* all tx return event; */ u8 txirp_cnt; -#ifdef PLATFORM_OS_CE - USB_TRANSFER usb_transfer_write_port; - /* USB_TRANSFER usb_transfer_write_mem; */ -#endif #ifdef PLATFORM_LINUX struct tasklet_struct xmit_tasklet; #endif