Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235779
b: refs/heads/master
c: e1ce2a3
h: refs/heads/master
i:
  235777: e3a7c27
  235775: ab075ac
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Feb 2, 2011
1 parent 91623ca commit 45b1070
Show file tree
Hide file tree
Showing 75 changed files with 1,372 additions and 1,381 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: 4853ac05cff7745979830c52fe6fb46a7be6fa94
refs/heads/master: e1ce2a3afe041c36ae397abf73f8059eb599e36e
4 changes: 2 additions & 2 deletions trunk/drivers/staging/ath6kl/bmi/include/bmi_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ static bool bmiDone;
int
bmiBufferSend(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length);
u32 length);

int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
u32 length,
bool want_timeout);

#endif
156 changes: 78 additions & 78 deletions trunk/drivers/staging/ath6kl/bmi/src/bmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ very simple.
*/

static bool pendingEventsFuncCheck = false;
static A_UINT32 *pBMICmdCredits;
static u32 *pBMICmdCredits;
static A_UCHAR *pBMICmdBuf;
#define MAX_BMI_CMDBUF_SZ (BMI_DATASZ_MAX + \
sizeof(A_UINT32) /* cmd */ + \
sizeof(A_UINT32) /* addr */ + \
sizeof(A_UINT32))/* length */
sizeof(u32) /* cmd */ + \
sizeof(u32) /* addr */ + \
sizeof(u32))/* length */
#define BMI_COMMAND_FITS(sz) ((sz) <= MAX_BMI_CMDBUF_SZ)

/* APIs visible to the driver */
Expand All @@ -79,7 +79,7 @@ BMIInit(void)
* bus stack.
*/
if (!pBMICmdCredits) {
pBMICmdCredits = (A_UINT32 *)A_MALLOC_NOWAIT(4);
pBMICmdCredits = (u32 *)A_MALLOC_NOWAIT(4);
A_ASSERT(pBMICmdCredits);
}

Expand Down Expand Up @@ -109,7 +109,7 @@ int
BMIDone(HIF_DEVICE *device)
{
int status;
A_UINT32 cid;
u32 cid;

if (bmiDone) {
AR_DEBUG_PRINTF (ATH_DEBUG_BMI, ("BMIDone skipped\n"));
Expand Down Expand Up @@ -145,7 +145,7 @@ int
BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
{
int status;
A_UINT32 cid;
u32 cid;

if (bmiDone) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
Expand Down Expand Up @@ -202,14 +202,14 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)

int
BMIReadMemory(HIF_DEVICE *device,
A_UINT32 address,
u32 address,
A_UCHAR *buffer,
A_UINT32 length)
u32 length)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
A_UINT32 remaining, rxlen;
u32 offset;
u32 remaining, rxlen;

A_ASSERT(BMI_COMMAND_FITS(BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)));
memset (pBMICmdBuf, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length));
Expand Down Expand Up @@ -258,15 +258,15 @@ BMIReadMemory(HIF_DEVICE *device,

int
BMIWriteMemory(HIF_DEVICE *device,
A_UINT32 address,
u32 address,
A_UCHAR *buffer,
A_UINT32 length)
u32 length)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
A_UINT32 remaining, txlen;
const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
u32 offset;
u32 remaining, txlen;
const u32 header = sizeof(cid) + sizeof(address) + sizeof(length);
A_UCHAR alignedBuffer[BMI_DATASZ_MAX];
A_UCHAR *src;

Expand Down Expand Up @@ -323,12 +323,12 @@ BMIWriteMemory(HIF_DEVICE *device,

int
BMIExecute(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 *param)
u32 address,
u32 *param)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(address) + sizeof(param));
Expand Down Expand Up @@ -371,11 +371,11 @@ BMIExecute(HIF_DEVICE *device,

int
BMISetAppStart(HIF_DEVICE *device,
A_UINT32 address)
u32 address)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(address));
Expand Down Expand Up @@ -408,12 +408,12 @@ BMISetAppStart(HIF_DEVICE *device,

int
BMIReadSOCRegister(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 *param)
u32 address,
u32 *param)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(address));
Expand Down Expand Up @@ -454,12 +454,12 @@ BMIReadSOCRegister(HIF_DEVICE *device,

int
BMIWriteSOCRegister(HIF_DEVICE *device,
A_UINT32 address,
A_UINT32 param)
u32 address,
u32 param)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address) + sizeof(param)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(address) + sizeof(param));
Expand Down Expand Up @@ -494,15 +494,15 @@ BMIWriteSOCRegister(HIF_DEVICE *device,

int
BMIrompatchInstall(HIF_DEVICE *device,
A_UINT32 ROM_addr,
A_UINT32 RAM_addr,
A_UINT32 nbytes,
A_UINT32 do_activate,
A_UINT32 *rompatch_id)
u32 ROM_addr,
u32 RAM_addr,
u32 nbytes,
u32 do_activate,
u32 *rompatch_id)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
sizeof(nbytes) + sizeof(do_activate)));
Expand Down Expand Up @@ -550,11 +550,11 @@ BMIrompatchInstall(HIF_DEVICE *device,

int
BMIrompatchUninstall(HIF_DEVICE *device,
A_UINT32 rompatch_id)
u32 rompatch_id)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(rompatch_id)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(rompatch_id));
Expand Down Expand Up @@ -587,14 +587,14 @@ BMIrompatchUninstall(HIF_DEVICE *device,

static int
_BMIrompatchChangeActivation(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list,
A_UINT32 do_activate)
u32 rompatch_count,
u32 *rompatch_list,
u32 do_activate)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
A_UINT32 length;
u32 offset;
u32 length;

A_ASSERT(BMI_COMMAND_FITS(BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count)));
memset(pBMICmdBuf, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count));
Expand Down Expand Up @@ -631,30 +631,30 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device,

int
BMIrompatchActivate(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list)
u32 rompatch_count,
u32 *rompatch_list)
{
return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
}

int
BMIrompatchDeactivate(HIF_DEVICE *device,
A_UINT32 rompatch_count,
A_UINT32 *rompatch_list)
u32 rompatch_count,
u32 *rompatch_list)
{
return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
}

int
BMILZData(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length)
u32 length)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
A_UINT32 remaining, txlen;
const A_UINT32 header = sizeof(cid) + sizeof(length);
u32 offset;
u32 remaining, txlen;
const u32 header = sizeof(cid) + sizeof(length);

A_ASSERT(BMI_COMMAND_FITS(BMI_DATASZ_MAX+header));
memset (pBMICmdBuf, 0, BMI_DATASZ_MAX+header);
Expand Down Expand Up @@ -697,11 +697,11 @@ BMILZData(HIF_DEVICE *device,

int
BMILZStreamStart(HIF_DEVICE *device,
A_UINT32 address)
u32 address)
{
A_UINT32 cid;
u32 cid;
int status;
A_UINT32 offset;
u32 offset;

A_ASSERT(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
memset (pBMICmdBuf, 0, sizeof(cid) + sizeof(address));
Expand Down Expand Up @@ -736,12 +736,12 @@ BMILZStreamStart(HIF_DEVICE *device,
int
bmiBufferSend(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length)
u32 length)
{
int status;
A_UINT32 timeout;
A_UINT32 address;
A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
u32 timeout;
u32 address;
u32 mboxAddress[HTC_MAILBOX_NUM_MAX];

HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
&mboxAddress[0], sizeof(mboxAddress));
Expand Down Expand Up @@ -784,12 +784,12 @@ bmiBufferSend(HIF_DEVICE *device,
int
bmiBufferReceive(HIF_DEVICE *device,
A_UCHAR *buffer,
A_UINT32 length,
u32 length,
bool want_timeout)
{
int status;
A_UINT32 address;
A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
u32 address;
u32 mboxAddress[HTC_MAILBOX_NUM_MAX];
HIF_PENDING_EVENTS_INFO hifPendingEvents;
static HIF_PENDING_EVENTS_FUNC getPendingEventsFunc = NULL;

Expand Down Expand Up @@ -857,8 +857,8 @@ bmiBufferReceive(HIF_DEVICE *device,
* NB: word_available is declared static for esoteric reasons
* having to do with protection on some OSes.
*/
static A_UINT32 word_available;
A_UINT32 timeout;
static u32 word_available;
u32 timeout;

word_available = 0;
timeout = BMI_COMMUNICATION_TIMEOUT;
Expand All @@ -873,7 +873,7 @@ bmiBufferReceive(HIF_DEVICE *device,
break;
}

if (hifPendingEvents.AvailableRecvBytes >= sizeof(A_UINT32)) {
if (hifPendingEvents.AvailableRecvBytes >= sizeof(u32)) {
word_available = 1;
}
continue;
Expand Down Expand Up @@ -920,7 +920,7 @@ bmiBufferReceive(HIF_DEVICE *device,
* reduce BMI_DATASZ_MAX to 32 or 64
*/
if ((length > 4) && (length < 128)) { /* check against MBOX FIFO size */
A_UINT32 timeout;
u32 timeout;

*pBMICmdCredits = 0;
timeout = BMI_COMMUNICATION_TIMEOUT;
Expand Down Expand Up @@ -958,12 +958,12 @@ bmiBufferReceive(HIF_DEVICE *device,
}

int
BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32 length)
BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length)
{
int status = A_ERROR;
A_UINT32 lastWord = 0;
A_UINT32 lastWordOffset = length & ~0x3;
A_UINT32 unalignedBytes = length & 0x3;
u32 lastWord = 0;
u32 lastWordOffset = length & ~0x3;
u32 unalignedBytes = length & 0x3;

status = BMILZStreamStart (device, address);
if (status) {
Expand Down Expand Up @@ -998,13 +998,13 @@ BMIFastDownload(HIF_DEVICE *device, A_UINT32 address, A_UCHAR *buffer, A_UINT32
}

int
BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length)
BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, u32 length)
{
return bmiBufferSend(device, buffer, length);
}

int
BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, A_UINT32 length, bool want_timeout)
BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, u32 length, bool want_timeout)
{
return bmiBufferReceive(device, buffer, length, want_timeout);
}
6 changes: 3 additions & 3 deletions trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ typedef struct bus_request {
struct bus_request *next; /* link list of available requests */
struct bus_request *inusenext; /* link list of in use requests */
struct semaphore sem_req;
A_UINT32 address; /* request data */
u32 address; /* request data */
A_UCHAR *buffer;
A_UINT32 length;
A_UINT32 request;
u32 length;
u32 request;
void *context;
int status;
struct _HIF_SCATTER_REQ_PRIV *pScatterReq; /* this request is a scatter request */
Expand Down
Loading

0 comments on commit 45b1070

Please sign in to comment.