diff options
-rw-r--r-- | drivers/staging/ath6kl/include/ar3kconfig.h | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 20 | ||||
-rw-r--r-- | drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 | ||||
-rw-r--r-- | drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 6 |
6 files changed, 30 insertions, 30 deletions
diff --git a/drivers/staging/ath6kl/include/ar3kconfig.h b/drivers/staging/ath6kl/include/ar3kconfig.h index 4d732019cf2..20d295ba0da 100644 --- a/drivers/staging/ath6kl/include/ar3kconfig.h +++ b/drivers/staging/ath6kl/include/ar3kconfig.h | |||
@@ -38,7 +38,7 @@ extern "C" { | |||
38 | #define AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP (1 << 3) | 38 | #define AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP (1 << 3) |
39 | 39 | ||
40 | 40 | ||
41 | typedef struct { | 41 | struct ar3k_config_info { |
42 | u32 Flags; /* config flags */ | 42 | u32 Flags; /* config flags */ |
43 | void *pHCIDev; /* HCI bridge device */ | 43 | void *pHCIDev; /* HCI bridge device */ |
44 | HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */ | 44 | HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */ |
@@ -52,9 +52,9 @@ typedef struct { | |||
52 | u16 IdleTimeout; /* TLPM idle timeout */ | 52 | u16 IdleTimeout; /* TLPM idle timeout */ |
53 | u16 WakeupTimeout; /* TLPM wakeup timeout */ | 53 | u16 WakeupTimeout; /* TLPM wakeup timeout */ |
54 | u8 bdaddr[6]; /* Bluetooth device address */ | 54 | u8 bdaddr[6]; /* Bluetooth device address */ |
55 | } AR3K_CONFIG_INFO; | 55 | }; |
56 | 56 | ||
57 | int AR3KConfigure(AR3K_CONFIG_INFO *pConfigInfo); | 57 | int AR3KConfigure(struct ar3k_config_info *pConfigInfo); |
58 | 58 | ||
59 | int AR3KConfigureExit(void *config); | 59 | int AR3KConfigureExit(void *config); |
60 | 60 | ||
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c index 005b3ba23b4..3e9c95ea4eb 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c | |||
@@ -47,9 +47,9 @@ | |||
47 | #define HCI_MAX_EVT_RECV_LENGTH 257 | 47 | #define HCI_MAX_EVT_RECV_LENGTH 257 |
48 | #define EXIT_MIN_BOOT_COMMAND_STATUS_OFFSET 5 | 48 | #define EXIT_MIN_BOOT_COMMAND_STATUS_OFFSET 5 |
49 | 49 | ||
50 | int AthPSInitialize(AR3K_CONFIG_INFO *hdev); | 50 | int AthPSInitialize(struct ar3k_config_info *hdev); |
51 | 51 | ||
52 | static int SendHCICommand(AR3K_CONFIG_INFO *pConfig, | 52 | static int SendHCICommand(struct ar3k_config_info *pConfig, |
53 | u8 *pBuffer, | 53 | u8 *pBuffer, |
54 | int Length) | 54 | int Length) |
55 | { | 55 | { |
@@ -84,7 +84,7 @@ static int SendHCICommand(AR3K_CONFIG_INFO *pConfig, | |||
84 | return status; | 84 | return status; |
85 | } | 85 | } |
86 | 86 | ||
87 | static int RecvHCIEvent(AR3K_CONFIG_INFO *pConfig, | 87 | static int RecvHCIEvent(struct ar3k_config_info *pConfig, |
88 | u8 *pBuffer, | 88 | u8 *pBuffer, |
89 | int *pLength) | 89 | int *pLength) |
90 | { | 90 | { |
@@ -122,7 +122,7 @@ static int RecvHCIEvent(AR3K_CONFIG_INFO *pConfig, | |||
122 | return status; | 122 | return status; |
123 | } | 123 | } |
124 | 124 | ||
125 | int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, | 125 | int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig, |
126 | u8 *pHCICommand, | 126 | u8 *pHCICommand, |
127 | int CmdLength, | 127 | int CmdLength, |
128 | u8 **ppEventBuffer, | 128 | u8 **ppEventBuffer, |
@@ -209,7 +209,7 @@ int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, | |||
209 | return status; | 209 | return status; |
210 | } | 210 | } |
211 | 211 | ||
212 | static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig) | 212 | static int AR3KConfigureHCIBaud(struct ar3k_config_info *pConfig) |
213 | { | 213 | { |
214 | int status = 0; | 214 | int status = 0; |
215 | u8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0}; | 215 | u8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0}; |
@@ -274,7 +274,7 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig) | |||
274 | return status; | 274 | return status; |
275 | } | 275 | } |
276 | 276 | ||
277 | static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig) | 277 | static int AR3KExitMinBoot(struct ar3k_config_info *pConfig) |
278 | { | 278 | { |
279 | int status; | 279 | int status; |
280 | char exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00, | 280 | char exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00, |
@@ -310,7 +310,7 @@ static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig) | |||
310 | return status; | 310 | return status; |
311 | } | 311 | } |
312 | 312 | ||
313 | static int AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig) | 313 | static int AR3KConfigureSendHCIReset(struct ar3k_config_info *pConfig) |
314 | { | 314 | { |
315 | int status = 0; | 315 | int status = 0; |
316 | u8 hciResetCommand[] = {0x03,0x0c,0x0}; | 316 | u8 hciResetCommand[] = {0x03,0x0c,0x0}; |
@@ -334,7 +334,7 @@ static int AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig) | |||
334 | return status; | 334 | return status; |
335 | } | 335 | } |
336 | 336 | ||
337 | static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) | 337 | static int AR3KEnableTLPM(struct ar3k_config_info *pConfig) |
338 | { | 338 | { |
339 | int status; | 339 | int status; |
340 | /* AR3K vendor specific command for Host Wakeup Config */ | 340 | /* AR3K vendor specific command for Host Wakeup Config */ |
@@ -453,7 +453,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig) | |||
453 | return status; | 453 | return status; |
454 | } | 454 | } |
455 | 455 | ||
456 | int AR3KConfigure(AR3K_CONFIG_INFO *pConfig) | 456 | int AR3KConfigure(struct ar3k_config_info *pConfig) |
457 | { | 457 | { |
458 | int status = 0; | 458 | int status = 0; |
459 | 459 | ||
@@ -524,7 +524,7 @@ int AR3KConfigure(AR3K_CONFIG_INFO *pConfig) | |||
524 | int AR3KConfigureExit(void *config) | 524 | int AR3KConfigureExit(void *config) |
525 | { | 525 | { |
526 | int status = 0; | 526 | int status = 0; |
527 | AR3K_CONFIG_INFO *pConfig = (AR3K_CONFIG_INFO *)config; | 527 | struct ar3k_config_info *pConfig = (struct ar3k_config_info *)config; |
528 | 528 | ||
529 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Cleaning up AR3K ...\n")); | 529 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Cleaning up AR3K ...\n")); |
530 | 530 | ||
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c index 3dce6f5e239..3436cbdf59b 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | |||
@@ -43,10 +43,10 @@ typedef struct { | |||
43 | 43 | ||
44 | PSCmdPacket *HciCmdList; | 44 | PSCmdPacket *HciCmdList; |
45 | u32 num_packets; | 45 | u32 num_packets; |
46 | AR3K_CONFIG_INFO *dev; | 46 | struct ar3k_config_info *dev; |
47 | }HciCommandListParam; | 47 | }HciCommandListParam; |
48 | 48 | ||
49 | int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, | 49 | int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig, |
50 | u8 *pHCICommand, | 50 | u8 *pHCICommand, |
51 | int CmdLength, | 51 | int CmdLength, |
52 | u8 **ppEventBuffer, | 52 | u8 **ppEventBuffer, |
@@ -56,8 +56,8 @@ u32 Rom_Version; | |||
56 | u32 Build_Version; | 56 | u32 Build_Version; |
57 | extern bool BDADDR; | 57 | extern bool BDADDR; |
58 | 58 | ||
59 | int getDeviceType(AR3K_CONFIG_INFO *pConfig, u32 *code); | 59 | int getDeviceType(struct ar3k_config_info *pConfig, u32 *code); |
60 | int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig); | 60 | int ReadVersionInfo(struct ar3k_config_info *pConfig); |
61 | #ifndef HCI_TRANSPORT_SDIO | 61 | #ifndef HCI_TRANSPORT_SDIO |
62 | 62 | ||
63 | DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent); | 63 | DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent); |
@@ -70,7 +70,7 @@ int PSHciWritepacket(struct hci_dev*,u8* Data, u32 len); | |||
70 | extern char *bdaddr; | 70 | extern char *bdaddr; |
71 | #endif /* HCI_TRANSPORT_SDIO */ | 71 | #endif /* HCI_TRANSPORT_SDIO */ |
72 | 72 | ||
73 | int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type); | 73 | int write_bdaddr(struct ar3k_config_info *pConfig,u8 *bdaddr,int type); |
74 | 74 | ||
75 | int PSSendOps(void *arg); | 75 | int PSSendOps(void *arg); |
76 | 76 | ||
@@ -91,7 +91,7 @@ void Hci_log(u8 * log_string,u8 *data,u32 len) | |||
91 | 91 | ||
92 | 92 | ||
93 | 93 | ||
94 | int AthPSInitialize(AR3K_CONFIG_INFO *hdev) | 94 | int AthPSInitialize(struct ar3k_config_info *hdev) |
95 | { | 95 | { |
96 | int status = 0; | 96 | int status = 0; |
97 | if(hdev == NULL) { | 97 | if(hdev == NULL) { |
@@ -147,7 +147,7 @@ int PSSendOps(void *arg) | |||
147 | u8 *path = NULL; | 147 | u8 *path = NULL; |
148 | u8 *config_path = NULL; | 148 | u8 *config_path = NULL; |
149 | u8 config_bdaddr[MAX_BDADDR_FORMAT_LENGTH]; | 149 | u8 config_bdaddr[MAX_BDADDR_FORMAT_LENGTH]; |
150 | AR3K_CONFIG_INFO *hdev = (AR3K_CONFIG_INFO*)arg; | 150 | struct ar3k_config_info *hdev = (struct ar3k_config_info*)arg; |
151 | struct device *firmwareDev = NULL; | 151 | struct device *firmwareDev = NULL; |
152 | status = 0; | 152 | status = 0; |
153 | HciCmdList = NULL; | 153 | HciCmdList = NULL; |
@@ -389,7 +389,7 @@ complete: | |||
389 | * with a HCI Command Complete event. | 389 | * with a HCI Command Complete event. |
390 | * For HCI SDIO transport, this will be internally defined. | 390 | * For HCI SDIO transport, this will be internally defined. |
391 | */ | 391 | */ |
392 | int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig, | 392 | int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig, |
393 | u8 *pHCICommand, | 393 | u8 *pHCICommand, |
394 | int CmdLength, | 394 | int CmdLength, |
395 | u8 **ppEventBuffer, | 395 | u8 **ppEventBuffer, |
@@ -481,7 +481,7 @@ int str2ba(unsigned char *str_bdaddr,unsigned char *bdaddr) | |||
481 | return 0; | 481 | return 0; |
482 | } | 482 | } |
483 | 483 | ||
484 | int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type) | 484 | int write_bdaddr(struct ar3k_config_info *pConfig,u8 *bdaddr,int type) |
485 | { | 485 | { |
486 | u8 bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, | 486 | u8 bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, |
487 | 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; | 487 | 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; |
@@ -516,7 +516,7 @@ int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type) | |||
516 | return result; | 516 | return result; |
517 | 517 | ||
518 | } | 518 | } |
519 | int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig) | 519 | int ReadVersionInfo(struct ar3k_config_info *pConfig) |
520 | { | 520 | { |
521 | u8 hciCommand[] = {0x1E,0xfc,0x00}; | 521 | u8 hciCommand[] = {0x1E,0xfc,0x00}; |
522 | u8 *event; | 522 | u8 *event; |
@@ -531,7 +531,7 @@ int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig) | |||
531 | } | 531 | } |
532 | return result; | 532 | return result; |
533 | } | 533 | } |
534 | int getDeviceType(AR3K_CONFIG_INFO *pConfig, u32 *code) | 534 | int getDeviceType(struct ar3k_config_info *pConfig, u32 *code) |
535 | { | 535 | { |
536 | u8 hciCommand[] = {0x05,0xfc,0x05,0x00,0x00,0x00,0x00,0x04}; | 536 | u8 hciCommand[] = {0x05,0xfc,0x05,0x00,0x00,0x00,0x00,0x04}; |
537 | u8 *event; | 537 | u8 *event; |
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h index b97d91f15f3..d4435130780 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | |||
@@ -64,12 +64,12 @@ | |||
64 | 64 | ||
65 | 65 | ||
66 | #ifndef HCI_TRANSPORT_SDIO | 66 | #ifndef HCI_TRANSPORT_SDIO |
67 | #define AR3K_CONFIG_INFO struct hci_dev | 67 | #define struct ar3k_config_info struct hci_dev |
68 | extern wait_queue_head_t HciEvent; | 68 | extern wait_queue_head_t HciEvent; |
69 | extern wait_queue_t Eventwait; | 69 | extern wait_queue_t Eventwait; |
70 | extern u8 *HciEventpacket; | 70 | extern u8 *HciEventpacket; |
71 | #endif /* #ifndef HCI_TRANSPORT_SDIO */ | 71 | #endif /* #ifndef HCI_TRANSPORT_SDIO */ |
72 | 72 | ||
73 | int AthPSInitialize(AR3K_CONFIG_INFO *hdev); | 73 | int AthPSInitialize(struct ar3k_config_info *hdev); |
74 | int ReadPSEvent(u8* Data); | 74 | int ReadPSEvent(u8* Data); |
75 | #endif /* __AR3KPSCONFIG_H */ | 75 | #endif /* __AR3KPSCONFIG_H */ |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index f8d8999b90e..3397995b1c3 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -2011,7 +2011,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs) | |||
2011 | #else | 2011 | #else |
2012 | // FIXME: workaround to reset BT's UART baud rate to default | 2012 | // FIXME: workaround to reset BT's UART baud rate to default |
2013 | if (NULL != ar->exitCallback) { | 2013 | if (NULL != ar->exitCallback) { |
2014 | AR3K_CONFIG_INFO ar3kconfig; | 2014 | struct ar3k_config_info ar3kconfig; |
2015 | int status; | 2015 | int status; |
2016 | 2016 | ||
2017 | A_MEMZERO(&ar3kconfig,sizeof(ar3kconfig)); | 2017 | A_MEMZERO(&ar3kconfig,sizeof(ar3kconfig)); |
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index db38bbfb2a2..ee52d119531 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c | |||
@@ -100,7 +100,7 @@ typedef struct { | |||
100 | #define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0])) | 100 | #define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0])) |
101 | 101 | ||
102 | extern unsigned int setupbtdev; | 102 | extern unsigned int setupbtdev; |
103 | 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 | AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo; |
@@ -222,7 +222,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle, | |||
222 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext; | 222 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (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 | // AR3K_CONFIG_INFO ar3kconfig; | 225 | // struct ar3k_config_info ar3kconfig; |
226 | 226 | ||
227 | pHcidevInfo->pHCIDev = HCIHandle; | 227 | pHcidevInfo->pHCIDev = HCIHandle; |
228 | 228 | ||
@@ -667,7 +667,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb) | |||
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 | AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info; |
670 | AR3K_CONFIG_INFO *config = (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; |
673 | config->pHCIProps = &pHcidevInfo->HCIProps; | 673 | config->pHCIProps = &pHcidevInfo->HCIProps; |