From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- .../AndroidAccessoryHost/DeviceDescriptor.c | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 lib/lufa/Demos/Host/LowLevel/AndroidAccessoryHost/DeviceDescriptor.c (limited to 'lib/lufa/Demos/Host/LowLevel/AndroidAccessoryHost/DeviceDescriptor.c') diff --git a/lib/lufa/Demos/Host/LowLevel/AndroidAccessoryHost/DeviceDescriptor.c b/lib/lufa/Demos/Host/LowLevel/AndroidAccessoryHost/DeviceDescriptor.c deleted file mode 100644 index 03841a9903..0000000000 --- a/lib/lufa/Demos/Host/LowLevel/AndroidAccessoryHost/DeviceDescriptor.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 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 disclaims 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 VID and PID matches Google's for Android devices. - * - * \return An error code from the \ref AndroidHost_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; - - /* Check the product ID to determine if the Android device is in accessory mode */ - if ((DeviceDescriptor.ProductID != ANDROID_ACCESSORY_PRODUCT_ID) && - (DeviceDescriptor.ProductID != ANDROID_ACCESSORY_ADB_PRODUCT_ID)) - { - return NonAccessoryModeAndroidDevice; - } - - return AccessoryModeAndroidDevice; -} - -- cgit v1.2.3