* CSR_RESULT_FAILURE an SDIO error occurred
* ---------------------------------------------------------------------------
*/
-static CsrResult retrying_read8(card_t *card, CsrInt16 funcnum, CsrUint32 addr, u8 *pdata)
+static CsrResult retrying_read8(card_t *card, s16 funcnum, u32 addr, u8 *pdata)
{
CsrSdioFunction *sdio = card->sdio_if;
CsrResult r = CSR_RESULT_SUCCESS;
- CsrInt16 retries;
+ s16 retries;
CsrResult csrResult = CSR_RESULT_SUCCESS;
retries = 0;
} /* retrying_read8() */
-static CsrResult retrying_write8(card_t *card, CsrInt16 funcnum, CsrUint32 addr, u8 data)
+static CsrResult retrying_write8(card_t *card, s16 funcnum, u32 addr, u8 data)
{
CsrSdioFunction *sdio = card->sdio_if;
CsrResult r = CSR_RESULT_SUCCESS;
- CsrInt16 retries;
+ s16 retries;
CsrResult csrResult = CSR_RESULT_SUCCESS;
retries = 0;
} /* retrying_write8() */
-static CsrResult retrying_read16(card_t *card, CsrInt16 funcnum,
- CsrUint32 addr, u16 *pdata)
+static CsrResult retrying_read16(card_t *card, s16 funcnum,
+ u32 addr, u16 *pdata)
{
CsrSdioFunction *sdio = card->sdio_if;
CsrResult r = CSR_RESULT_SUCCESS;
- CsrInt16 retries;
+ s16 retries;
CsrResult csrResult = CSR_RESULT_SUCCESS;
retries = 0;
} /* retrying_read16() */
-static CsrResult retrying_write16(card_t *card, CsrInt16 funcnum,
- CsrUint32 addr, u16 data)
+static CsrResult retrying_write16(card_t *card, s16 funcnum,
+ u32 addr, u16 data)
{
CsrSdioFunction *sdio = card->sdio_if;
CsrResult r = CSR_RESULT_SUCCESS;
- CsrInt16 retries;
+ s16 retries;
CsrResult csrResult = CSR_RESULT_SUCCESS;
retries = 0;
* CSR_RESULT_FAILURE an SDIO error occurred
* ---------------------------------------------------------------------------
*/
-CsrResult sdio_read_f0(card_t *card, CsrUint32 addr, u8 *pdata)
+CsrResult sdio_read_f0(card_t *card, u32 addr, u8 *pdata)
{
#if defined (CSR_WIFI_HIP_DEBUG_OFFLINE) && defined (CSR_WIFI_HIP_DATA_PLANE_PROFILE)
card->cmd_prof.cmd52_f0_r_count++;
* CSR_RESULT_FAILURE an SDIO error occurred
* ---------------------------------------------------------------------------
*/
-CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data)
+CsrResult sdio_write_f0(card_t *card, u32 addr, u8 data)
{
#if defined (CSR_WIFI_HIP_DEBUG_OFFLINE) && defined (CSR_WIFI_HIP_DATA_PLANE_PROFILE)
card->cmd_prof.cmd52_f0_w_count++;
* CSR_RESULT_SUCCESS on success, non-zero error code on error:
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata)
+CsrResult unifi_read_direct_8_or_16(card_t *card, u32 addr, u8 *pdata)
{
#ifdef CSR_WIFI_TRANSPORT_CSPI
u16 w;
* to memory until the preceding even address is written.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data)
+CsrResult unifi_write_direct_8_or_16(card_t *card, u32 addr, u8 data)
{
if (addr & 1)
{
* even address is read.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata)
+CsrResult unifi_read_direct16(card_t *card, u32 addr, u16 *pdata)
{
return retrying_read16(card, card->function, addr, pdata);
} /* unifi_read_direct16() */
* even address is written.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data)
+CsrResult unifi_write_direct16(card_t *card, u32 addr, u16 data)
{
return retrying_write16(card, card->function, addr, data);
} /* unifi_write_direct16() */
* CSR_RESULT_FAILURE an SDIO error occurred
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata)
+CsrResult unifi_read_direct32(card_t *card, u32 addr, u32 *pdata)
{
CsrResult r;
u16 w0, w1;
return r;
}
- *pdata = ((CsrUint32)w1 << 16) | (CsrUint32)w0;
+ *pdata = ((u32)w1 << 16) | (u32)w0;
return CSR_RESULT_SUCCESS;
} /* unifi_read_direct32() */
* even address is read.
* ---------------------------------------------------------------------------
*/
-static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, u16 len, s8 m, CsrUint32 *num)
+static CsrResult unifi_read_directn_match(card_t *card, u32 addr, void *pdata, u16 len, s8 m, u32 *num)
{
CsrResult r;
- CsrUint32 i;
+ u32 i;
u8 *cptr;
u16 w;
addr += 2;
}
- *num = (CsrInt32)(cptr - (u8 *)pdata);
+ *num = (s32)(cptr - (u8 *)pdata);
return CSR_RESULT_SUCCESS;
}
* even address is read.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len)
+CsrResult unifi_read_directn(card_t *card, u32 addr, void *pdata, u16 len)
{
- CsrUint32 num;
+ u32 num;
return unifi_read_directn_match(card, addr, pdata, len, -1, &num);
} /* unifi_read_directn() */
* This means we must write data as pairs of bytes in reverse order.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len)
+CsrResult unifi_write_directn(card_t *card, u32 addr, void *pdata, u16 len)
{
CsrResult r;
u8 *cptr;
- CsrInt16 signed_len;
+ s16 signed_len;
cptr = (u8 *)pdata;
- signed_len = (CsrInt16)len;
+ signed_len = (s16)len;
while (signed_len > 0)
{
/* This is UniFi-1 specific code. CSPI not supported so 8-bit write allowed */
* CSR_RESULT_FAILURE an SDIO error occurred
* ---------------------------------------------------------------------------
*/
-static CsrResult set_dmem_page(card_t *card, CsrUint32 dmem_addr, CsrUint32 *paddr)
+static CsrResult set_dmem_page(card_t *card, u32 dmem_addr, u32 *paddr)
{
u16 page, addr;
- CsrUint32 len;
+ u32 len;
CsrResult r;
*paddr = 0;
card->dmem_page = page;
}
- *paddr = ((CsrInt32)addr * 2) + (dmem_addr & 1);
+ *paddr = ((s32)addr * 2) + (dmem_addr & 1);
return CSR_RESULT_SUCCESS;
} /* set_dmem_page() */
-static CsrResult set_pmem_page(card_t *card, CsrUint32 pmem_addr,
- enum chip_helper_window_type mem_type, CsrUint32 *paddr)
+static CsrResult set_pmem_page(card_t *card, u32 pmem_addr,
+ enum chip_helper_window_type mem_type, u32 *paddr)
{
u16 page, addr;
- CsrUint32 len;
+ u32 len;
CsrResult r;
*paddr = 0;
card->pmem_page = page;
}
- *paddr = ((CsrInt32)addr * 2) + (pmem_addr & 1);
+ *paddr = ((s32)addr * 2) + (pmem_addr & 1);
return CSR_RESULT_SUCCESS;
} /* set_pmem_page() */
* CSR_WIFI_HIP_RESULT_INVALID_VALUE the address is invalid
* ---------------------------------------------------------------------------
*/
-static CsrResult set_page(card_t *card, CsrUint32 generic_addr, CsrUint32 *paddr)
+static CsrResult set_page(card_t *card, u32 generic_addr, u32 *paddr)
{
- CsrInt32 space;
- CsrUint32 addr;
+ s32 space;
+ u32 addr;
CsrResult r = CSR_RESULT_SUCCESS;
if (!paddr)
return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
}
- if (card->proc_select != (CsrUint32)select)
+ if (card->proc_select != (u32)select)
{
r = unifi_write_direct16(card,
ChipHelper_DBG_HOST_PROC_SELECT(card->helper) * 2,
return r;
}
- card->proc_select = (CsrUint32)select;
+ card->proc_select = (u32)select;
}
return CSR_RESULT_SUCCESS;
* CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 *pdata)
+CsrResult unifi_read_8_or_16(card_t *card, u32 unifi_addr, u8 *pdata)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
#ifdef CSR_WIFI_TRANSPORT_CSPI
u16 w;
* write with the previously cached odd byte.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data)
+CsrResult unifi_write_8_or_16(card_t *card, u32 unifi_addr, u8 data)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
#ifdef CSR_WIFI_TRANSPORT_CSPI
u16 w;
* CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata)
+CsrResult unifi_card_read16(card_t *card, u32 unifi_addr, u16 *pdata)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
r = set_page(card, unifi_addr, &sdio_addr);
* CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data)
+CsrResult unifi_card_write16(card_t *card, u32 unifi_addr, u16 data)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
r = set_page(card, unifi_addr, &sdio_addr);
* CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata)
+CsrResult unifi_read32(card_t *card, u32 unifi_addr, u32 *pdata)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
r = set_page(card, unifi_addr, &sdio_addr);
* CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len, s8 match)
+CsrResult unifi_readn_match(card_t *card, u32 unifi_addr, void *pdata, u16 len, s8 match)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
- CsrUint32 num;
+ u32 num;
r = set_page(card, unifi_addr, &sdio_addr);
if (r != CSR_RESULT_SUCCESS)
} /* unifi_readn_match() */
-CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len)
+CsrResult unifi_card_readn(card_t *card, u32 unifi_addr, void *pdata, u16 len)
{
return unifi_readn_match(card, unifi_addr, pdata, len, -1);
} /* unifi_card_readn() */
-CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len)
+CsrResult unifi_readnz(card_t *card, u32 unifi_addr, void *pdata, u16 len)
{
return unifi_readn_match(card, unifi_addr, pdata, len, 0);
} /* unifi_readnz() */
* Value read from memory (0-127) or -1 on error
* ---------------------------------------------------------------------------
*/
-CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr)
+s32 unifi_read_shared_count(card_t *card, u32 addr)
{
u8 b;
/* I've increased this count, because I have seen cases where
* with increasing this limit. It's better to take a while to
* recover than to fail. */
#define SHARED_READ_RETRY_LIMIT 10
- CsrInt32 i;
+ s32 i;
/*
* Get the to-host-signals-written count.
* This avoids a race between driver read and firmware write of the
* word, the value we need is in the lower 8 bits anway.
*/
- return (CsrInt32)(b & 0xff);
+ return (s32)(b & 0xff);
}
}
* CSR_WIFI_HIP_RESULT_INVALID_VALUE an odd length or length too big.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len)
+CsrResult unifi_writen(card_t *card, u32 unifi_addr, void *pdata, u16 len)
{
- CsrUint32 sdio_addr;
+ u32 sdio_addr;
CsrResult r;
r = set_page(card, unifi_addr, &sdio_addr);
} /* unifi_writen() */
-static CsrResult csr_sdio_block_rw(card_t *card, CsrInt16 funcnum,
- CsrUint32 addr, u8 *pdata,
- u16 count, CsrInt16 dir_is_write)
+static CsrResult csr_sdio_block_rw(card_t *card, s16 funcnum,
+ u32 addr, u8 *pdata,
+ u16 count, s16 dir_is_write)
{
CsrResult csrResult;
* This function uses SDIO CMD53, which is the block transfer mode.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata,
- CsrUint32 len, CsrInt16 direction)
+CsrResult unifi_bulk_rw(card_t *card, u32 handle, void *pdata,
+ u32 len, s16 direction)
{
#define CMD53_RETRIES 3
/*
#define REWIND_DELAY 1 /* msec or 50usecs */
CsrResult csrResult; /* SDIO error code */
CsrResult r = CSR_RESULT_SUCCESS; /* HIP error code */
- CsrInt16 retries = CMD53_RETRIES;
- CsrInt16 stat_retries;
+ s16 retries = CMD53_RETRIES;
+ s16 stat_retries;
u8 stat;
- CsrInt16 dump_read;
+ s16 dump_read;
#ifdef UNIFI_DEBUG
u8 *pdata_lsb = ((u8 *)&pdata) + card->lsb;
#endif
#ifdef CSR_WIFI_MAKE_FAKE_CMD53_ERRORS
- static CsrInt16 fake_error;
+ static s16 fake_error;
#endif
dump_read = 0;
unifi_trace(card->ospriv, UDBG4,
"Error in a CMD53 transfer, retrying (h:%d,l:%u)...\n",
- (CsrInt16)handle & 0xff, len);
+ (s16)handle & 0xff, len);
/* The transfer failed, rewind and try again */
r = unifi_write_8_or_16(card, card->sdio_ctrl_addr + 8,
* This function uses SDIO CMD53, which is the block transfer mode.
* ---------------------------------------------------------------------------
*/
-CsrResult unifi_bulk_rw_noretry(card_t *card, CsrUint32 handle, void *pdata,
- CsrUint32 len, CsrInt16 direction)
+CsrResult unifi_bulk_rw_noretry(card_t *card, u32 handle, void *pdata,
+ u32 len, s16 direction)
{
CsrResult csrResult;
projects / firefly-linux-kernel-4.4.55.git / blobdiff