From 4d3a594f3e26447ba223ac58292c9a77480ceed3 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 14 Jun 2009 07:44:02 +0000 Subject: Changed per-device controller preprocessor checks over to per-device series for better device control. Fixed error in Endpoint.c using HSOFI rather than SOFI for counting elapsed milliseconds. --- Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c | 12 +++++++++--- Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h | 1 + Demos/Host/Incomplete/BluetoothHost/makefile | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'Demos/Host') diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c index d5af8d105..7697f88f5 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c @@ -34,6 +34,7 @@ void Bluetooth_ProcessACLPackets(void) { Bluetooth_ACL_Header_t ACLPacketHeader; + Bluetooth_DataPacket_Header_t DataHeader; Pipe_SelectPipe(BLUETOOTH_DATA_IN_PIPE); Pipe_SetToken(PIPE_TOKEN_IN); @@ -46,8 +47,6 @@ void Bluetooth_ProcessACLPackets(void) } Pipe_Read_Stream_LE(&ACLPacketHeader, sizeof(ACLPacketHeader)); - - Bluetooth_DataPacket_Header_t DataHeader; Pipe_Read_Stream_LE(&DataHeader, sizeof(DataHeader)); BT_DEBUG("(ACL) Packet Received", NULL); @@ -68,7 +67,14 @@ void Bluetooth_ProcessACLPackets(void) break; case BLUETOOTH_SIGNAL_CONFIGURATION_REQUEST: Bluetooth_ProcessSignalPacket_ConfigurationRequest(&ACLPacketHeader, &DataHeader, &SignalCommandHeader); - break; + break; + case BLUETOOTH_SIGNAL_INFORMATION_REQUEST: + BT_DEBUG("(ACL) -- Information Request, Discarded"); + + Pipe_Discard_Stream(ACLPacketHeader.DataLength); + Pipe_ClearIN(); + Pipe_Freeze(); + break; default: BT_DEBUG("(ACL) >> Unknown Signalling Command 0x%02X", SignalCommandHeader.Code); diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h index 20c6cca5b..8c49e0972 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h @@ -48,6 +48,7 @@ #define BLUETOOTH_SIGNAL_CONNECTION_RESPONSE 0x03 #define BLUETOOTH_SIGNAL_CONFIGURATION_REQUEST 0x04 #define BLUETOOTH_SIGNAL_CONFIGURATION_RESPONSE 0x05 + #define BLUETOOTH_SIGNAL_INFORMATION_REQUEST 0x0A #define BLUETOOTH_CONNECTION_SUCCESSFUL 0x0000 #define BLUETOOTH_CONNECTION_REFUSED_RESOURCES 0x0004 diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile index 3406c2622..f24f6ffd9 100644 --- a/Demos/Host/Incomplete/BluetoothHost/makefile +++ b/Demos/Host/Incomplete/BluetoothHost/makefile @@ -60,7 +60,7 @@ # MCU name -MCU = at90usb1287 +MCU = at90usb647 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring -- cgit v1.2.3