From 3acf830f62c8dcfdf32ddb74acbb68a95ff66c18 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 14 Mar 2011 10:58:40 -0700 Subject: [PATCH] --- yaml --- r: 236478 b: refs/heads/master c: f1ab30823feddb533ad5840e873c79698b77abf0 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 2 +- trunk/drivers/staging/ath6kl/include/ar3kconfig.h | 2 +- trunk/drivers/staging/ath6kl/include/hci_transport_api.h | 6 +++--- trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e80dc2a1d0f6..1cd953302ccd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e83750e79169e860aa1eb9077084e67b7ce5d86b +refs/heads/master: f1ab30823feddb533ad5840e873c79698b77abf0 diff --git a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c index c7e8f711ad0f..8e5abe8e67ec 100644 --- a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +++ b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c @@ -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 { diff --git a/trunk/drivers/staging/ath6kl/include/ar3kconfig.h b/trunk/drivers/staging/ath6kl/include/ar3kconfig.h index 20d295ba0da4..80f948e99576 100644 --- a/trunk/drivers/staging/ath6kl/include/ar3kconfig.h +++ b/trunk/drivers/staging/ath6kl/include/ar3kconfig.h @@ -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 */ diff --git a/trunk/drivers/staging/ath6kl/include/hci_transport_api.h b/trunk/drivers/staging/ath6kl/include/hci_transport_api.h index 7fa44f0e12a4..ee25c6b5cfdc 100644 --- a/trunk/drivers/staging/ath6kl/include/hci_transport_api.h +++ b/trunk/drivers/staging/ath6kl/include/hci_transport_api.h @@ -79,11 +79,11 @@ 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 */ @@ -91,7 +91,7 @@ struct hci_transport_config_info { 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; diff --git a/trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c b/trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c index 433c69eb739b..4500f84b5608 100644 --- a/trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/trunk/drivers/staging/ath6kl/os/linux/hci_bridge.c @@ -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 */ @@ -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;