giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into contrib/routing-api

Browse Source
This commit is contained in:
Simon Duquennoy 2018-02-14 17:48:48 +01:00 committed by GitHub
commit 08c0352330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c
View File

@ -122,5 +122,5 @@ const struct configuration_st {
}; };
const struct usb_st_configuration_descriptor const *configuration_head = const struct usb_st_configuration_descriptor* const configuration_head =
(struct usb_st_configuration_descriptor const*)&configuration_block; (const struct usb_st_configuration_descriptor*)&configuration_block;

2
arch/cpu/arm/common/usb/descriptors.h
View File

@ -6,5 +6,5 @@
#endif #endif
extern const struct usb_st_device_descriptor device_descriptor; extern const struct usb_st_device_descriptor device_descriptor;
extern const struct usb_st_configuration_descriptor const *configuration_head; extern const struct usb_st_configuration_descriptor* const configuration_head;
#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */ #endif /* DESCRIPTORS_H_RPFUB8O7OV__ */

4
arch/cpu/cc2538/usb/cdc-acm-descriptors.c
View File

@ -161,7 +161,7 @@ const struct configuration_st {
}; };
const struct usb_st_configuration_descriptor const *configuration_head = const struct usb_st_configuration_descriptor* const configuration_head =
(struct usb_st_configuration_descriptor const *)&configuration_block; (const struct usb_st_configuration_descriptor*)&configuration_block;
/** @} */ /** @} */

2
arch/cpu/cc2538/usb/common/descriptors.h
View File

@ -6,5 +6,5 @@
#endif #endif
extern const struct usb_st_device_descriptor device_descriptor; extern const struct usb_st_device_descriptor device_descriptor;
extern const struct usb_st_configuration_descriptor const *configuration_head; extern const struct usb_st_configuration_descriptor* const configuration_head;
#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */ #endif /* DESCRIPTORS_H_RPFUB8O7OV__ */