aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/usb
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-10-21 18:17:29 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-21 19:19:03 -0400
commit50eeec84071b57af1c19aaf95decbcb217e7f400 (patch)
tree92c1e7dba12bca2573953b4e04c17ce9e6589065 /libmaple/usb
parent4e713b113857b02d3f61d55c3e1e99a2532498bb (diff)
downloadlibrambutan-50eeec84071b57af1c19aaf95decbcb217e7f400.tar.gz
librambutan-50eeec84071b57af1c19aaf95decbcb217e7f400.zip
usb_descriptors.h: Whitespace and column cleanups.
Untabify, make (mostly) 80-column clean. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/usb')
-rw-r--r--libmaple/usb/usb_descriptors.h160
1 files changed, 80 insertions, 80 deletions
diff --git a/libmaple/usb/usb_descriptors.h b/libmaple/usb/usb_descriptors.h
index 535713b..21bf09b 100644
--- a/libmaple/usb/usb_descriptors.h
+++ b/libmaple/usb/usb_descriptors.h
@@ -1,26 +1,28 @@
-/* *****************************************************************************
+/******************************************************************************
* The MIT License
*
* Copyright (c) 2010 LeafLabs LLC.
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *****************************************************************************/
#ifndef _USB_DESCRIPTORS_H_
#define _USB_DESCRIPTORS_H_
@@ -55,90 +57,88 @@
extern "C" {
#endif
-#define USB_DESCRIPTOR_STRING(len) \
- struct { \
- uint8 bLength; \
- uint8 bDescriptorType; \
- uint16 bString[len]; \
+#define USB_DESCRIPTOR_STRING(len) \
+ struct { \
+ uint8 bLength; \
+ uint8 bDescriptorType; \
+ uint16 bString[len]; \
} __packed
#define CDC_FUNCTIONAL_DESCRIPTOR_SIZE(DataSize) (3 + DataSize)
-#define CDC_FUNCTIONAL_DESCRIPTOR(DataSize) \
- struct \
- { \
- uint8 bLength; \
- uint8 bDescriptorType; \
- uint8 SubType; \
- uint8 Data[DataSize]; \
+#define CDC_FUNCTIONAL_DESCRIPTOR(DataSize) \
+ struct { \
+ uint8 bLength; \
+ uint8 bDescriptorType; \
+ uint8 SubType; \
+ uint8 Data[DataSize]; \
} __packed
typedef struct {
- uint8 bLength;
- uint8 bDescriptorType;
- uint16 bcdUSB;
- uint8 bDeviceClass;
- uint8 bDeviceSubClass;
- uint8 bDeviceProtocol;
- uint8 bMaxPacketSize0;
- uint16 idVendor;
- uint16 idProduct;
- uint16 bcdDevice;
- uint8 iManufacturer;
- uint8 iProduct;
- uint8 iSerialNumber;
- uint8 bNumConfigurations;
+ uint8 bLength;
+ uint8 bDescriptorType;
+ uint16 bcdUSB;
+ uint8 bDeviceClass;
+ uint8 bDeviceSubClass;
+ uint8 bDeviceProtocol;
+ uint8 bMaxPacketSize0;
+ uint16 idVendor;
+ uint16 idProduct;
+ uint16 bcdDevice;
+ uint8 iManufacturer;
+ uint8 iProduct;
+ uint8 iSerialNumber;
+ uint8 bNumConfigurations;
} __packed USB_Descriptor_Device;
typedef struct {
- uint8 bLength;
- uint8 bDescriptorType;
- uint16 wTotalLength;
- uint8 bNumInterfaces;
- uint8 bConfigurationValue;
- uint8 iConfiguration;
- uint8 bmAttributes;
- uint8 bMaxPower;
+ uint8 bLength;
+ uint8 bDescriptorType;
+ uint16 wTotalLength;
+ uint8 bNumInterfaces;
+ uint8 bConfigurationValue;
+ uint8 iConfiguration;
+ uint8 bmAttributes;
+ uint8 bMaxPower;
} __packed USB_Descriptor_Config_Header;
typedef struct {
- uint8 bLength;
- uint8 bDescriptorType;
- uint8 bInterfaceNumber;
- uint8 bAlternateSetting;
- uint8 bNumEndpoints;
- uint8 bInterfaceClass;
- uint8 bInterfaceSubClass;
- uint8 bInterfaceProtocol;
- uint8 iInterface;
+ uint8 bLength;
+ uint8 bDescriptorType;
+ uint8 bInterfaceNumber;
+ uint8 bAlternateSetting;
+ uint8 bNumEndpoints;
+ uint8 bInterfaceClass;
+ uint8 bInterfaceSubClass;
+ uint8 bInterfaceProtocol;
+ uint8 iInterface;
} __packed USB_Descriptor_Interface;
-
typedef struct {
- uint8 bLength;
- uint8 bDescriptorType;
- uint8 bEndpointAddress;
- uint8 bmAttributes;
- uint16 wMaxPacketSize;
- uint8 bInterval;
+ uint8 bLength;
+ uint8 bDescriptorType;
+ uint8 bEndpointAddress;
+ uint8 bmAttributes;
+ uint16 wMaxPacketSize;
+ uint8 bInterval;
} __packed USB_Descriptor_Endpoint;
typedef struct {
- USB_Descriptor_Config_Header Config_Header;
- USB_Descriptor_Interface CCI_Interface;
- CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;
- CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;
- CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_ACM;
- CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;
- USB_Descriptor_Endpoint ManagementEndpoint;
- USB_Descriptor_Interface DCI_Interface;
- USB_Descriptor_Endpoint DataOutEndpoint;
- USB_Descriptor_Endpoint DataInEndpoint;
+ USB_Descriptor_Config_Header Config_Header;
+ USB_Descriptor_Interface CCI_Interface;
+ CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;
+ CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;
+ CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_ACM;
+ CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;
+ USB_Descriptor_Endpoint ManagementEndpoint;
+ USB_Descriptor_Interface DCI_Interface;
+ USB_Descriptor_Endpoint DataOutEndpoint;
+ USB_Descriptor_Endpoint DataInEndpoint;
} __packed USB_Descriptor_Config;
typedef struct {
- uint8 bLength;
- uint8 bDescriptorType;
- uint16 bString[];
+ uint8 bLength;
+ uint8 bDescriptorType;
+ uint16 bString[];
} USB_Descriptor_String;
extern const USB_Descriptor_Device usbVcomDescriptor_Device;
@@ -152,4 +152,4 @@ extern const uint8 usbVcomDescriptor_iProduct[USB_DESCRIPTOR_STRING_LEN(8)];
}
#endif
-#endif // __DESCRIPTORS_H
+#endif