Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236478
b: refs/heads/master
c: f1ab308
h: refs/heads/master
v: v3
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent 29a66d3 commit 3acf830
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e83750e79169e860aa1eb9077084e67b7ce5d86b
refs/heads/master: f1ab30823feddb533ad5840e873c79698b77abf0
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ void GMboxProtocolUninstall(struct ar6k_device *pDev)

static int NotifyTransportReady(struct gmbox_proto_hci_uart *pProt)
{
HCI_TRANSPORT_PROPERTIES props;
struct hci_transport_properties props;
int status = 0;

do {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/ath6kl/include/ar3kconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern "C" {
struct ar3k_config_info {
u32 Flags; /* config flags */
void *pHCIDev; /* HCI bridge device */
HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */
struct hci_transport_properties *pHCIProps; /* HCI bridge props */
HIF_DEVICE *pHIFDevice; /* HIF layer device */

u32 AR3KBaudRate; /* AR3K operational baud rate */
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/ath6kl/include/hci_transport_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,19 @@ typedef enum _HCI_SEND_FULL_ACTION {
* the callback must return the send full action to take (either DROP or KEEP) */
typedef HCI_SEND_FULL_ACTION (*HCI_TRANSPORT_SEND_FULL)(void *, HTC_PACKET *);

typedef struct {
struct hci_transport_properties {
int HeadRoom; /* number of bytes in front of HCI packet for header space */
int TailRoom; /* number of bytes at the end of the HCI packet for tail space */
int IOBlockPad; /* I/O block padding required (always a power of 2) */
} HCI_TRANSPORT_PROPERTIES;
};

struct hci_transport_config_info {
int ACLRecvBufferWaterMark; /* low watermark to trigger recv refill */
int EventRecvBufferWaterMark; /* low watermark to trigger recv refill */
int MaxSendQueueDepth; /* max number of packets in the single send queue */
void *pContext; /* context for all callbacks */
void (*TransportFailure)(void *pContext, int Status); /* transport failure callback */
int (*TransportReady)(HCI_TRANSPORT_HANDLE, HCI_TRANSPORT_PROPERTIES *,void *pContext); /* transport is ready */
int (*TransportReady)(HCI_TRANSPORT_HANDLE, struct hci_transport_properties *,void *pContext); /* transport is ready */
void (*TransportRemoved)(void *pContext); /* transport was removed */
/* packet processing callbacks */
HCI_TRANSPORT_SEND_PKT_COMPLETE pHCISendComplete;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ extern unsigned int hciuartstep;

struct ar6k_hci_bridge_info {
void *pHCIDev; /* HCI bridge device */
HCI_TRANSPORT_PROPERTIES HCIProps; /* HCI bridge props */
struct hci_transport_properties HCIProps; /* HCI bridge props */
struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */
bool HciNormalMode; /* Actual HCI mode enabled (non-TEST)*/
bool HciRegistered; /* HCI device registered with stack */
Expand Down Expand Up @@ -216,7 +216,7 @@ static void RefillRecvBuffers(struct ar6k_hci_bridge_info *pHcidevInfo,
(((ar)->arTargetType == TARGET_TYPE_AR6002) ? AR6002_HOST_INTEREST_ITEM_ADDRESS(item) : \
(((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
HCI_TRANSPORT_PROPERTIES *pProps,
struct hci_transport_properties *pProps,
void *pContext)
{
struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
Expand Down

0 comments on commit 3acf830

Please sign in to comment.