Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9478eaf authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

ath6kl: remove-typedef HCI_TRANSPORT_CONFIG_INFO 



remove-typedef -s HCI_TRANSPORT_CONFIG_INFO \
	"struct hci_transport_config_info" drivers/staging/ath6kl/

Tested-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ed8b361d

drivers/staging/ath6kl/htc2/AR6000/ar6k.h

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static INLINE int DevSetupGMbox(struct ar6k_device *pDev) { 
#ifdef ATH_AR6K_ENABLE_GMBOX



    /* GMBOX protocol modules must expose each of these internal APIs */

HCI_TRANSPORT_HANDLE GMboxAttachProtocol(struct ar6k_device *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo);

HCI_TRANSPORT_HANDLE GMboxAttachProtocol(struct ar6k_device *pDev, struct hci_transport_config_info *pInfo);

int             GMboxProtocolInstall(struct ar6k_device *pDev);

void                 GMboxProtocolUninstall(struct ar6k_device *pDev);

drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define BTPWRSAV_TIMEOUT_MS       1  



struct gmbox_proto_hci_uart {

    HCI_TRANSPORT_CONFIG_INFO   HCIConfig;

    struct hci_transport_config_info   HCIConfig;

    bool                      HCIAttached;

    bool                      HCIStopped;

    u32 RecvStateFlags;
@@ -936,7 +936,7 @@ static int NotifyTransportReady(struct gmbox_proto_hci_uart *pProt) 


/***********  HCI UART protocol implementation ************************************************/



HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo)

HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, struct hci_transport_config_info *pInfo)

{

    struct gmbox_proto_hci_uart  *pProtocol = NULL; 

    struct ar6k_device           *pDev;
@@ -961,7 +961,7 @@ HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_I 
            break;    

        }

        

        memcpy(&pProtocol->HCIConfig, pInfo, sizeof(HCI_TRANSPORT_CONFIG_INFO));

        memcpy(&pProtocol->HCIConfig, pInfo, sizeof(struct hci_transport_config_info));

        

        A_ASSERT(pProtocol->HCIConfig.pHCIPktRecv != NULL);

        A_ASSERT(pProtocol->HCIConfig.pHCISendComplete != NULL);

drivers/staging/ath6kl/include/hci_transport_api.h

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ typedef struct { 
    int    IOBlockPad;    /* I/O block padding required (always a power of 2) */

} HCI_TRANSPORT_PROPERTIES;



typedef struct _HCI_TRANSPORT_CONFIG_INFO {

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 */
@@ -99,7 +99,7 @@ typedef struct _HCI_TRANSPORT_CONFIG_INFO { 
    HCI_TRANSPORT_RECV_REFILL          pHCIPktRecvRefill;

    HCI_TRANSPORT_RECV_ALLOC           pHCIPktRecvAlloc;

    HCI_TRANSPORT_SEND_FULL            pHCISendFull;

} HCI_TRANSPORT_CONFIG_INFO;

};



/* ------ Function Prototypes ------ */

/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -113,7 +113,7 @@ typedef struct _HCI_TRANSPORT_CONFIG_INFO { 
  @example:

  @see also: HCI_TransportDetach

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/

HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo);

HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, struct hci_transport_config_info *pInfo);



/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

  @desc: Detach from the HCI transport module

drivers/staging/ath6kl/os/linux/export_hci_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "AR6002/hw4.0/hw/uart_reg.h"

#include "AR6002/hw4.0/hw/rtc_wlan_reg.h"



HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo);

HCI_TRANSPORT_HANDLE (*_HCI_TransportAttach)(void *HTCHandle, struct hci_transport_config_info *pInfo);

void (*_HCI_TransportDetach)(HCI_TRANSPORT_HANDLE HciTrans);

int    (*_HCI_TransportAddReceivePkts)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET_QUEUE *pQueue);

int    (*_HCI_TransportSendPkt)(HCI_TRANSPORT_HANDLE HciTrans, HTC_PACKET *pPacket, bool Synchronous);

drivers/staging/ath6kl/os/linux/hci_bridge.c

+2 −2
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ int ar6000_setup_hci(void *ar) 
int ar6000_setup_hci(AR_SOFTC_T *ar)

#endif

{

    HCI_TRANSPORT_CONFIG_INFO config;

    struct hci_transport_config_info config;

    int                  status = 0;

    int                       i;

    HTC_PACKET                *pPacket;
@@ -521,7 +521,7 @@ int ar6000_setup_hci(AR_SOFTC_T *ar) 
            FreeHTCStruct(pHcidevInfo,pPacket);                

        }

        

        A_MEMZERO(&config,sizeof(HCI_TRANSPORT_CONFIG_INFO));        

        A_MEMZERO(&config,sizeof(struct hci_transport_config_info));        

        config.ACLRecvBufferWaterMark = MAX_ACL_RECV_BUFS / 2;

        config.EventRecvBufferWaterMark = MAX_EVT_RECV_BUFS / 2;

        config.MaxSendQueueDepth = MAX_HCI_WRITE_QUEUE_DEPTH;