rtl8723ds: Remove PLATFORM_LINUX symbol - it is the only one supported

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2017-10-16 23:17:59 -05:00
parent 58d8344823
commit 3c1cb50012
43 changed files with 104 additions and 647 deletions

View File

@@ -26,14 +26,10 @@
#define RT_TAG '1178'
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
atomic_t _malloc_cnt = ATOMIC_INIT(0);
atomic_t _malloc_size = ATOMIC_INIT(0);
#endif
#endif /* DBG_MEMORY_LEAK */
#if defined(PLATFORM_LINUX)
/*
* Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE
* @return: one of RTW_STATUS_CODE
@@ -50,12 +46,6 @@ inline int RTW_STATUS_CODE(int error_code)
return _FAIL;
}
}
#else
inline int RTW_STATUS_CODE(int error_code)
{
return error_code;
}
#endif
u32 rtw_atoi(u8 *s)
{
@@ -81,17 +71,13 @@ u32 rtw_atoi(u8 *s)
inline u8 *_rtw_vmalloc(u32 sz)
{
u8 *pbuf;
#ifdef PLATFORM_LINUX
pbuf = vmalloc(sz);
#endif
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
if (pbuf != NULL) {
atomic_inc(&_malloc_cnt);
atomic_add(sz, &_malloc_size);
}
#endif
#endif /* DBG_MEMORY_LEAK */
return pbuf;
@@ -100,24 +86,18 @@ inline u8 *_rtw_vmalloc(u32 sz)
inline u8 *_rtw_zvmalloc(u32 sz)
{
u8 *pbuf;
#ifdef PLATFORM_LINUX
pbuf = _rtw_vmalloc(sz);
if (pbuf != NULL)
memset(pbuf, 0, sz);
#endif
return pbuf;
}
inline void _rtw_vmfree(u8 *pbuf, u32 sz)
{
#ifdef PLATFORM_LINUX
vfree(pbuf);
#endif
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
atomic_dec(&_malloc_cnt);
atomic_sub(sz, &_malloc_size);
#endif
#endif /* DBG_MEMORY_LEAK */
}
@@ -126,7 +106,6 @@ u8 *_rtw_malloc(u32 sz)
u8 *pbuf = NULL;
#ifdef PLATFORM_LINUX
#ifdef RTK_DMP_PLATFORM
if (sz > 0x4000)
pbuf = (u8 *)dvr_malloc(sz);
@@ -134,14 +113,11 @@ u8 *_rtw_malloc(u32 sz)
#endif
pbuf = kmalloc(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
if (pbuf != NULL) {
atomic_inc(&_malloc_cnt);
atomic_add(sz, &_malloc_size);
}
#endif
#endif /* DBG_MEMORY_LEAK */
return pbuf;
@@ -154,10 +130,7 @@ u8 *_rtw_zmalloc(u32 sz)
u8 *pbuf = _rtw_malloc(sz);
if (pbuf != NULL) {
#ifdef PLATFORM_LINUX
memset(pbuf, 0, sz);
#endif
}
return pbuf;
@@ -166,7 +139,6 @@ u8 *_rtw_zmalloc(u32 sz)
void _rtw_mfree(u8 *pbuf, u32 sz)
{
#ifdef PLATFORM_LINUX
#ifdef RTK_DMP_PLATFORM
if (sz > 0x4000)
dvr_free(pbuf);
@@ -174,21 +146,16 @@ void _rtw_mfree(u8 *pbuf, u32 sz)
#endif
kfree(pbuf);
#endif
#ifdef DBG_MEMORY_LEAK
#ifdef PLATFORM_LINUX
atomic_dec(&_malloc_cnt);
atomic_sub(sz, &_malloc_size);
#endif
#endif /* DBG_MEMORY_LEAK */
}
inline struct sk_buff *_rtw_skb_alloc(u32 sz)
{
#ifdef PLATFORM_LINUX
return __dev_alloc_skb(sz, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */
}
inline void _rtw_skb_free(struct sk_buff *skb)
@@ -198,57 +165,39 @@ inline void _rtw_skb_free(struct sk_buff *skb)
inline struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb)
{
#ifdef PLATFORM_LINUX
return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */
}
inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
{
#ifdef PLATFORM_LINUX
return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif /* PLATFORM_LINUX */
}
inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
return pskb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#else
return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
#endif
#endif /* PLATFORM_LINUX */
}
inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)
{
#if defined(PLATFORM_LINUX)
skb->dev = ndev;
return netif_rx(skb);
#endif
}
#ifdef CONFIG_RTW_NAPI
inline int _rtw_netif_receive_skb(_nic_hdl ndev, struct sk_buff *skb)
{
#if defined(PLATFORM_LINUX)
skb->dev = ndev;
return netif_receive_skb(skb);
#else
rtw_warn_on(1);
return -1;
#endif
}
#ifdef CONFIG_RTW_GRO
inline gro_result_t _rtw_napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
{
#if defined(PLATFORM_LINUX)
return napi_gro_receive(napi, skb);
#else
rtw_warn_on(1);
return -1;
#endif
}
#endif /* CONFIG_RTW_GRO */
#endif /* CONFIG_RTW_NAPI */
@@ -264,23 +213,19 @@ void _rtw_skb_queue_purge(struct sk_buff_head *list)
#ifdef CONFIG_USB_HCI
inline void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
return usb_alloc_coherent(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma);
#else
return usb_buffer_alloc(dev, size, (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL), dma);
#endif
#endif /* PLATFORM_LINUX */
inline void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
usb_free_coherent(dev, size, addr, dma);
#else
usb_buffer_free(dev, size, addr, dma);
#endif
#endif /* PLATFORM_LINUX */
}
#endif /* CONFIG_USB_HCI */
@@ -760,54 +705,33 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size)
void _rtw_memcpy(void *dst, const void *src, u32 sz)
{
#if defined(PLATFORM_LINUX)
memcpy(dst, src, sz);
#endif
}
inline void _rtw_memmove(void *dst, const void *src, u32 sz)
{
#if defined(PLATFORM_LINUX)
memmove(dst, src, sz);
#else
#warning "no implementation\n"
#endif
}
int _rtw_memcmp(const void *dst, const void *src, u32 sz)
{
#if defined(PLATFORM_LINUX)
/* under Linux/GNU/GLibc, the return value of memcmp for two same mem. chunk is 0 */
if (!(memcmp(dst, src, sz)))
return _TRUE;
else
return _FALSE;
#endif
}
void _rtw_memset(void *pbuf, int c, u32 sz)
{
#if defined(PLATFORM_LINUX)
memset(pbuf, c, sz);
#endif
}
void _rtw_init_listhead(_list *list)
{
#ifdef PLATFORM_LINUX
INIT_LIST_HEAD(list);
#endif
}
/*
@@ -817,42 +741,27 @@ Otherwise, there will be racing condition.
*/
u32 rtw_is_list_empty(_list *phead)
{
#ifdef PLATFORM_LINUX
if (list_empty(phead))
return _TRUE;
else
return _FALSE;
#endif
}
void rtw_list_insert_head(_list *plist, _list *phead)
{
#ifdef PLATFORM_LINUX
list_add(plist, phead);
#endif
}
void rtw_list_insert_tail(_list *plist, _list *phead)
{
#ifdef PLATFORM_LINUX
list_add_tail(plist, phead);
#endif
}
void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc)
{
_adapter *adapter = (_adapter *)padapter;
#ifdef PLATFORM_LINUX
_init_timer(ptimer, adapter->pnetdev, pfunc, adapter);
#endif
}
/*
@@ -864,12 +773,7 @@ Caller must check if the list is empty before calling rtw_list_delete
void _rtw_init_sema(_sema *sema, int init_val)
{
#ifdef PLATFORM_LINUX
sema_init(sema, init_val);
#endif
}
void _rtw_free_sema(_sema *sema)
@@ -878,62 +782,39 @@ void _rtw_free_sema(_sema *sema)
void _rtw_up_sema(_sema *sema)
{
#ifdef PLATFORM_LINUX
up(sema);
#endif
}
u32 _rtw_down_sema(_sema *sema)
{
#ifdef PLATFORM_LINUX
if (down_interruptible(sema))
return _FAIL;
else
return _SUCCESS;
#endif
}
void _rtw_mutex_init(_mutex *pmutex)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37))
mutex_init(pmutex);
#else
init_MUTEX(pmutex);
#endif
#endif
}
void _rtw_mutex_free(_mutex *pmutex);
void _rtw_mutex_free(_mutex *pmutex)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37))
mutex_destroy(pmutex);
#endif
#endif
}
void _rtw_spinlock_init(_lock *plock)
{
#ifdef PLATFORM_LINUX
spin_lock_init(plock);
#endif
}
void _rtw_spinlock_free(_lock *plock)
@@ -942,42 +823,22 @@ void _rtw_spinlock_free(_lock *plock)
void _rtw_spinlock(_lock *plock)
{
#ifdef PLATFORM_LINUX
spin_lock(plock);
#endif
}
void _rtw_spinunlock(_lock *plock)
{
#ifdef PLATFORM_LINUX
spin_unlock(plock);
#endif
}
void _rtw_spinlock_ex(_lock *plock)
{
#ifdef PLATFORM_LINUX
spin_lock(plock);
#endif
}
void _rtw_spinunlock_ex(_lock *plock)
{
#ifdef PLATFORM_LINUX
spin_unlock(plock);
#endif
}
void _rtw_init_queue(_queue *pqueue)
@@ -1008,46 +869,32 @@ u32 rtw_end_of_queue_search(_list *head, _list *plist)
u32 rtw_get_current_time(void)
{
#ifdef PLATFORM_LINUX
return jiffies;
#endif
}
inline u32 rtw_systime_to_ms(u32 systime)
{
#ifdef PLATFORM_LINUX
return systime * 1000 / HZ;
#endif
}
inline u32 rtw_ms_to_systime(u32 ms)
{
#ifdef PLATFORM_LINUX
return ms * HZ / 1000;
#endif
}
/* the input parameter start use the same unit as returned by rtw_get_current_time */
inline s32 rtw_get_passing_time_ms(u32 start)
{
#ifdef PLATFORM_LINUX
return rtw_systime_to_ms(jiffies - start);
#endif
}
inline s32 rtw_get_time_interval_ms(u32 start, u32 end)
{
#ifdef PLATFORM_LINUX
return rtw_systime_to_ms(end - start);
#endif
}
void rtw_sleep_schedulable(int ms)
{
#ifdef PLATFORM_LINUX
u32 delta;
delta = (ms * HZ) / 1000; /* (ms) */
@@ -1058,15 +905,11 @@ void rtw_sleep_schedulable(int ms)
if (schedule_timeout(delta) != 0)
return ;
return;
#endif
}
void rtw_msleep_os(int ms)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
if (ms < 20) {
unsigned long us = ms * 1000UL;
@@ -1074,13 +917,10 @@ void rtw_msleep_os(int ms)
} else
#endif
msleep((unsigned int)ms);
#endif
}
void rtw_usleep_os(int us)
{
#ifdef PLATFORM_LINUX
/* msleep((unsigned int)us); */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
usleep_range(us, us + 1);
@@ -1090,70 +930,35 @@ void rtw_usleep_os(int us)
else
msleep((us / 1000) + 1);
#endif
#endif
}
#ifdef DBG_DELAY_OS
void _rtw_mdelay_os(int ms, const char *func, const int line)
{
RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms);
#if defined(PLATFORM_LINUX)
mdelay((unsigned long)ms);
#endif
}
void _rtw_udelay_os(int us, const char *func, const int line)
{
#if 0
if (us > 1000) {
RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
rtw_usleep_os(us);
return;
}
#endif
RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
#if defined(PLATFORM_LINUX)
udelay((unsigned long)us);
#endif
}
#else
void rtw_mdelay_os(int ms)
{
#ifdef PLATFORM_LINUX
mdelay((unsigned long)ms);
#endif
}
void rtw_udelay_os(int us)
{
#ifdef PLATFORM_LINUX
udelay((unsigned long)us);
#endif
}
#endif
void rtw_yield_os(void)
{
#ifdef PLATFORM_LINUX
yield();
#endif
}
#define RTW_SUSPEND_LOCK_NAME "rtw_wifi"
@@ -1332,75 +1137,54 @@ inline void rtw_lock_resume_scan_timeout(u32 timeout_ms)
inline void ATOMIC_SET(ATOMIC_T *v, int i)
{
#ifdef PLATFORM_LINUX
atomic_set(v, i);
#endif
}
inline int ATOMIC_READ(ATOMIC_T *v)
{
#ifdef PLATFORM_LINUX
return atomic_read(v);
#endif
}
inline void ATOMIC_ADD(ATOMIC_T *v, int i)
{
#ifdef PLATFORM_LINUX
atomic_add(i, v);
#endif
}
inline void ATOMIC_SUB(ATOMIC_T *v, int i)
{
#ifdef PLATFORM_LINUX
atomic_sub(i, v);
#endif
}
inline void ATOMIC_INC(ATOMIC_T *v)
{
#ifdef PLATFORM_LINUX
atomic_inc(v);
#endif
}
inline void ATOMIC_DEC(ATOMIC_T *v)
{
#ifdef PLATFORM_LINUX
atomic_dec(v);
#endif
}
inline int ATOMIC_ADD_RETURN(ATOMIC_T *v, int i)
{
#ifdef PLATFORM_LINUX
return atomic_add_return(i, v);
#endif
}
inline int ATOMIC_SUB_RETURN(ATOMIC_T *v, int i)
{
#ifdef PLATFORM_LINUX
return atomic_sub_return(i, v);
#endif
}
inline int ATOMIC_INC_RETURN(ATOMIC_T *v)
{
#ifdef PLATFORM_LINUX
return atomic_inc_return(v);
#endif
}
inline int ATOMIC_DEC_RETURN(ATOMIC_T *v)
{
#ifdef PLATFORM_LINUX
return atomic_dec_return(v);
#endif
}
#ifdef PLATFORM_LINUX
/*
* Open a file with the specific @param path, @param flag, @param mode
* @param fpp the pointer of struct file pointer to get struct file pointer while file opening is success
@@ -1592,7 +1376,6 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
}
return ret;
}
#endif /* PLATFORM_LINUX */
/*
* Test if the specifi @param path is a file and readable
@@ -1601,15 +1384,10 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
*/
int rtw_is_file_readable(const char *path)
{
#ifdef PLATFORM_LINUX
if (isFileReadable(path, NULL) == 0)
return _TRUE;
else
return _FALSE;
#else
/* Todo... */
return _FALSE;
#endif
}
/*
@@ -1620,15 +1398,10 @@ int rtw_is_file_readable(const char *path)
*/
int rtw_is_file_readable_with_size(const char *path, u32 *sz)
{
#ifdef PLATFORM_LINUX
if (isFileReadable(path, sz) == 0)
return _TRUE;
else
return _FALSE;
#else
/* Todo... */
return _FALSE;
#endif
}
/*
@@ -1640,13 +1413,8 @@ int rtw_is_file_readable_with_size(const char *path, u32 *sz)
*/
int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz)
{
#ifdef PLATFORM_LINUX
int ret = retriveFromFile(path, buf, sz);
return ret >= 0 ? ret : 0;
#else
/* Todo... */
return 0;
#endif
}
/*
@@ -1658,16 +1426,10 @@ int rtw_retrieve_from_file(const char *path, u8 *buf, u32 sz)
*/
int rtw_store_to_file(const char *path, u8 *buf, u32 sz)
{
#ifdef PLATFORM_LINUX
int ret = storeToFile(path, buf, sz);
return ret >= 0 ? ret : 0;
#else
/* Todo... */
return 0;
#endif
}
#ifdef PLATFORM_LINUX
struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_priv)
{
struct net_device *pnetdev;
@@ -1796,7 +1558,6 @@ error:
return -1;
}
#endif
#ifdef CONFIG_PLATFORM_SPRD
#ifdef do_div
@@ -1807,22 +1568,17 @@ error:
u64 rtw_modular64(u64 x, u64 y)
{
#ifdef PLATFORM_LINUX
return do_div(x, y);
#endif
}
u64 rtw_division64(u64 x, u64 y)
{
#ifdef PLATFORM_LINUX
do_div(x, y);
return x;
#endif
}
inline u32 rtw_random32(void)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
return prandom_u32();
#elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
@@ -1832,7 +1588,6 @@ inline u32 rtw_random32(void)
#else
return random32();
#endif
#endif
}
void rtw_buf_free(u8 **buf, u32 *buf_len)