X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2793c88fc601dcc7ec4961326dd9748a20f3ec83..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c?ds=inline

diff --git a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
index e9f575c55..3485a05c0 100644
--- a/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
+++ b/Demos/Host/Incomplete/BluetoothHost/DeviceDescriptor.c
@@ -1,66 +1,68 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2009.
-              
-  dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
-*/
-
-/*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, 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
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#include "DeviceDescriptor.h"
-
-uint8_t ProcessDeviceDescriptor(void)
-{
-	USB_Descriptor_Device_t DeviceDescriptor;
-
-	/* Standard request to get the device descriptor */
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-			bRequest:      REQ_GetDescriptor,
-			wValue:        (DTYPE_Device << 8),
-			wIndex:        0,
-			wLength:       sizeof(USB_Descriptor_Device_t),
-		};
-
-	/* Select the control pipe for the request transfer */
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	/* Send the request to retrieve the device descriptor */
-	if (USB_Host_SendControlRequest((void*)&DeviceDescriptor) != HOST_SENDCONTROL_Successful)
-	  return ControlErrorDuringDeviceRead;
-	  
-	/* Validate returned data - ensure the returned data is a device descriptor */
-	if (DeviceDescriptor.Header.Type != DTYPE_Device)
-	  return InvalidDeviceDataReturned;
-	  
-	if ((DeviceDescriptor.Class != BLUETOOTH_DEVICE_CLASS) ||
-	    (DeviceDescriptor.SubClass != BLUETOOTH_DEVICE_SUBCLASS) ||
-	    (DeviceDescriptor.Protocol != BLUETOOTH_DEVICE_PROTOCOL))
-	{
-		return IncorrectDevice;
-	}
-	
-	return SuccessfulDeviceRead;
-}
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  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
+  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
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  USB Device Descriptor processing routines, to determine the overall device parameters. Descriptors are special
+ *  computer-readable structures which the host requests upon device enumeration, to determine information about
+ *  the attached device.
+ */
+
+#include "DeviceDescriptor.h"
+
+/** Reads and processes an attached device's Device Descriptor, to determine compatibility
+ *
+ *  This routine checks to ensure that the attached device's class codes match those for Bluetooth devices.
+ *
+ *  \return An error code from the \ref BluetoothHost_GetDeviceDescriptorDataCodes_t enum.
+ */
+uint8_t ProcessDeviceDescriptor(void)
+{
+	USB_Descriptor_Device_t DeviceDescriptor;
+
+	/* Send the request to retrieve the device descriptor */
+	if (USB_Host_GetDeviceDescriptor(&DeviceDescriptor) != HOST_SENDCONTROL_Successful)
+	  return DevControlError;
+
+	/* Validate returned data - ensure the returned data is a device descriptor */
+	if (DeviceDescriptor.Header.Type != DTYPE_Device)
+	  return InvalidDeviceDataReturned;
+
+	/* Validate returned device Class, SubClass and Protocol values against the Bluetooth spec values */
+	if ((DeviceDescriptor.Class    != BLUETOOTH_DEVICE_CLASS)    ||
+	    (DeviceDescriptor.SubClass != BLUETOOTH_DEVICE_SUBCLASS) ||
+	    (DeviceDescriptor.Protocol != BLUETOOTH_DEVICE_PROTOCOL))
+	{
+		return IncorrectBTDevice;
+	}
+
+	return SuccessfulDeviceRead;
+}
+