Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 220065
b: refs/heads/master
c: 3fd79f7
h: refs/heads/master
i:
  220063: 1c8d35b
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Oct 5, 2010
1 parent 768f4bc commit 524c4a7
Show file tree
Hide file tree
Showing 13 changed files with 263 additions and 263 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 41feb5ede1994e2c851f65dec82790544ed364fd
refs/heads/master: 3fd79f7c0b69d100c376ad116733cdb655bb2cf1
30 changes: 15 additions & 15 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@ int bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh)
return BCME_UNSUPPORTED;
}

uint8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err)
u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
SDIOH_API_RC status;
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
int32 retry = 0;
#endif
uint8 data = 0;
u8 data = 0;

if (!bcmsdh)
bcmsdh = l_bcmsdh;
Expand All @@ -202,22 +202,22 @@ uint8 bcmsdh_cfg_read(void *sdh, uint fnc_num, uint32 addr, int *err)
#endif
status =
sdioh_cfg_read(bcmsdh->sdioh, fnc_num, addr,
(uint8 *) &data);
(u8 *) &data);
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
} while (!SDIOH_API_SUCCESS(status)
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err)
*err = (SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR);

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint8data = 0x%x\n",
BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));

return data;
}

void
bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, uint8 data, int *err)
bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, u8 data, int *err)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
SDIOH_API_RC status;
Expand All @@ -237,15 +237,15 @@ bcmsdh_cfg_write(void *sdh, uint fnc_num, uint32 addr, uint8 data, int *err)
#endif
status =
sdioh_cfg_write(bcmsdh->sdioh, fnc_num, addr,
(uint8 *) &data);
(u8 *) &data);
#ifdef SDIOH_API_ACCESS_RETRY_LIMIT
} while (!SDIOH_API_SUCCESS(status)
&& (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
#endif
if (err)
*err = SDIOH_API_SUCCESS(status) ? 0 : BCME_SDIO_ERROR;

BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, uint8data = 0x%x\n",
BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));
}

Expand Down Expand Up @@ -296,13 +296,13 @@ bcmsdh_cfg_write_word(void *sdh, uint fnc_num, uint32 addr, uint32 data,
__func__, fnc_num, addr, data));
}

int bcmsdh_cis_read(void *sdh, uint func, uint8 * cis, uint length)
int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
SDIOH_API_RC status;

uint8 *tmp_buf, *tmp_ptr;
uint8 *ptr;
u8 *tmp_buf, *tmp_ptr;
u8 *ptr;
bool ascii = func & ~0xf;
func &= 0x7;

Expand All @@ -318,7 +318,7 @@ int bcmsdh_cis_read(void *sdh, uint func, uint8 * cis, uint length)
if (ascii) {
/* Move binary bits to tmp and format them
into the provided buffer. */
tmp_buf = (uint8 *) MALLOC(bcmsdh->osh, length);
tmp_buf = (u8 *) MALLOC(bcmsdh->osh, length);
if (tmp_buf == NULL) {
BCMSDH_ERROR(("%s: out of memory\n", __func__));
return BCME_NOMEM;
Expand Down Expand Up @@ -388,7 +388,7 @@ uint32 bcmsdh_reg_read(void *sdh, uint32 addr, uint size)
/* if ok, return appropriately masked word */
if (SDIOH_API_SUCCESS(status)) {
switch (size) {
case sizeof(uint8):
case sizeof(u8):
return word & 0xff;
case sizeof(uint16):
return word & 0xffff;
Expand Down Expand Up @@ -452,7 +452,7 @@ bool bcmsdh_regfail(void *sdh)

int
bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,
uint8 *buf, uint nbytes, void *pkt,
u8 *buf, uint nbytes, void *pkt,
bcmsdh_cmplt_fn_t complete, void *handle)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
Expand Down Expand Up @@ -497,7 +497,7 @@ bcmsdh_recv_buf(void *sdh, uint32 addr, uint fn, uint flags,

int
bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,
uint8 *buf, uint nbytes, void *pkt,
u8 *buf, uint nbytes, void *pkt,
bcmsdh_cmplt_fn_t complete, void *handle)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
Expand Down Expand Up @@ -540,7 +540,7 @@ bcmsdh_send_buf(void *sdh, uint32 addr, uint fn, uint flags,
return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR;
}

int bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, uint8 *buf, uint nbytes)
int bcmsdh_rwdata(void *sdh, uint rw, uint32 addr, u8 *buf, uint nbytes)
{
bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh;
SDIOH_API_RC status;
Expand Down
42 changes: 21 additions & 21 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd)
{
int err_ret;
uint32 fbraddr;
uint8 func;
u8 func;

sd_trace(("%s\n", __func__));

Expand Down Expand Up @@ -204,7 +204,7 @@ extern SDIOH_API_RC sdioh_detach(osl_t *osh, sdioh_info_t *sd)

extern SDIOH_API_RC sdioh_enable_func_intr(void)
{
uint8 reg;
u8 reg;
int err;

if (gInstance->func[0]) {
Expand Down Expand Up @@ -238,7 +238,7 @@ extern SDIOH_API_RC sdioh_enable_func_intr(void)

extern SDIOH_API_RC sdioh_disable_func_intr(void)
{
uint8 reg;
u8 reg;
int err;

if (gInstance->func[0]) {
Expand Down Expand Up @@ -649,7 +649,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
case IOV_GVAL(IOV_DEVREG):
{
sdreg_t *sd_ptr = (sdreg_t *) params;
uint8 data = 0;
u8 data = 0;

if (sdioh_cfg_read
(si, sd_ptr->func, sd_ptr->offset, &data)) {
Expand All @@ -665,7 +665,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
case IOV_SVAL(IOV_DEVREG):
{
sdreg_t *sd_ptr = (sdreg_t *) params;
uint8 data = (uint8) sd_ptr->value;
u8 data = (u8) sd_ptr->value;

if (sdioh_cfg_write
(si, sd_ptr->func, sd_ptr->offset, &data)) {
Expand All @@ -689,7 +689,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
SDIOH_API_RC sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable)
{
SDIOH_API_RC status;
uint8 data;
u8 data;

if (enable)
data = 3; /* enable hw oob interrupt */
Expand All @@ -703,7 +703,7 @@ SDIOH_API_RC sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable)
#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */

extern SDIOH_API_RC
sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data)
{
SDIOH_API_RC status;
/* No lock needed since sdioh_request_byte does locking */
Expand All @@ -712,7 +712,7 @@ sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
}

extern SDIOH_API_RC
sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, uint8 *data)
sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, uint32 addr, u8 *data)
{
/* No lock needed since sdioh_request_byte does locking */
SDIOH_API_RC status;
Expand All @@ -725,13 +725,13 @@ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr)
/* read 24 bits and return valid 17 bit addr */
int i;
uint32 scratch, regdata;
uint8 *ptr = (uint8 *)&scratch;
u8 *ptr = (u8 *)&scratch;
for (i = 0; i < 3; i++) {
if ((sdioh_sdmmc_card_regread(sd, 0, regaddr, 1, &regdata)) !=
SUCCESS)
sd_err(("%s: Can't read!\n", __func__));

*ptr++ = (uint8) regdata;
*ptr++ = (u8) regdata;
regaddr++;
}

Expand All @@ -742,12 +742,12 @@ static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, uint32 regaddr)
}

extern SDIOH_API_RC
sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)
sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, uint32 length)
{
uint32 count;
int offset;
uint32 foo;
uint8 *cis = cisd;
u8 *cis = cisd;

sd_trace(("%s: Func = %d\n", __func__, func));

Expand All @@ -768,7 +768,7 @@ sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)
return SDIOH_API_RC_FAIL;
}

*cis = (uint8) (foo & 0xff);
*cis = (u8) (foo & 0xff);
cis++;
}

Expand All @@ -777,7 +777,7 @@ sdioh_cis_read(sdioh_info_t *sd, uint func, uint8 *cisd, uint32 length)

extern SDIOH_API_RC
sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr,
uint8 *byte)
u8 *byte)
{
int err_ret;

Expand Down Expand Up @@ -967,19 +967,19 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,

if ((write) && (!fifo)) {
err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
((uint8 *) PKTDATA(pnext)),
((u8 *) PKTDATA(pnext)),
pkt_len);
} else if (write) {
err_ret = sdio_memcpy_toio(gInstance->func[func], addr,
((uint8 *) PKTDATA(pnext)),
((u8 *) PKTDATA(pnext)),
pkt_len);
} else if (fifo) {
err_ret = sdio_readsb(gInstance->func[func],
((uint8 *) PKTDATA(pnext)),
((u8 *) PKTDATA(pnext)),
addr, pkt_len);
} else {
err_ret = sdio_memcpy_fromio(gInstance->func[func],
((uint8 *) PKTDATA(pnext)),
((u8 *) PKTDATA(pnext)),
addr, pkt_len);
}

Expand Down Expand Up @@ -1026,7 +1026,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func,
extern SDIOH_API_RC
sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
uint func, uint addr, uint reg_width, uint buflen_u,
uint8 *buffer, void *pkt)
u8 *buffer, void *pkt)
{
SDIOH_API_RC Status;
void *mypkt = NULL;
Expand Down Expand Up @@ -1160,7 +1160,7 @@ sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, uint32 regaddr,
{

if ((func == 0) || (regsize == 1)) {
uint8 temp = 0;
u8 temp = 0;

sdioh_request_byte(sd, SDIOH_READ, func, regaddr, &temp);
*data = temp;
Expand Down Expand Up @@ -1226,7 +1226,7 @@ sdioh_sdmmc_card_regwrite(sdioh_info_t *sd, int func, uint32 regaddr,
{

if ((func == 0) || (regsize == 1)) {
uint8 temp;
u8 temp;

temp = data & 0xff;
sdioh_request_byte(sd, SDIOH_READ, func, regaddr, &temp);
Expand Down
Loading

0 comments on commit 524c4a7

Please sign in to comment.