diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-10 21:55:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-11 17:31:50 -0500 |
commit | 03e41d55390a5dab2ab9945eef331edb2eddd72f (patch) | |
tree | ad4e98a1e91b669e6ccc78a75be46d885133c977 | |
parent | 69c44f42f6467441cc413ccbabbb9deeb82d16c4 (diff) |
staging: ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO
remove-typedef -s AR6K_HCI_BRIDGE_INFO \
"struct ar6k_hci_bridge_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index ee52d119531..a02827bab8d 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c | |||
@@ -73,7 +73,7 @@ extern unsigned int hciuartscale; | |||
73 | extern unsigned int hciuartstep; | 73 | extern unsigned int hciuartstep; |
74 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ | 74 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ |
75 | 75 | ||
76 | typedef struct { | 76 | struct ar6k_hci_bridge_info { |
77 | void *pHCIDev; /* HCI bridge device */ | 77 | void *pHCIDev; /* HCI bridge device */ |
78 | HCI_TRANSPORT_PROPERTIES HCIProps; /* HCI bridge props */ | 78 | HCI_TRANSPORT_PROPERTIES HCIProps; /* HCI bridge props */ |
79 | struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ | 79 | struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */ |
@@ -87,7 +87,7 @@ typedef struct { | |||
87 | #else | 87 | #else |
88 | AR_SOFTC_T *ar; | 88 | AR_SOFTC_T *ar; |
89 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ | 89 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ |
90 | } AR6K_HCI_BRIDGE_INFO; | 90 | }; |
91 | 91 | ||
92 | #define MAX_ACL_RECV_BUFS 16 | 92 | #define MAX_ACL_RECV_BUFS 16 |
93 | #define MAX_EVT_RECV_BUFS 8 | 93 | #define MAX_EVT_RECV_BUFS 8 |
@@ -103,17 +103,17 @@ extern unsigned int setupbtdev; | |||
103 | struct ar3k_config_info ar3kconfig; | 103 | struct ar3k_config_info ar3kconfig; |
104 | 104 | ||
105 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 105 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
106 | AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo; | 106 | struct ar6k_hci_bridge_info *g_pHcidevInfo; |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); | 109 | static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo); |
110 | static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); | 110 | static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo); |
111 | static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo); | 111 | static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo); |
112 | static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | 112 | static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo, |
113 | HCI_TRANSPORT_PACKET_TYPE Type, | 113 | HCI_TRANSPORT_PACKET_TYPE Type, |
114 | struct sk_buff *skb); | 114 | struct sk_buff *skb); |
115 | static struct sk_buff *bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length); | 115 | static struct sk_buff *bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length); |
116 | static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb); | 116 | static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb); |
117 | 117 | ||
118 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 118 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
119 | int ar6000_setup_hci(void *ar); | 119 | int ar6000_setup_hci(void *ar); |
@@ -129,7 +129,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb); | |||
129 | #define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock) | 129 | #define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock) |
130 | #define UNLOCK_BRIDGE(dev) spin_unlock_bh(&(dev)->BridgeLock) | 130 | #define UNLOCK_BRIDGE(dev) spin_unlock_bh(&(dev)->BridgeLock) |
131 | 131 | ||
132 | static inline void FreeBtOsBuf(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, void *osbuf) | 132 | static inline void FreeBtOsBuf(struct ar6k_hci_bridge_info *pHcidevInfo, void *osbuf) |
133 | { | 133 | { |
134 | if (pHcidevInfo->HciNormalMode) { | 134 | if (pHcidevInfo->HciNormalMode) { |
135 | bt_free_buffer(pHcidevInfo, (struct sk_buff *)osbuf); | 135 | bt_free_buffer(pHcidevInfo, (struct sk_buff *)osbuf); |
@@ -139,14 +139,14 @@ static inline void FreeBtOsBuf(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, void *osbuf) | |||
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
142 | static void FreeHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, HTC_PACKET *pPacket) | 142 | static void FreeHTCStruct(struct ar6k_hci_bridge_info *pHcidevInfo, HTC_PACKET *pPacket) |
143 | { | 143 | { |
144 | LOCK_BRIDGE(pHcidevInfo); | 144 | LOCK_BRIDGE(pHcidevInfo); |
145 | HTC_PACKET_ENQUEUE(&pHcidevInfo->HTCPacketStructHead,pPacket); | 145 | HTC_PACKET_ENQUEUE(&pHcidevInfo->HTCPacketStructHead,pPacket); |
146 | UNLOCK_BRIDGE(pHcidevInfo); | 146 | UNLOCK_BRIDGE(pHcidevInfo); |
147 | } | 147 | } |
148 | 148 | ||
149 | static HTC_PACKET * AllocHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 149 | static HTC_PACKET * AllocHTCStruct(struct ar6k_hci_bridge_info *pHcidevInfo) |
150 | { | 150 | { |
151 | HTC_PACKET *pPacket = NULL; | 151 | HTC_PACKET *pPacket = NULL; |
152 | LOCK_BRIDGE(pHcidevInfo); | 152 | LOCK_BRIDGE(pHcidevInfo); |
@@ -157,7 +157,7 @@ static HTC_PACKET * AllocHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | |||
157 | 157 | ||
158 | #define BLOCK_ROUND_UP_PWR2(x, align) (((int) (x) + ((align)-1)) & ~((align)-1)) | 158 | #define BLOCK_ROUND_UP_PWR2(x, align) (((int) (x) + ((align)-1)) & ~((align)-1)) |
159 | 159 | ||
160 | static void RefillRecvBuffers(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | 160 | static void RefillRecvBuffers(struct ar6k_hci_bridge_info *pHcidevInfo, |
161 | HCI_TRANSPORT_PACKET_TYPE Type, | 161 | HCI_TRANSPORT_PACKET_TYPE Type, |
162 | int NumBuffers) | 162 | int NumBuffers) |
163 | { | 163 | { |
@@ -219,7 +219,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle, | |||
219 | HCI_TRANSPORT_PROPERTIES *pProps, | 219 | HCI_TRANSPORT_PROPERTIES *pProps, |
220 | void *pContext) | 220 | void *pContext) |
221 | { | 221 | { |
222 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 222 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
223 | int status; | 223 | int status; |
224 | u32 address, hci_uart_pwr_mgmt_params; | 224 | u32 address, hci_uart_pwr_mgmt_params; |
225 | // struct ar3k_config_info ar3kconfig; | 225 | // struct ar3k_config_info ar3kconfig; |
@@ -325,7 +325,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle, | |||
325 | 325 | ||
326 | static void ar6000_hci_transport_failure(void *pContext, int Status) | 326 | static void ar6000_hci_transport_failure(void *pContext, int Status) |
327 | { | 327 | { |
328 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 328 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
329 | 329 | ||
330 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HCI Bridge: transport failure! \n")); | 330 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HCI Bridge: transport failure! \n")); |
331 | 331 | ||
@@ -336,7 +336,7 @@ static void ar6000_hci_transport_failure(void *pContext, int Status) | |||
336 | 336 | ||
337 | static void ar6000_hci_transport_removed(void *pContext) | 337 | static void ar6000_hci_transport_removed(void *pContext) |
338 | { | 338 | { |
339 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 339 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
340 | 340 | ||
341 | AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE, ("HCI Bridge: transport removed. \n")); | 341 | AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE, ("HCI Bridge: transport removed. \n")); |
342 | 342 | ||
@@ -349,7 +349,7 @@ static void ar6000_hci_transport_removed(void *pContext) | |||
349 | 349 | ||
350 | static void ar6000_hci_send_complete(void *pContext, HTC_PACKET *pPacket) | 350 | static void ar6000_hci_send_complete(void *pContext, HTC_PACKET *pPacket) |
351 | { | 351 | { |
352 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 352 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
353 | void *osbuf = pPacket->pPktContext; | 353 | void *osbuf = pPacket->pPktContext; |
354 | A_ASSERT(osbuf != NULL); | 354 | A_ASSERT(osbuf != NULL); |
355 | A_ASSERT(pHcidevInfo != NULL); | 355 | A_ASSERT(pHcidevInfo != NULL); |
@@ -367,7 +367,7 @@ static void ar6000_hci_send_complete(void *pContext, HTC_PACKET *pPacket) | |||
367 | 367 | ||
368 | static void ar6000_hci_pkt_recv(void *pContext, HTC_PACKET *pPacket) | 368 | static void ar6000_hci_pkt_recv(void *pContext, HTC_PACKET *pPacket) |
369 | { | 369 | { |
370 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 370 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
371 | struct sk_buff *skb; | 371 | struct sk_buff *skb; |
372 | 372 | ||
373 | A_ASSERT(pHcidevInfo != NULL); | 373 | A_ASSERT(pHcidevInfo != NULL); |
@@ -432,7 +432,7 @@ static void ar6000_hci_pkt_recv(void *pContext, HTC_PACKET *pPacket) | |||
432 | 432 | ||
433 | static void ar6000_hci_pkt_refill(void *pContext, HCI_TRANSPORT_PACKET_TYPE Type, int BuffersAvailable) | 433 | static void ar6000_hci_pkt_refill(void *pContext, HCI_TRANSPORT_PACKET_TYPE Type, int BuffersAvailable) |
434 | { | 434 | { |
435 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 435 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
436 | int refillCount; | 436 | int refillCount; |
437 | 437 | ||
438 | if (Type == HCI_ACL_TYPE) { | 438 | if (Type == HCI_ACL_TYPE) { |
@@ -449,7 +449,7 @@ static void ar6000_hci_pkt_refill(void *pContext, HCI_TRANSPORT_PACKET_TYPE Typ | |||
449 | 449 | ||
450 | static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, HTC_PACKET *pPacket) | 450 | static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, HTC_PACKET *pPacket) |
451 | { | 451 | { |
452 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 452 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext; |
453 | HCI_SEND_FULL_ACTION action = HCI_SEND_FULL_KEEP; | 453 | HCI_SEND_FULL_ACTION action = HCI_SEND_FULL_KEEP; |
454 | 454 | ||
455 | if (!pHcidevInfo->HciNormalMode) { | 455 | if (!pHcidevInfo->HciNormalMode) { |
@@ -473,19 +473,19 @@ int ar6000_setup_hci(AR_SOFTC_T *ar) | |||
473 | int status = 0; | 473 | int status = 0; |
474 | int i; | 474 | int i; |
475 | HTC_PACKET *pPacket; | 475 | HTC_PACKET *pPacket; |
476 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo; | 476 | struct ar6k_hci_bridge_info *pHcidevInfo; |
477 | 477 | ||
478 | 478 | ||
479 | do { | 479 | do { |
480 | 480 | ||
481 | pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)A_MALLOC(sizeof(AR6K_HCI_BRIDGE_INFO)); | 481 | pHcidevInfo = (struct ar6k_hci_bridge_info *)A_MALLOC(sizeof(struct ar6k_hci_bridge_info)); |
482 | 482 | ||
483 | if (NULL == pHcidevInfo) { | 483 | if (NULL == pHcidevInfo) { |
484 | status = A_NO_MEMORY; | 484 | status = A_NO_MEMORY; |
485 | break; | 485 | break; |
486 | } | 486 | } |
487 | 487 | ||
488 | A_MEMZERO(pHcidevInfo, sizeof(AR6K_HCI_BRIDGE_INFO)); | 488 | A_MEMZERO(pHcidevInfo, sizeof(struct ar6k_hci_bridge_info)); |
489 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 489 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
490 | g_pHcidevInfo = pHcidevInfo; | 490 | g_pHcidevInfo = pHcidevInfo; |
491 | pHcidevInfo->HCITransHdl = *(HCI_TRANSPORT_MISC_HANDLES *)ar; | 491 | pHcidevInfo->HCITransHdl = *(HCI_TRANSPORT_MISC_HANDLES *)ar; |
@@ -567,9 +567,9 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar) | |||
567 | #endif | 567 | #endif |
568 | { | 568 | { |
569 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 569 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
570 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = g_pHcidevInfo; | 570 | struct ar6k_hci_bridge_info *pHcidevInfo = g_pHcidevInfo; |
571 | #else | 571 | #else |
572 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info; | 572 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info; |
573 | #endif | 573 | #endif |
574 | 574 | ||
575 | if (pHcidevInfo != NULL) { | 575 | if (pHcidevInfo != NULL) { |
@@ -607,9 +607,9 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) | |||
607 | HTC_PACKET *pPacket; | 607 | HTC_PACKET *pPacket; |
608 | HTC_TX_TAG htc_tag = AR6K_DATA_PKT_TAG; | 608 | HTC_TX_TAG htc_tag = AR6K_DATA_PKT_TAG; |
609 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 609 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
610 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = g_pHcidevInfo; | 610 | struct ar6k_hci_bridge_info *pHcidevInfo = g_pHcidevInfo; |
611 | #else | 611 | #else |
612 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info; | 612 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info; |
613 | #endif | 613 | #endif |
614 | 614 | ||
615 | do { | 615 | do { |
@@ -666,7 +666,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) | |||
666 | 666 | ||
667 | void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig) | 667 | void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig) |
668 | { | 668 | { |
669 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info; | 669 | struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info; |
670 | struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig; | 670 | struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig; |
671 | 671 | ||
672 | config->pHCIDev = pHcidevInfo->pHCIDev; | 672 | config->pHCIDev = pHcidevInfo->pHCIDev; |
@@ -710,7 +710,7 @@ static int bt_send_frame(struct sk_buff *skb) | |||
710 | { | 710 | { |
711 | struct hci_dev *hdev = (struct hci_dev *)skb->dev; | 711 | struct hci_dev *hdev = (struct hci_dev *)skb->dev; |
712 | HCI_TRANSPORT_PACKET_TYPE type; | 712 | HCI_TRANSPORT_PACKET_TYPE type; |
713 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo; | 713 | struct ar6k_hci_bridge_info *pHcidevInfo; |
714 | HTC_PACKET *pPacket; | 714 | HTC_PACKET *pPacket; |
715 | int status = 0; | 715 | int status = 0; |
716 | struct sk_buff *txSkb = NULL; | 716 | struct sk_buff *txSkb = NULL; |
@@ -725,7 +725,7 @@ static int bt_send_frame(struct sk_buff *skb) | |||
725 | return -EBUSY; | 725 | return -EBUSY; |
726 | } | 726 | } |
727 | 727 | ||
728 | pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)hdev->driver_data; | 728 | pHcidevInfo = (struct ar6k_hci_bridge_info *)hdev->driver_data; |
729 | A_ASSERT(pHcidevInfo != NULL); | 729 | A_ASSERT(pHcidevInfo != NULL); |
730 | 730 | ||
731 | AR_DEBUG_PRINTF(ATH_DEBUG_HCI_SEND, ("+bt_send_frame type: %d \n",bt_cb(skb)->pkt_type)); | 731 | AR_DEBUG_PRINTF(ATH_DEBUG_HCI_SEND, ("+bt_send_frame type: %d \n",bt_cb(skb)->pkt_type)); |
@@ -832,11 +832,11 @@ static int bt_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg) | |||
832 | */ | 832 | */ |
833 | static int bt_flush(struct hci_dev *hdev) | 833 | static int bt_flush(struct hci_dev *hdev) |
834 | { | 834 | { |
835 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo; | 835 | struct ar6k_hci_bridge_info *pHcidevInfo; |
836 | 836 | ||
837 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HCI Bridge: bt_flush - enter\n")); | 837 | AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HCI Bridge: bt_flush - enter\n")); |
838 | 838 | ||
839 | pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)hdev->driver_data; | 839 | pHcidevInfo = (struct ar6k_hci_bridge_info *)hdev->driver_data; |
840 | 840 | ||
841 | /* TODO??? */ | 841 | /* TODO??? */ |
842 | 842 | ||
@@ -853,7 +853,7 @@ static void bt_destruct(struct hci_dev *hdev) | |||
853 | /* nothing to do here */ | 853 | /* nothing to do here */ |
854 | } | 854 | } |
855 | 855 | ||
856 | static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 856 | static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
857 | { | 857 | { |
858 | int status = 0; | 858 | int status = 0; |
859 | struct hci_dev *pHciDev = NULL; | 859 | struct hci_dev *pHciDev = NULL; |
@@ -913,7 +913,7 @@ static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | |||
913 | return status; | 913 | return status; |
914 | } | 914 | } |
915 | 915 | ||
916 | static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 916 | static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
917 | { | 917 | { |
918 | int err; | 918 | int err; |
919 | 919 | ||
@@ -935,7 +935,7 @@ static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | |||
935 | } | 935 | } |
936 | } | 936 | } |
937 | 937 | ||
938 | static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 938 | static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
939 | { | 939 | { |
940 | int err; | 940 | int err; |
941 | int status = 0; | 941 | int status = 0; |
@@ -959,7 +959,7 @@ static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | |||
959 | return status; | 959 | return status; |
960 | } | 960 | } |
961 | 961 | ||
962 | static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | 962 | static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo, |
963 | HCI_TRANSPORT_PACKET_TYPE Type, | 963 | HCI_TRANSPORT_PACKET_TYPE Type, |
964 | struct sk_buff *skb) | 964 | struct sk_buff *skb) |
965 | { | 965 | { |
@@ -1022,7 +1022,7 @@ static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | |||
1022 | return success; | 1022 | return success; |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length) | 1025 | static struct sk_buff* bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length) |
1026 | { | 1026 | { |
1027 | struct sk_buff *skb; | 1027 | struct sk_buff *skb; |
1028 | /* in normal HCI mode we need to alloc from the bt core APIs */ | 1028 | /* in normal HCI mode we need to alloc from the bt core APIs */ |
@@ -1033,7 +1033,7 @@ static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Le | |||
1033 | return skb; | 1033 | return skb; |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb) | 1036 | static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb) |
1037 | { | 1037 | { |
1038 | kfree_skb(skb); | 1038 | kfree_skb(skb); |
1039 | } | 1039 | } |
@@ -1041,21 +1041,21 @@ static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *sk | |||
1041 | #else // { CONFIG_BLUEZ_HCI_BRIDGE | 1041 | #else // { CONFIG_BLUEZ_HCI_BRIDGE |
1042 | 1042 | ||
1043 | /* stubs when we only want to test the HCI bridging Interface without the HT stack */ | 1043 | /* stubs when we only want to test the HCI bridging Interface without the HT stack */ |
1044 | static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 1044 | static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
1045 | { | 1045 | { |
1046 | return 0; | 1046 | return 0; |
1047 | } | 1047 | } |
1048 | static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 1048 | static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
1049 | { | 1049 | { |
1050 | 1050 | ||
1051 | } | 1051 | } |
1052 | static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo) | 1052 | static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo) |
1053 | { | 1053 | { |
1054 | A_ASSERT(false); | 1054 | A_ASSERT(false); |
1055 | return A_ERROR; | 1055 | return A_ERROR; |
1056 | } | 1056 | } |
1057 | 1057 | ||
1058 | static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | 1058 | static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo, |
1059 | HCI_TRANSPORT_PACKET_TYPE Type, | 1059 | HCI_TRANSPORT_PACKET_TYPE Type, |
1060 | struct sk_buff *skb) | 1060 | struct sk_buff *skb) |
1061 | { | 1061 | { |
@@ -1063,12 +1063,12 @@ static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, | |||
1063 | return false; | 1063 | return false; |
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length) | 1066 | static struct sk_buff* bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length) |
1067 | { | 1067 | { |
1068 | A_ASSERT(false); | 1068 | A_ASSERT(false); |
1069 | return NULL; | 1069 | return NULL; |
1070 | } | 1070 | } |
1071 | static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb) | 1071 | static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb) |
1072 | { | 1072 | { |
1073 | A_ASSERT(false); | 1073 | A_ASSERT(false); |
1074 | } | 1074 | } |