jzh/free-dap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from majbthrd/master

Browse Source 
add const declarations
This commit is contained in:
Alex Taradov 2018-01-28 16:01:16 -08:00 committed by GitHub
commit 5ad6e4460d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/samd11/usb.c
View File

@ -113,7 +113,7 @@ void usb_handle_standard_request(usb_request_t *request)
} }
else if (index < USB_STR_COUNT) else if (index < USB_STR_COUNT)
{ {
char *str = usb_strings[index]; const char *str = usb_strings[index];
int len = strlen(str); int len = strlen(str);
memset(usb_string_descriptor_buffer, 0, sizeof(usb_string_descriptor_buffer)); memset(usb_string_descriptor_buffer, 0, sizeof(usb_string_descriptor_buffer));

2
platform/samd11/usb_descriptors.c
View File

@ -139,7 +139,7 @@ const alignas(4) usb_string_descriptor_zero_t usb_string_descriptor_zero =
char usb_serial_number[16]; char usb_serial_number[16];
char *usb_strings[] = const char *const usb_strings[] =
{ {
[USB_STR_MANUFACTURER] = "Alex Taradov", [USB_STR_MANUFACTURER] = "Alex Taradov",
[USB_STR_PRODUCT] = "Generic CMSIS-DAP Adapter", [USB_STR_PRODUCT] = "Generic CMSIS-DAP Adapter",

2
platform/samd11/usb_descriptors.h
View File

@ -78,7 +78,7 @@ extern const usb_device_descriptor_t usb_device_descriptor;
extern const usb_configuration_hierarchy_t usb_configuration_hierarchy; extern const usb_configuration_hierarchy_t usb_configuration_hierarchy;
extern const uint8_t usb_hid_report_descriptor[33]; extern const uint8_t usb_hid_report_descriptor[33];
extern const usb_string_descriptor_zero_t usb_string_descriptor_zero; extern const usb_string_descriptor_zero_t usb_string_descriptor_zero;
extern char *usb_strings[]; extern const char *const usb_strings[];
extern uint8_t usb_string_descriptor_buffer[64]; extern uint8_t usb_string_descriptor_buffer[64];
#endif // _USB_DESCRIPTORS_H_ #endif // _USB_DESCRIPTORS_H_

2
platform/samd21/usb.c
View File

@ -113,7 +113,7 @@ void usb_handle_standard_request(usb_request_t *request)
} }
else if (index < USB_STR_COUNT) else if (index < USB_STR_COUNT)
{ {
char *str = usb_strings[index]; const char *str = usb_strings[index];
int len = strlen(str); int len = strlen(str);
memset(usb_string_descriptor_buffer, 0, sizeof(usb_string_descriptor_buffer)); memset(usb_string_descriptor_buffer, 0, sizeof(usb_string_descriptor_buffer));

10
platform/samd21/usb_descriptors.c
View File

@ -32,7 +32,7 @@
#include "usb_descriptors.h" #include "usb_descriptors.h"
/*- Variables ---------------------------------------------------------------*/ /*- Variables ---------------------------------------------------------------*/
ALIGNED(4) usb_device_descriptor_t usb_device_descriptor = ALIGNED(4) const usb_device_descriptor_t usb_device_descriptor =
{ {
.bLength = sizeof(usb_device_descriptor_t), .bLength = sizeof(usb_device_descriptor_t),
.bDescriptorType = USB_DEVICE_DESCRIPTOR, .bDescriptorType = USB_DEVICE_DESCRIPTOR,
@ -50,7 +50,7 @@ ALIGNED(4) usb_device_descriptor_t usb_device_descriptor =
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
ALIGNED(4) usb_configuration_hierarchy_t usb_configuration_hierarchy = ALIGNED(4) const usb_configuration_hierarchy_t usb_configuration_hierarchy =
{ {
.configuration = .configuration =
{ {
@ -109,7 +109,7 @@ ALIGNED(4) usb_configuration_hierarchy_t usb_configuration_hierarchy =
}, },
}; };
ALIGNED(4) uint8_t usb_hid_report_descriptor[33] = ALIGNED(4) const uint8_t usb_hid_report_descriptor[33] =
{ {
0x06, 0x00, 0xff, // Usage Page (Vendor Defined 0xFF00) 0x06, 0x00, 0xff, // Usage Page (Vendor Defined 0xFF00)
0x09, 0x01, // Usage (0x01) 0x09, 0x01, // Usage (0x01)
@ -129,14 +129,14 @@ ALIGNED(4) uint8_t usb_hid_report_descriptor[33] =
0xc0, // End Collection 0xc0, // End Collection
}; };
ALIGNED(4) usb_string_descriptor_zero_t usb_string_descriptor_zero = ALIGNED(4) const usb_string_descriptor_zero_t usb_string_descriptor_zero =
{ {
.bLength = sizeof(usb_string_descriptor_zero_t), .bLength = sizeof(usb_string_descriptor_zero_t),
.bDescriptorType = USB_STRING_DESCRIPTOR, .bDescriptorType = USB_STRING_DESCRIPTOR,
.wLANGID = 0x0409, // English (United States) .wLANGID = 0x0409, // English (United States)
}; };
char *usb_strings[] = const char *const usb_strings[] =
{ {
[USB_STR_MANUFACTURER] = "Alex Taradov", [USB_STR_MANUFACTURER] = "Alex Taradov",
[USB_STR_PRODUCT] = "Generic CMSIS-DAP Adapter", [USB_STR_PRODUCT] = "Generic CMSIS-DAP Adapter",

10
platform/samd21/usb_descriptors.h
View File

@ -74,11 +74,11 @@ typedef struct PACK
} usb_configuration_hierarchy_t; } usb_configuration_hierarchy_t;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern usb_device_descriptor_t usb_device_descriptor; extern const usb_device_descriptor_t usb_device_descriptor;
extern usb_configuration_hierarchy_t usb_configuration_hierarchy; extern const usb_configuration_hierarchy_t usb_configuration_hierarchy;
extern uint8_t usb_hid_report_descriptor[33]; extern const uint8_t usb_hid_report_descriptor[33];
extern usb_string_descriptor_zero_t usb_string_descriptor_zero; extern const usb_string_descriptor_zero_t usb_string_descriptor_zero;
extern char *usb_strings[]; extern const char *const usb_strings[];
extern uint8_t usb_string_descriptor_buffer[64]; extern uint8_t usb_string_descriptor_buffer[64];
#endif // _USB_DESCRIPTORS_H_ #endif // _USB_DESCRIPTORS_H_