mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2025-12-10 00:04:17 +00:00
Remove duplicate names for rtw_read[n] and rtw_write[n]
rtw_read[n]() is redefined as _rtw_read[n]() and PlatformEFIORead[n]Byte Same for rtw_write[n]() furntions Link: https://lore.kernel.org/r/9880c86c2aad7d95a714d8b03b28b83634f98c1e.1621361919.git-series.hello@bryanbrattlof.com Link: https://lore.kernel.org/r/11458342572f21d9df58b3969ad1f16fdff157f4.1621361919.git-series.hello@bryanbrattlof.com Link: https://lore.kernel.org/r/15956707341f76de683245c392063b8121a805ea.1621361919.git-series.hello@bryanbrattlof.com Link: https://lore.kernel.org/r/35ffc9cd5af7009b317361033a6ca5263307d61a.1621361919.git-series.hello@bryanbrattlof.com Link: https://lore.kernel.org/r/7d53fb295f67f01c72640045afb88150391bce35.1621361919.git-series.hello@bryanbrattlof.com Link: https://lore.kernel.org/r/43917aee34e85139e613578cf6f14938211c8835.1621361919.git-series.hello@bryanbrattlof.com Port of 51d4aa6d6bf35d85d318831df60a34bad27cdb9e 8ff74e4307b42302c89023faf8fd37dbde4c4666 16b1b3c8221a40bf899dfeebdb3d5245ecb65515 7f06caf9a40bb3c08fe86c8355ace25b7ce69ba9 1c42d72e4747fb546eba53821ae56ecf827202a7 4d6bfc6f62705ec5baee9c572d4ca03bc9e36c00
This commit is contained in:
@@ -60,7 +60,7 @@ jackson@realtek.com.tw
|
||||
#endif
|
||||
|
||||
|
||||
u8 _rtw_read8(_adapter *adapter, u32 addr)
|
||||
u8 rtw_read8(_adapter *adapter, u32 addr)
|
||||
{
|
||||
u8 r_val;
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
@@ -73,7 +73,7 @@ u8 _rtw_read8(_adapter *adapter, u32 addr)
|
||||
return r_val;
|
||||
}
|
||||
|
||||
u16 _rtw_read16(_adapter *adapter, u32 addr)
|
||||
u16 rtw_read16(_adapter *adapter, u32 addr)
|
||||
{
|
||||
u16 r_val;
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
@@ -86,7 +86,7 @@ u16 _rtw_read16(_adapter *adapter, u32 addr)
|
||||
return rtw_le16_to_cpu(r_val);
|
||||
}
|
||||
|
||||
u32 _rtw_read32(_adapter *adapter, u32 addr)
|
||||
u32 rtw_read32(_adapter *adapter, u32 addr)
|
||||
{
|
||||
u32 r_val;
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
@@ -100,7 +100,7 @@ u32 _rtw_read32(_adapter *adapter, u32 addr)
|
||||
|
||||
}
|
||||
|
||||
int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
|
||||
int rtw_write8(_adapter *adapter, u32 addr, u8 val)
|
||||
{
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
struct io_priv *pio_priv = &adapter->iopriv;
|
||||
@@ -113,7 +113,7 @@ int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
|
||||
|
||||
return RTW_STATUS_CODE(ret);
|
||||
}
|
||||
int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
|
||||
int rtw_write16(_adapter *adapter, u32 addr, u16 val)
|
||||
{
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
struct io_priv *pio_priv = &adapter->iopriv;
|
||||
@@ -127,7 +127,7 @@ int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
|
||||
|
||||
return RTW_STATUS_CODE(ret);
|
||||
}
|
||||
int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
|
||||
int rtw_write32(_adapter *adapter, u32 addr, u32 val)
|
||||
{
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
struct io_priv *pio_priv = &adapter->iopriv;
|
||||
@@ -142,7 +142,7 @@ int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
|
||||
return RTW_STATUS_CODE(ret);
|
||||
}
|
||||
|
||||
int _rtw_writeN(_adapter *adapter, u32 addr , u32 length , u8 *pdata)
|
||||
int rtw_writeN(_adapter *adapter, u32 addr , u32 length , u8 *pdata)
|
||||
{
|
||||
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
|
||||
struct io_priv *pio_priv = &adapter->iopriv;
|
||||
@@ -717,90 +717,6 @@ bool match_rf_write_sniff_ranges(_adapter *adapter, u8 path, u32 addr, u32 mask)
|
||||
return _FALSE;
|
||||
}
|
||||
|
||||
u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line)
|
||||
{
|
||||
u8 val = _rtw_read8(adapter, addr);
|
||||
const struct rtw_io_sniff_ent *ent = match_read_sniff(adapter, addr, 1, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line)
|
||||
{
|
||||
u16 val = _rtw_read16(adapter, addr);
|
||||
const struct rtw_io_sniff_ent *ent = match_read_sniff(adapter, addr, 2, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line)
|
||||
{
|
||||
u32 val = _rtw_read32(adapter, addr);
|
||||
const struct rtw_io_sniff_ent *ent = match_read_sniff(adapter, addr, 4, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
|
||||
{
|
||||
const struct rtw_io_sniff_ent *ent = match_write_sniff(adapter, addr, 1, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x) %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return _rtw_write8(adapter, addr, val);
|
||||
}
|
||||
int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
|
||||
{
|
||||
const struct rtw_io_sniff_ent *ent = match_write_sniff(adapter, addr, 2, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x) %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return _rtw_write16(adapter, addr, val);
|
||||
}
|
||||
int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
|
||||
{
|
||||
const struct rtw_io_sniff_ent *ent = match_write_sniff(adapter, addr, 4, val);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x) %s\n"
|
||||
, caller, line, addr, val, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return _rtw_write32(adapter, addr, val);
|
||||
}
|
||||
int dbg_rtw_writeN(_adapter *adapter, u32 addr , u32 length , u8 *data, const char *caller, const int line)
|
||||
{
|
||||
const struct rtw_io_sniff_ent *ent = match_write_sniff(adapter, addr, length, 0);
|
||||
|
||||
if (ent) {
|
||||
RTW_INFO("DBG_IO %s:%d rtw_writeN(0x%04x, %u) %s\n"
|
||||
, caller, line, addr, length, rtw_io_sniff_ent_get_tag(ent));
|
||||
}
|
||||
|
||||
return _rtw_writeN(adapter, addr, length, data);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
u8 dbg_rtw_sd_f0_read8(_adapter *adapter, u32 addr, const char *caller, const int line)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user