Update code and StaticAnlysisTest so that missingInclude warnings do not have to...

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / Lib / BluetoothACLPackets.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
index 81806e4..a02a66b 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -127,8 +127,8 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        }
 
        /* Read in the received ACL packet headers when it has been discovered that a packet has been received */
        }
 
        /* Read in the received ACL packet headers when it has been discovered that a packet has been received */

-       Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader));
-       Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader));
+       Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader), NULL);
+       Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader), NULL);

 
        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Received");
 
        BT_ACL_DEBUG(2, "");
        BT_ACL_DEBUG(2, "Packet Received");


@@ -142,7 +142,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        {
                /* Read in the Signal Command header of the incoming packet */
                BT_Signal_Header_t SignalCommandHeader;
        {
                /* Read in the Signal Command header of the incoming packet */
                BT_Signal_Header_t SignalCommandHeader;

-               Pipe_Read_Stream_LE(&SignalCommandHeader, sizeof(SignalCommandHeader));
+               Pipe_Read_Stream_LE(&SignalCommandHeader, sizeof(SignalCommandHeader), NULL);

 
                /* Dispatch to the appropriate handler function based on the Signal message code */
                switch (SignalCommandHeader.Code)
 
                /* Dispatch to the appropriate handler function based on the Signal message code */
                switch (SignalCommandHeader.Code)


@@ -175,8 +175,8 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
                                BT_ACL_DEBUG(1, "<< Command Reject");
 
                                uint16_t RejectReason;
                                BT_ACL_DEBUG(1, "<< Command Reject");
 
                                uint16_t RejectReason;

-                               Pipe_Read_Stream_LE(&RejectReason, sizeof(RejectReason));
-                               Pipe_Discard_Stream(ACLPacketHeader.DataLength - sizeof(RejectReason));
+                               Pipe_Read_Stream_LE(&RejectReason, sizeof(RejectReason), NULL);
+                               Pipe_Discard_Stream(ACLPacketHeader.DataLength - sizeof(RejectReason), NULL);

                                Pipe_ClearIN();
                                Pipe_Freeze();
 
                                Pipe_ClearIN();
                                Pipe_Freeze();
 


@@ -185,7 +185,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
 
                        default:
                                BT_ACL_DEBUG(1, "<< Unknown Signaling Command 0x%02X", SignalCommandHeader.Code);
 

-                               Pipe_Discard_Stream(ACLPacketHeader.DataLength);
+                               Pipe_Discard_Stream(ACLPacketHeader.DataLength, NULL);

                                Pipe_ClearIN();
                                Pipe_Freeze();
                                break;
                                Pipe_ClearIN();
                                Pipe_Freeze();
                                break;


@@ -195,7 +195,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
        {
                /* Non-signaling packet received, read in the packet contents and pass to the user application */
                uint8_t PacketData[DataHeader.PayloadLength];
        {
                /* Non-signaling packet received, read in the packet contents and pass to the user application */
                uint8_t PacketData[DataHeader.PayloadLength];

-               Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength);
+               Pipe_Read_Stream_LE(PacketData, DataHeader.PayloadLength, NULL);

                Pipe_ClearIN();
                Pipe_Freeze();
 
                Pipe_ClearIN();
                Pipe_Freeze();
 


@@ -207,7 +207,7 @@ static void Bluetooth_ProcessIncomingACLPackets(void)
 /** Retrieves the channel information structure with the given local or remote channel number from the channel list.
  *
  *  \param[in] SearchValue  Value to search for in the channel structure list
 /** Retrieves the channel information structure with the given local or remote channel number from the channel list.
  *
  *  \param[in] SearchValue  Value to search for in the channel structure list

- *  \param[in] SearchKey    Key to search within the channel structure, a CHANNEL_SEARCH_* mask
+ *  \param[in] SearchKey    Key to search within the channel structure, a \c CHANNEL_SEARCH_* mask

  *
  *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise
  */
  *
  *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise
  */


@@ -281,9 +281,9 @@ uint8_t Bluetooth_SendPacket(void* Data,
        Pipe_Unfreeze();
 
        /* Write the packet contents to the pipe so that it can be sent to the remote device */
        Pipe_Unfreeze();
 
        /* Write the packet contents to the pipe so that it can be sent to the remote device */

-       Pipe_Write_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader));
-       Pipe_Write_Stream_LE(&DataHeader, sizeof(DataHeader));
-       Pipe_Write_Stream_LE(Data, DataLen);
+       Pipe_Write_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader), NULL);
+       Pipe_Write_Stream_LE(&DataHeader, sizeof(DataHeader), NULL);
+       Pipe_Write_Stream_LE(Data, DataLen, NULL);

        Pipe_ClearOUT();
 
        Pipe_Freeze();
        Pipe_ClearOUT();
 
        Pipe_Freeze();


@@ -410,7 +410,7 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
 {
        BT_Signal_ConnectionReq_t ConnectionRequest;
 
 {
        BT_Signal_ConnectionReq_t ConnectionRequest;
 

-       Pipe_Read_Stream_LE(&ConnectionRequest, sizeof(ConnectionRequest));
+       Pipe_Read_Stream_LE(&ConnectionRequest, sizeof(ConnectionRequest), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -473,8 +473,8 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons
        ResponsePacket.SignalCommandHeader.Length            = sizeof(ResponsePacket.ConnectionResponse);
 
        /* Fill out the Connection Response in the response packet */
        ResponsePacket.SignalCommandHeader.Length            = sizeof(ResponsePacket.ConnectionResponse);
 
        /* Fill out the Connection Response in the response packet */

-       ResponsePacket.ConnectionResponse.DestinationChannel = ChannelData->LocalNumber;
-       ResponsePacket.ConnectionResponse.SourceChannel      = ChannelData->RemoteNumber;
+       ResponsePacket.ConnectionResponse.DestinationChannel = (ChannelData != NULL) ? ChannelData->LocalNumber  : 0;
+       ResponsePacket.ConnectionResponse.SourceChannel      = (ChannelData != NULL) ? ChannelData->RemoteNumber : 0;

        ResponsePacket.ConnectionResponse.Result             = ChannelStatus;
        ResponsePacket.ConnectionResponse.Status             = 0x00;
 
        ResponsePacket.ConnectionResponse.Result             = ChannelStatus;
        ResponsePacket.ConnectionResponse.Status             = 0x00;
 


@@ -494,7 +494,7 @@ static inline void Bluetooth_Signal_ConnectionResp(const BT_Signal_Header_t* con
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;
 
 {
        BT_Signal_ConnectionResp_t ConnectionResponse;
 

-       Pipe_Read_Stream_LE(&ConnectionResponse, sizeof(ConnectionResponse));
+       Pipe_Read_Stream_LE(&ConnectionResponse, sizeof(ConnectionResponse), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -529,8 +529,8 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
        uint8_t OptionsLen = (SignalCommandHeader->Length - sizeof(ConfigurationRequest));
        uint8_t Options[OptionsLen];
 
        uint8_t OptionsLen = (SignalCommandHeader->Length - sizeof(ConfigurationRequest));
        uint8_t Options[OptionsLen];
 

-       Pipe_Read_Stream_LE(&ConfigurationRequest, sizeof(ConfigurationRequest));
-       Pipe_Read_Stream_LE(&Options, sizeof(Options));
+       Pipe_Read_Stream_LE(&ConfigurationRequest, sizeof(ConfigurationRequest), NULL);
+       Pipe_Read_Stream_LE(&Options, sizeof(Options), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -576,7 +576,7 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c
        ResponsePacket.SignalCommandHeader.Length            = sizeof(ResponsePacket.ConfigurationResponse);
 
        /* Fill out the Configuration Response in the response packet */
        ResponsePacket.SignalCommandHeader.Length            = sizeof(ResponsePacket.ConfigurationResponse);
 
        /* Fill out the Configuration Response in the response packet */

-       ResponsePacket.ConfigurationResponse.SourceChannel   = ChannelData->RemoteNumber;
+       ResponsePacket.ConfigurationResponse.SourceChannel   = (ChannelData != NULL) ? ChannelData->RemoteNumber   : 0;

        ResponsePacket.ConfigurationResponse.Flags           = 0x00;
        ResponsePacket.ConfigurationResponse.Result          = (ChannelData != NULL) ? BT_CONFIGURATION_SUCCESSFUL : BT_CONFIGURATION_REJECTED;
 
        ResponsePacket.ConfigurationResponse.Flags           = 0x00;
        ResponsePacket.ConfigurationResponse.Result          = (ChannelData != NULL) ? BT_CONFIGURATION_SUCCESSFUL : BT_CONFIGURATION_REJECTED;
 


@@ -612,7 +612,7 @@ static inline void Bluetooth_Signal_ConfigurationResp(const BT_Signal_Header_t*
 {
        BT_Signal_ConfigurationResp_t ConfigurationResponse;
 
 {
        BT_Signal_ConfigurationResp_t ConfigurationResponse;
 

-       Pipe_Read_Stream_LE(&ConfigurationResponse, sizeof(ConfigurationResponse));
+       Pipe_Read_Stream_LE(&ConfigurationResponse, sizeof(ConfigurationResponse), NULL);

 
        Pipe_ClearIN();
        Pipe_Freeze();
 
        Pipe_ClearIN();
        Pipe_Freeze();


@@ -657,7 +657,7 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c
 {
        BT_Signal_DisconnectionReq_t DisconnectionRequest;
 
 {
        BT_Signal_DisconnectionReq_t DisconnectionRequest;
 

-       Pipe_Read_Stream_LE(&DisconnectionRequest, sizeof(DisconnectionRequest));
+       Pipe_Read_Stream_LE(&DisconnectionRequest, sizeof(DisconnectionRequest), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Request");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionRequest.DestinationChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Request");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionRequest.DestinationChannel);


@@ -681,8 +681,8 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c
        ResponsePacket.SignalCommandHeader.Length               = sizeof(ResponsePacket.DisconnectionResponse);
 
        /* Fill out the Disconnection Response in the response packet */
        ResponsePacket.SignalCommandHeader.Length               = sizeof(ResponsePacket.DisconnectionResponse);
 
        /* Fill out the Disconnection Response in the response packet */

-       ResponsePacket.DisconnectionResponse.DestinationChannel = ChannelData->RemoteNumber;
-       ResponsePacket.DisconnectionResponse.SourceChannel      = ChannelData->LocalNumber;
+       ResponsePacket.DisconnectionResponse.DestinationChannel = (ChannelData != NULL) ? ChannelData->RemoteNumber : 0;
+       ResponsePacket.DisconnectionResponse.SourceChannel      = (ChannelData != NULL) ? ChannelData->LocalNumber  : 0;

 
        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 
 
        Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL);
 


@@ -703,7 +703,7 @@ static inline void Bluetooth_Signal_DisconnectionResp(const BT_Signal_Header_t*
 {
        BT_Signal_DisconnectionResp_t DisconnectionResponse;
 
 {
        BT_Signal_DisconnectionResp_t DisconnectionResponse;
 

-       Pipe_Read_Stream_LE(&DisconnectionResponse, sizeof(DisconnectionResponse));
+       Pipe_Read_Stream_LE(&DisconnectionResponse, sizeof(DisconnectionResponse), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionResponse.DestinationChannel);
 
        BT_ACL_DEBUG(1, "<< L2CAP Disconnection Response");
        BT_ACL_DEBUG(2, "-- Destination Channel: 0x%04X", DisconnectionResponse.DestinationChannel);


@@ -754,7 +754,7 @@ static inline void Bluetooth_Signal_InformationReq(const BT_Signal_Header_t* con
 {
        BT_Signal_InformationReq_t InformationRequest;
 
 {
        BT_Signal_InformationReq_t InformationRequest;
 

-       Pipe_Read_Stream_LE(&InformationRequest, sizeof(InformationRequest));
+       Pipe_Read_Stream_LE(&InformationRequest, sizeof(InformationRequest), NULL);

 
        BT_ACL_DEBUG(1, "<< L2CAP Information Request");
        BT_ACL_DEBUG(2, "-- Info Type: 0x%04X", InformationRequest.InfoType);
 
        BT_ACL_DEBUG(1, "<< L2CAP Information Request");
        BT_ACL_DEBUG(2, "-- Info Type: 0x%04X", InformationRequest.InfoType);