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

Don't use the U number notation and macro parentheses unless necessary.

Browse Source
This commit is contained in:
László Monda
2016-03-03 18:27:39 +01:00
parent 09f25e6139
commit 55c063c69a
15 changed files with 100 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
right/main.c
View File

@@ -11,6 +11,6 @@ void main(void)
USB_DeviceApplicationInit();
while (1U) {
while (1) {
}
}

20
right/usb_composite_device.c
View File

@@ -34,8 +34,8 @@ usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = {
static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param)
{
usb_status_t error = kStatus_USB_Error;
uint16_t *temp16 = (uint16_t *)param;
uint8_t *temp8 = (uint8_t *)param;
uint16_t *temp16 = (uint16_t*)param;
uint8_t *temp8 = (uint8_t*)param;
if (!param && event != kUSB_DeviceEventBusReset && event != kUSB_DeviceEventSetInterface) {
return error;
@@ -43,11 +43,11 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
switch (event) {
case kUSB_DeviceEventBusReset:
UsbCompositeDevice.attach = 0U;
UsbCompositeDevice.attach = 0;
error = kStatus_USB_Success;
break;
case kUSB_DeviceEventSetConfiguration:
UsbCompositeDevice.attach = 1U;
UsbCompositeDevice.attach = 1;
UsbCompositeDevice.currentConfiguration = *temp8;
UsbGenericHidSetConfiguration(UsbCompositeDevice.genericHidHandle, *temp8);
UsbKeyboardSetConfiguration(UsbCompositeDevice.keyboardHandle, *temp8);
@@ -60,8 +60,8 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
break;
case kUSB_DeviceEventSetInterface:
if (UsbCompositeDevice.attach) {
uint8_t interface = (uint8_t)((*temp16 & 0xFF00U) >> 0x08U);
uint8_t alternateSetting = (uint8_t)(*temp16 & 0x00FFU);
uint8_t interface = (uint8_t)((*temp16 & 0xFF00U) >> 8);
uint8_t alternateSetting = (uint8_t)(*temp16 & 0x00FF);
if (interface < USB_COMPOSITE_INTERFACE_COUNT) {
UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting;
UsbGenericHidSetInterface(UsbCompositeDevice.genericHidHandle, interface, alternateSetting);
@@ -72,9 +72,9 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
}
break;
case kUSB_DeviceEventGetInterface: ;
uint8_t interface = (uint8_t)((*temp16 & 0xFF00U) >> 0x08U);
uint8_t interface = (uint8_t)((*temp16 & 0xFF00) >> 8);
if (interface < USB_COMPOSITE_INTERFACE_COUNT) {
*temp16 = (*temp16 & 0xFF00U) | UsbCompositeDevice.currentInterfaceAlternateSetting[interface];
*temp16 = (*temp16 & 0xFF00) | UsbCompositeDevice.currentInterfaceAlternateSetting[interface];
error = kStatus_USB_Success;
} else {
error = kStatus_USB_InvalidRequest;
@@ -114,9 +114,9 @@ void USB_DeviceApplicationInit(void)
uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
SystemCoreClockUpdate();
CLOCK_EnableUsbfs0Clock(kCLOCK_UsbSrcIrc48M, 48000000U);
CLOCK_EnableUsbfs0Clock(kCLOCK_UsbSrcIrc48M, 48000000);
UsbCompositeDevice.attach = 0U;
UsbCompositeDevice.attach = 0;
USB_DeviceClassInit(CONTROLLER_ID, &UsbDeviceCompositeConfigList, &UsbCompositeDevice.deviceHandle);
UsbCompositeDevice.genericHidHandle = UsbDeviceCompositeConfigList.config[USB_GENERIC_HID_INTERFACE_INDEX].classHandle;
UsbCompositeDevice.keyboardHandle = UsbDeviceCompositeConfigList.config[USB_KEYBOARD_INTERFACE_INDEX].classHandle;

2
right/usb_composite_device.h
View File

@@ -8,7 +8,7 @@
// Macros:
#define CONTROLLER_ID kUSB_ControllerKhci0
#define USB_DEVICE_INTERRUPT_PRIORITY (3U)
#define USB_DEVICE_INTERRUPT_PRIORITY 3
// Typedefs:

9
right/usb_descriptor_configuration.h
View File

@@ -9,13 +9,8 @@
// Macros:
#define USB_COMPOSITE_CONFIGURATION_INDEX (1U)
#define USB_LANGUAGE_ID_UNITED_STATES (0x0409U)
// Descriptor lengths
#define USB_HID_DESCRIPTOR_LENGTH (9U)
#define USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH (91U)
#define USB_COMPOSITE_CONFIGURATION_INDEX 1
#define USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH 91
// Functions:

31
right/usb_descriptor_device.h
View File

@@ -3,32 +3,31 @@
// Macros:
#define USB_DEVICE_CLASS (0x00U)
#define USB_DEVICE_SUBCLASS (0x00U)
#define USB_DEVICE_PROTOCOL (0x00U)
#define USB_DEVICE_CLASS 0x00
#define USB_DEVICE_SUBCLASS 0x00
#define USB_DEVICE_PROTOCOL 0x00
#define USB_DEVICE_SPECIFICATION_VERSION (0x0200U)
#define USB_HID_VERSION (0x0100U)
#define USB_DEVICE_SPECIFICATION_VERSION 0x0200
#define USB_HID_VERSION 0x0100
#define USB_DEVICE_VENDOR_ID (0x15A2U)
#define USB_DEVICE_PRODUCT_ID (0x007EU)
#define USB_DEVICE_RELEASE_NUMBER (0x0101U)
#define USB_DEVICE_VENDOR_ID 0x15A2
#define USB_DEVICE_PRODUCT_ID 0x007E
#define USB_DEVICE_RELEASE_NUMBER 0x0101
#define USB_DEVICE_CONFIGURATION_COUNT (1U)
#define USB_REPORT_DESCRIPTOR_COUNT_PER_HID_DEVICE (1U)
#define USB_DEVICE_MAX_POWER (50U) // Expressed in 2mA units
#define USB_DEVICE_CONFIGURATION_COUNT 1
#define USB_REPORT_DESCRIPTOR_COUNT_PER_HID_DEVICE 1
#define USB_DEVICE_MAX_POWER 50 // Expressed in 2mA units
#define USB_COMPOSITE_INTERFACE_COUNT (USB_KEYBOARD_INTERFACE_COUNT + \
USB_MOUSE_INTERFACE_COUNT + \
USB_GENERIC_HID_INTERFACE_COUNT)
#define USB_HID_COUNTRY_CODE_NOT_SUPPORTED (0x00U)
#define USB_INTERFACE_ALTERNATE_SETTING_NONE (0x00U)
#define USB_STRING_DESCRIPTOR_NONE 0U
#define USB_HID_COUNTRY_CODE_NOT_SUPPORTED 0x00
#define USB_INTERFACE_ALTERNATE_SETTING_NONE 0x00
#define USB_STRING_DESCRIPTOR_NONE 0x00
// Descriptor lengths
#define USB_HID_DESCRIPTOR_LENGTH (9U)
#define USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH (91U)
#define USB_HID_DESCRIPTOR_LENGTH 9
// Functions:

8
right/usb_descriptor_generic_hid_report.h
View File

@@ -5,10 +5,10 @@
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH (31U)
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX 0x80U
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION 0x81U
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN 0x82U
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT 0x83U
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_PAGE_INDEX 0x80
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_COLLECTION 0x81
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_IN 0x82
#define USB_GENERIC_HID_REPORT_DESCRIPTOR_VENDOR_USAGE_DATA_OUT 0x83
// Variables:

4
right/usb_descriptor_keyboard_report.h
View File

@@ -3,8 +3,8 @@
// Macros:
#define USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (63U)
#define USB_KEYBOARD_MAX_KEYS (6U)
#define USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH 63
#define USB_KEYBOARD_MAX_KEYS 6
// Variables:

2
right/usb_descriptor_mouse_report.h
View File

@@ -3,7 +3,7 @@
// Macros:
#define USB_MOUSE_REPORT_DESCRIPTOR_LENGTH (121U)
#define USB_MOUSE_REPORT_DESCRIPTOR_LENGTH 121
#define USB_MOUSE_REPORT_DESCRIPTOR_MIN_AXIS_VALUE -4096
#define USB_MOUSE_REPORT_DESCRIPTOR_MAX_AXIS_VALUE 4096

2
right/usb_descriptor_strings.c
View File

@@ -81,7 +81,7 @@ uint8_t *UsbStringDescriptors[USB_STRING_DESCRIPTOR_COUNT] = {
usb_status_t USB_DeviceGetStringDescriptor(
usb_device_handle handle, usb_device_get_string_descriptor_struct_t *stringDescriptor)
{
if (stringDescriptor->stringIndex == 0U) {
if (stringDescriptor->stringIndex == 0) {
stringDescriptor->buffer = UsbLanguageListStringDescriptor;
stringDescriptor->length = sizeof(UsbLanguageListStringDescriptor);
} else if (stringDescriptor->languageId == USB_LANGUAGE_ID_UNITED_STATES &&

16
right/usb_descriptor_strings.h
View File

@@ -3,17 +3,17 @@
// Macros:
#define USB_LANGUAGE_ID_UNITED_STATES (0x0409U)
#define USB_LANGUAGE_ID_UNITED_STATES 0x0409
#define USB_STRING_DESCRIPTOR_COUNT (3U)
#define USB_STRING_DESCRIPTOR_COUNT 3
#define USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH (4U)
#define USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH (58U)
#define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH (34U)
#define USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH 4
#define USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH 58
#define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH 34
#define USB_STRING_DESCRIPTOR_ID_SUPPORTED_LANGUAGES 0U
#define USB_STRING_DESCRIPTOR_ID_MANUFACTURER 1U
#define USB_STRING_DESCRIPTOR_ID_PRODUCT 2U
#define USB_STRING_DESCRIPTOR_ID_SUPPORTED_LANGUAGES 0
#define USB_STRING_DESCRIPTOR_ID_MANUFACTURER 1
#define USB_STRING_DESCRIPTOR_ID_PRODUCT 2
// Functions:

24
right/usb_device_config.h
View File

@@ -2,39 +2,39 @@
#define __USB_DEVICE_CONFIG_H__
/*! @brief KHCI instance count */
#define USB_DEVICE_CONFIG_KHCI (1U)
#define USB_DEVICE_CONFIG_KHCI 1
/*! @brief Device instance count, the sum of KHCI and EHCI instance counts*/
#define USB_DEVICE_CONFIG_NUM (1U)
#define USB_DEVICE_CONFIG_NUM 1
/*! @brief HID instance count */
#define USB_DEVICE_CONFIG_HID (3U)
#define USB_DEVICE_CONFIG_HID 3
/*! @brief Whether device is self power. 1U supported, 0U not supported */
#define USB_DEVICE_CONFIG_SELF_POWER (1U)
#define USB_DEVICE_CONFIG_SELF_POWER 1
/*! @brief Whether device remote wakeup supported. 1U supported, 0U not supported */
#define USB_DEVICE_CONFIG_REMOTE_WAKEUP (0U)
#define USB_DEVICE_CONFIG_REMOTE_WAKEUP 0
/*! @brief How many endpoints are supported in the stack. */
#define USB_DEVICE_CONFIG_ENDPOINTS (6U)
#define USB_DEVICE_CONFIG_ENDPOINTS 6
/*! @brief The MAX buffer length for the KHCI DMA workaround.*/
#define USB_DEVICE_CONFIG_KHCI_DMA_ALIGN_BUFFER_LENGTH (64U)
#define USB_DEVICE_CONFIG_KHCI_DMA_ALIGN_BUFFER_LENGTH 64
/*! @brief Whether handle the USB KHCI bus error. */
#define USB_DEVICE_CONFIG_KHCI_ERROR_HANDLING (0U)
#define USB_DEVICE_CONFIG_KHCI_ERROR_HANDLING 0
/*! @brief Whether the keep alive feature enabled. */
#define USB_DEVICE_CONFIG_KEEP_ALIVE_MODE (0U)
#define USB_DEVICE_CONFIG_KEEP_ALIVE_MODE 0
/*! @brief Whether the transfer buffer is cache-enabled or not. */
#define USB_DEVICE_CONFIG_BUFFER_PROPERTY_CACHEABLE (0U)
#define USB_DEVICE_CONFIG_BUFFER_PROPERTY_CACHEABLE 0
/*! @brief Whether the low power mode is enabled or not. */
#define USB_DEVICE_CONFIG_LOW_POWER_MODE (0U)
#define USB_DEVICE_CONFIG_LOW_POWER_MODE 0
/*! @brief Whether the device detached feature is enabled or not. */
#define USB_DEVICE_CONFIG_DETACH_ENABLE (0U)
#define USB_DEVICE_CONFIG_DETACH_ENABLE 0
#endif

12
right/usb_interface_generic_hid.c
View File

@@ -68,21 +68,21 @@ usb_status_t UsbGenericHidCallback(class_handle_t handle, uint32_t event, void *
case kUSB_DeviceHidEventSendResponse:
break;
case kUSB_DeviceHidEventRecvResponse:
GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN);
GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN);
GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN);
GPIO_SetPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN);
GPIO_SetPinsOutput(BOARD_LED_GREEN_GPIO, 1 << BOARD_LED_GREEN_GPIO_PIN);
GPIO_SetPinsOutput(BOARD_LED_BLUE_GPIO, 1 << BOARD_LED_BLUE_GPIO_PIN);
uint8_t command = GenericHidBuffer[GenericHidBufferIndex][0];
switch (command) {
case 'r':
GPIO_ClearPinsOutput(BOARD_LED_RED_GPIO, 1U << BOARD_LED_RED_GPIO_PIN);
GPIO_ClearPinsOutput(BOARD_LED_RED_GPIO, 1 << BOARD_LED_RED_GPIO_PIN);
break;
case 'g':
GPIO_ClearPinsOutput(BOARD_LED_GREEN_GPIO, 1U << BOARD_LED_GREEN_GPIO_PIN);
GPIO_ClearPinsOutput(BOARD_LED_GREEN_GPIO, 1 << BOARD_LED_GREEN_GPIO_PIN);
break;
case 'b':
GPIO_ClearPinsOutput(BOARD_LED_BLUE_GPIO, 1U << BOARD_LED_BLUE_GPIO_PIN);
GPIO_ClearPinsOutput(BOARD_LED_BLUE_GPIO, 1 << BOARD_LED_BLUE_GPIO_PIN);
break;
}

30
right/usb_interface_generic_hid.h
View File

@@ -12,25 +12,25 @@
// Macros:
#define USB_GENERIC_HID_CLASS (0x03U)
#define USB_GENERIC_HID_SUBCLASS (0x00U)
#define USB_GENERIC_HID_PROTOCOL (0x00U)
#define USB_GENERIC_HID_CLASS 0x03
#define USB_GENERIC_HID_SUBCLASS 0x00
#define USB_GENERIC_HID_PROTOCOL 0x00
#define USB_GENERIC_HID_INTERFACE_INDEX (0U)
#define USB_GENERIC_HID_INTERFACE_COUNT (1U)
#define USB_GENERIC_HID_INTERFACE_ALTERNATE_SETTING (0U)
#define USB_GENERIC_HID_INTERFACE_INDEX 0
#define USB_GENERIC_HID_INTERFACE_COUNT 1
#define USB_GENERIC_HID_INTERFACE_ALTERNATE_SETTING 0
#define USB_GENERIC_HID_ENDPOINT_IN_ID (3U)
#define USB_GENERIC_HID_ENDPOINT_OUT_ID (4U)
#define USB_GENERIC_HID_ENDPOINT_COUNT (2U)
#define USB_GENERIC_HID_ENDPOINT_IN_ID 3
#define USB_GENERIC_HID_ENDPOINT_OUT_ID 4
#define USB_GENERIC_HID_ENDPOINT_COUNT 2
#define USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE (64U)
#define USB_GENERIC_HID_INTERRUPT_IN_INTERVAL (0x04U)
#define USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE (64U)
#define USB_GENERIC_HID_INTERRUPT_OUT_INTERVAL (0x04U)
#define USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE 64
#define USB_GENERIC_HID_INTERRUPT_IN_INTERVAL 4
#define USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE 64
#define USB_GENERIC_HID_INTERRUPT_OUT_INTERVAL 4
#define USB_GENERIC_HID_IN_BUFFER_LENGTH (64U)
#define USB_GENERIC_HID_OUT_BUFFER_LENGTH (64U)
#define USB_GENERIC_HID_IN_BUFFER_LENGTH 64
#define USB_GENERIC_HID_OUT_BUFFER_LENGTH 64
// Variables:

22
right/usb_interface_keyboard.h
View File

@@ -13,21 +13,21 @@
// Macros:
#define USB_KEYBOARD_CLASS (0x03U)
#define USB_KEYBOARD_SUBCLASS (0x01U)
#define USB_KEYBOARD_PROTOCOL (0x01U)
#define USB_KEYBOARD_CLASS 0x03
#define USB_KEYBOARD_SUBCLASS 0x01
#define USB_KEYBOARD_PROTOCOL 0x01
#define USB_KEYBOARD_INTERFACE_INDEX (1U)
#define USB_KEYBOARD_INTERFACE_COUNT (1U)
#define USB_KEYBOARD_INTERFACE_ALTERNATE_SETTING (0U)
#define USB_KEYBOARD_INTERFACE_INDEX 1
#define USB_KEYBOARD_INTERFACE_COUNT 1
#define USB_KEYBOARD_INTERFACE_ALTERNATE_SETTING 0
#define USB_KEYBOARD_ENDPOINT_ID (2U)
#define USB_KEYBOARD_ENDPOINT_COUNT (1U)
#define USB_KEYBOARD_ENDPOINT_ID 2
#define USB_KEYBOARD_ENDPOINT_COUNT 1
#define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE (8U)
#define USB_KEYBOARD_INTERRUPT_IN_INTERVAL (0x04U)
#define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE 8
#define USB_KEYBOARD_INTERRUPT_IN_INTERVAL 4
#define USB_KEYBOARD_REPORT_LENGTH (0x08U)
#define USB_KEYBOARD_REPORT_LENGTH 8
// Typedefs:

22
right/usb_interface_mouse.h
View File

@@ -12,21 +12,21 @@
// Macros:
#define USB_MOUSE_CLASS (0x03U)
#define USB_MOUSE_SUBCLASS (0x01U)
#define USB_MOUSE_PROTOCOL (0x02U)
#define USB_MOUSE_CLASS 0x03
#define USB_MOUSE_SUBCLASS 0x01
#define USB_MOUSE_PROTOCOL 0x02
#define USB_MOUSE_INTERFACE_INDEX (2U)
#define USB_MOUSE_INTERFACE_COUNT (1U)
#define USB_MOUSE_INTERFACE_ALTERNATE_SETTING (0U)
#define USB_MOUSE_INTERFACE_INDEX 2
#define USB_MOUSE_INTERFACE_COUNT 1
#define USB_MOUSE_INTERFACE_ALTERNATE_SETTING 0
#define USB_MOUSE_ENDPOINT_ID (1U)
#define USB_MOUSE_ENDPOINT_COUNT (1U)
#define USB_MOUSE_ENDPOINT_ID 1
#define USB_MOUSE_ENDPOINT_COUNT 1
#define USB_MOUSE_INTERRUPT_IN_PACKET_SIZE (8U)
#define USB_MOUSE_INTERRUPT_IN_INTERVAL (0x04U)
#define USB_MOUSE_INTERRUPT_IN_PACKET_SIZE 8
#define USB_MOUSE_INTERRUPT_IN_INTERVAL 4
#define USB_MOUSE_REPORT_LENGTH (0x07U)
#define USB_MOUSE_REPORT_LENGTH 7
// Typedefs: