X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6bda628718f67c04ed43e8328f55bdce5319c504..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h?ds=sidebyside

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
index 6f1ea6742..8e515a5d4 100644
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -38,14 +38,12 @@
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
-		
-	/* Macros: */
-		#define BLUETOOTH_DATA_IN_PIPE         1
-		#define BLUETOOTH_DATA_OUT_PIPE        2
-		#define BLUETOOTH_EVENTS_PIPE          3
 
+		#include "../ConfigDescriptor.h"
+
+	/* Macros: */
 		#define BLUETOOTH_MAX_OPEN_CHANNELS    6
-		
+
 		#define CHANNEL_PSM_SDP                0x0001
 		#define CHANNEL_PSM_UDP                0x0002
 		#define CHANNEL_PSM_RFCOMM             0x0003
@@ -55,13 +53,13 @@
 		#define CHANNEL_PSM_HTTP               0x000C
 		#define CHANNEL_PSM_UPNP               0x0010
 		#define CHANNEL_PSM_HIDP               0x0011
-		
+
 		#define CHANNEL_SEARCH_LOCALNUMBER     0
 		#define CHANNEL_SEARCH_REMOTENUMBER    1
 		#define CHANNEL_SEARCH_PSM             2
-		
+
 		#define MAXIMUM_CHANNEL_MTU            255
-		
+
 	/* Enums: */
 		/** Enum for the possible states for a Bluetooth ACL channel. */
 		enum BT_ChannelStates_t
@@ -119,7 +117,7 @@
 			Bluetooth_Channel_t Channels[BLUETOOTH_MAX_OPEN_CHANNELS]; /**< Channel information structures for the connection. */
 			uint8_t             SignalingIdentifier; /**< Next Signaling Channel unique command sequence identifier. */
 		} Bluetooth_Connection_t;
-		
+
 		/** Local Bluetooth device information structure, for the defining of local device characteristics for the Bluetooth stack. */
 		typedef struct
 		{
@@ -127,7 +125,7 @@
 			char     PINCode[16]; /**< Pin code required to send or receive in order to authenticate with a remote device. */
 			char     Name[]; /**< Name of the local Bluetooth device, up to 248 characters. */
 		} Bluetooth_Device_t;
-		
+
 		/** Bluetooth stack state information structure, for the containment of the Bluetooth stack state. The values in
 		 *  this structure are set by the Bluetooth stack internally, and should all be treated as read only by the user
 		 *  application.
@@ -141,12 +139,12 @@
 			                        */
 			uint8_t LocalBDADDR[6]; /**< Local Bluetooth adapter's BDADDR, valid when the stack is fully initialized. */
 		} Bluetooth_Stack_State_t;
-	
+
 	/* Includes: */
 		#include "BluetoothHCICommands.h"
-		#include "BluetoothACLPackets.h"		
-		
-	/* Function Prototypes: */		
+		#include "BluetoothACLPackets.h"
+
+	/* Function Prototypes: */
 		void Bluetooth_Stack_Init(void);
 		void Bluetooth_Stack_USBTask(void);
 
@@ -173,3 +171,4 @@
 		extern Bluetooth_Stack_State_t Bluetooth_State;
 
 #endif
+