X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7f9f97c792dee6875fbca9806422bdd7d6c5a657..2a2de8fea94d2a524e988725585b17746cd30dba:/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
index 7b6b4f3ed..6682619b3 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h
@@ -35,16 +35,21 @@
 		#include <avr/io.h>
 		#include <string.h>
 		#include <stdbool.h>
+		#include <stdio.h>
 
 		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/Peripheral/SerialStream.h>
 
 		#include "BluetoothStack.h"
 		#include "BluetoothClassCodes.h"
 
 	/* Macros: */
-		#define OGF_LINK_CONTROL                               0x01
-		#define OGF_CTRLR_BASEBAND                             0x03
-		#define OGF_CTRLR_INFORMATIONAL                        0x04
+		#define BT_HCI_DEBUG(l, s, ...)                        do { if (HCI_DEBUG_LEVEL >= l) printf_P(PSTR("(HCI) " s "\r\n"), ##__VA_ARGS__); } while (0)
+		#define HCI_DEBUG_LEVEL                                0
+
+		#define OGF_LINK_CONTROL                              (0x01 << 10)
+		#define OGF_CTRLR_BASEBAND                            (0x03 << 10)
+		#define OGF_CTRLR_INFORMATIONAL                       (0x04 << 10)
 
 		#define OCF_LINK_CONTROL_INQUIRY                       0x0001
 		#define OCF_LINK_CONTROL_INQUIRY_CANCEL                0x0002
@@ -70,7 +75,8 @@
 		#define OCF_CTRLR_BASEBAND_WRITE_CLASS_OF_DEVICE       0x0024
 		#define OCF_CTRLR_BASEBAND_WRITE_SIMPLE_PAIRING_MODE   0x0056
 		#define OCF_CTRLR_BASEBAND_WRITE_AUTHENTICATION_ENABLE 0x0020
-		#define OGF_CTRLR_INFORMATIONAL_READBUFFERSIZE         0x0005
+		#define OCF_CTRLR_INFORMATIONAL_READBUFFERSIZE         0x0005
+		#define OCF_CTRLR_INFORMATIONAL_READBDADDR             0x0009
 		
 		#define EVENT_COMMAND_STATUS                           0x0F
 		#define EVENT_COMMAND_COMPLETE                         0x0E
@@ -79,47 +85,46 @@
 		#define EVENT_DISCONNECTION_COMPLETE                   0x05
 		#define EVENT_REMOTE_NAME_REQUEST_COMPLETE             0x07
 		#define EVENT_PIN_CODE_REQUEST                         0x16
+		#define EVENT_LINK_KEY_REQUEST                         0x17
 		
 		#define ERROR_LIMITED_RESOURCES                        0x0D
+		#define ERROR_UNACCEPTABLE_BDADDR                      0x0F
 		
 	/* Type Defines: */
 		typedef struct
 		{
-			struct
-			{
-				int OCF : 10;
-				int OGF : 6;
-			} OpCode;
-
+			uint16_t OpCode;
 			uint8_t  ParameterLength;
 			uint8_t  Parameters[];
-		} Bluetooth_HCICommand_Header_t;
+		} BT_HCICommand_Header_t;
 
 		typedef struct
 		{
 			uint8_t  EventCode;
 			uint8_t  ParameterLength;
-		} Bluetooth_HCIEvent_Header_t;
+		} BT_HCIEvent_Header_t;
 
 		typedef struct
 		{
-			uint8_t CommandStatus;
-			uint8_t CommandPackets;
-
-			struct
-			{
-				int OCF : 10;
-				int OGF : 6;
-			} OpCode;
-		} Bluetooth_HCIEvent_CommandStatus_Header_t;
+			uint8_t  Status;
+			uint8_t  Packets;
+			uint16_t OpCode;
+		} BT_HCIEvent_CommandStatus_t;
 		
 		typedef struct
 		{
+			uint8_t  HCIPacketsAllowable;
+			uint16_t Opcode;
+			uint8_t  ReturnParams[];
+		} BT_HCIEvent_CommandComplete_t;
+
+		typedef struct
+		{
 			uint8_t  RemoteAddress[6];
 			uint8_t  ClassOfDevice_Service;
 			uint16_t ClassOfDevice_MajorMinor;
 			uint8_t  LinkType;
-		} Bluetooth_HCIEvent_ConnectionRequest_Header_t;
+		} BT_HCIEvent_ConnectionRequest_t;
 
 		typedef struct
 		{
@@ -128,63 +133,74 @@
 			uint8_t  RemoteAddress[6];
 			uint8_t  LinkType;
 			uint8_t  EncryptionEnabled;
-		} Bluetooth_HCIEvent_ConnectionComplete_Header_t;
+		} BT_HCIEvent_ConnectionComplete_t;
 		
 		typedef struct
 		{
 			uint8_t  RemoteAddress[6];
-			uint8_t  SlaveRole;
-		} Bluetooth_HCICommand_AcceptConnectionRequest_Params_t;
-		
+		} BT_HCIEvent_PinCodeReq_t;
+
 		typedef struct
 		{
 			uint8_t  RemoteAddress[6];
-			uint8_t  Reason;
-		} Bluetooth_HCICommand_RejectConnectionRequest_Params_t;
+		} BT_HCIEvent_LinkKeyReq_t;
+				
+		typedef struct
+		{
+			uint8_t  RemoteAddress[6];
+		} BT_HCICommand_LinkKeyNAKResp_t;
 
 		typedef struct
 		{
 			uint8_t  RemoteAddress[6];
 			uint8_t  PINCodeLength;
 			char     PINCode[16];
-		} Bluetooth_HCICommand_PinCodeResponse_Params_t;
+		} BT_HCICommand_PinCodeResp_t;
 		
+		typedef struct
+		{
+			uint8_t  RemoteAddress[6];
+			uint8_t  SlaveRole;
+		} BT_HCICommand_AcceptConnectionReq_t;
+		
+		typedef struct
+		{
+			uint8_t  RemoteAddress[6];
+			uint8_t  Reason;
+		} BT_HCICommand_RejectConnectionReq_t;		
+
 	/* Enums: */
-		enum Bluetooth_ScanEnable_Modes_t
+		enum BT_ScanEnable_Modes_t
 		{
-			NoScansEnabled            = 0,
-			InquiryScanOnly           = 1,
-			PageScanOnly              = 2,
-			InquiryAndPageScans       = 3,
+			BT_SCANMODE_NoScansEnabled       = 0,
+			BT_SCANMODE_InquiryScanOnly      = 1,
+			BT_SCANMODE_PageScanOnly         = 2,
+			BT_SCANMODE_InquiryAndPageScans  = 3,
 		};
 
-		enum BluetoothStack_States_t
+		enum BT_HCIStates_t
 		{
-			Bluetooth_Init                            = 0,
-			Bluetooth_Init_Reset                      = 1,
-			Bluetooth_Init_ReadBufferSize             = 2,
-			Bluetooth_Init_SetEventMask               = 3,
-			Bluetooth_Init_SetLocalName               = 4,
-			Bluetooth_Init_SetDeviceClass             = 5,
-			Bluetooth_Init_WriteScanEnable            = 6,
-			Bluetooth_PrepareToProcessEvents          = 7,
-			Bluetooth_ProcessEvents                   = 8,
-			Bluetooth_Conn_AcceptConnection           = 9,
-			Bluetooth_Conn_RejectConnection           = 10,
-			Bluetooth_Conn_SendPINCode                = 11,
+			Bluetooth_ProcessEvents          = 0,
+			Bluetooth_Init                   = 1,
+			Bluetooth_Init_Reset             = 2,
+			Bluetooth_Init_ReadBufferSize    = 3,
+			Bluetooth_Init_GetBDADDR         = 4,
+			Bluetooth_Init_SetLocalName      = 5,
+			Bluetooth_Init_SetDeviceClass    = 6,
+			Bluetooth_Init_WriteScanEnable   = 7,
+			Bluetooth_Init_FinalizeInit      = 8,
+			Bluetooth_Conn_AcceptConnection  = 9,
+			Bluetooth_Conn_RejectConnection  = 10,
+			Bluetooth_Conn_SendPINCode       = 11,
+			Bluetooth_Conn_SendLinkKeyNAK    = 12,
 		};
 		
-	/* External Variables: */
-		extern uint8_t Bluetooth_HCIProcessingState;
-
 	/* Function Prototypes: */
-		void Bluetooth_ProcessHCICommands(void);
-
+		void Bluetooth_HCITask(void);
+			
 		#if defined(INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C)
-			static uint8_t Bluetooth_SendHCICommand(void* Parameters, uint8_t ParamLength);
-			static bool    Bluetooth_GetNextHCIEventHeader(void);
-			static void    Bluetooth_DiscardRemainingHCIEventParameters(void);
-			static void    Bluetooth_ProcessHCICommands(void);
+			static uint8_t Bluetooth_SendHCICommand(const BT_HCICommand_Header_t* const HCICommandHeader, const void* Parameters,
+			                                        const uint16_t ParameterLength);
 		#endif
 		
 #endif