uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove util.[ch] because USB_SHORT_GET_{LOW,HIGH} can be used in place of GET_[LM]SB_OF_WORD()

Browse Source
This commit is contained in:
László Monda
2016-02-25 22:49:08 +01:00
parent ec187193b6
commit 4cc0f862b0
5 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
right/usb_device_descriptor.c
View File

@@ -3,7 +3,6 @@
#include "usb_device.h"
#include "include/usb/usb_device_class.h"
#include "include/usb/usb_device_hid.h"
#include "util.h"
#include "usb_device_descriptor.h"
#include "composite.h"
#include "hid_keyboard.h"
@@ -18,10 +17,10 @@ uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
USB_DEVICE_SUBCLASS,
USB_DEVICE_PROTOCOL,
USB_CONTROL_MAX_PACKET_SIZE,
GET_LSB_OF_WORD(USB_VENDOR_ID),
GET_MSB_OF_WORD(USB_VENDOR_ID),
GET_LSB_OF_WORD(USB_PRODUCT_ID),
GET_MSB_OF_WORD(USB_PRODUCT_ID),
USB_SHORT_GET_LOW(USB_VENDOR_ID),
USB_SHORT_GET_HIGH(USB_VENDOR_ID),
USB_SHORT_GET_LOW(USB_PRODUCT_ID),
USB_SHORT_GET_HIGH(USB_PRODUCT_ID),
USB_SHORT_GET_LOW(USB_DEVICE_RELEASE_NUMBER),
USB_SHORT_GET_HIGH(USB_DEVICE_RELEASE_NUMBER),
USB_STRING_DESCRIPTOR_ID_MANUFACTURER,
@@ -118,8 +117,8 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
uint8_t UsbLanguageListStringDescriptor[USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH] = {
sizeof(UsbLanguageListStringDescriptor),
USB_DESCRIPTOR_TYPE_STRING,
GET_LSB_OF_WORD(USB_LANGUAGE_ID_UNITED_STATES),
GET_MSB_OF_WORD(USB_LANGUAGE_ID_UNITED_STATES)
USB_SHORT_GET_LOW(USB_LANGUAGE_ID_UNITED_STATES),
USB_SHORT_GET_HIGH(USB_LANGUAGE_ID_UNITED_STATES)
};
uint8_t UsbManufacturerString[USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH] = {