Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / Lib / RFCOMMControl.h

diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
index b527bfa..6242d51 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h
+++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.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
@@ -44,18 +44,18 @@
                #include <stdio.h>
 
                #include <LUFA/Common/Common.h>
-               #include <LUFA/Drivers/Peripheral/SerialStream.h>
+               #include <LUFA/Drivers/Peripheral/Serial.h>
 
                #include "BluetoothStack.h"
                #include "RFCOMM.h"
-               
+
        /* Macros: */
                #define RFCOMM_SIGNAL_FC               (1 << 1)
                #define RFCOMM_SIGNAL_RTC              (1 << 2)
                #define RFCOMM_SIGNAL_RTR              (1 << 3)
                #define RFCOMM_SIGNAL_IC               (1 << 6)
                #define RFCOMM_SIGNAL_DV               (1 << 7)
-               
+
                #define RFCOMM_CONFIG_REMOTESIGNALS    (1 << 0)
                #define RFCOMM_CONFIG_LOCALSIGNALS     (1 << 1)
                #define RFCOMM_CONFIG_LOCALSIGNALSSENT (1 << 2)
@@ -73,13 +73,13 @@
                        RFCOMM_Control_DLCParameterNegotiation = (0x80 >> 2),
                        RFCOMM_Control_NonSupportedCommand     = (0x10 >> 2),
                };
-       
+
        /* Type Defines: */
                typedef struct
                {
-                       unsigned char EA   : 1;
-                       unsigned char CR   : 1;
-                       unsigned char DLCI : 6;
+                       unsigned EA   : 1;
+                       unsigned CR   : 1;
+                       unsigned DLCI : 6;
                } RFCOMM_Address_t;
 
                typedef struct
@@ -90,23 +90,23 @@
 
                typedef struct
                {
-                       unsigned char EA      : 1;
-                       unsigned char CR      : 1;
-                       unsigned char Command : 6;
+                       unsigned EA      : 1;
+                       unsigned CR      : 1;
+                       unsigned Command : 6;
                } RFCOMM_Command_t;
-               
+
                typedef struct
                {
-                       uint8_t          DLCI;
-                       unsigned char    FrameType        : 4;
-                       unsigned char    ConvergenceLayer : 4;
-                       uint8_t          Priority;
-                       uint8_t          ACKTimerTicks;
-                       uint16_t         MaximumFrameSize;
-                       uint8_t          MaxRetransmissions;
-                       uint8_t          RecoveryWindowSize;                    
+                       uint8_t  DLCI;
+                       unsigned FrameType        : 4;
+                       unsigned ConvergenceLayer : 4;
+                       uint8_t  Priority;
+                       uint8_t  ACKTimerTicks;
+                       uint16_t MaximumFrameSize;
+                       uint8_t  MaxRetransmissions;
+                       uint8_t  RecoveryWindowSize;
                } RFCOMM_DPN_Parameters_t;
-               
+
                typedef struct
                {
                        RFCOMM_Address_t Channel;
@@ -120,7 +120,7 @@
 
                #if defined(INCLUDE_FROM_RFCOMM_CONTROL_C)
                        static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader,
-                                                             const uint8_t CommandDataLen, 
+                                                             const uint8_t CommandDataLen,
                                                              const uint8_t* CommandData,
                                                              Bluetooth_Channel_t* const ACLChannel);
                        static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader,
@@ -143,5 +143,6 @@
                                                             const uint8_t* CommandData,
                                                             Bluetooth_Channel_t* const ACLChannel);
                #endif
-               
+
 #endif
+