diff options
| author | Yuxin Zhou <[email protected]> | 2021-07-28 07:25:46 +0000 |
|---|---|---|
| committer | Yuxin Zhou <[email protected]> | 2021-07-28 07:25:46 +0000 |
| commit | 3574b6bc518553adefe70d82db907ae801786d6f (patch) | |
| tree | eadc713a8c532d2519bff2b6da93d31c8a98995b /common/usbx_host_classes | |
| parent | 756899739082fd013048ae6a39dab556fddc8a11 (diff) | |
Release 6.1.8v6.1.8_rel
Diffstat (limited to 'common/usbx_host_classes')
22 files changed, 411 insertions, 44 deletions
diff --git a/common/usbx_host_classes/inc/ux_host_class_asix.h b/common/usbx_host_classes/inc/ux_host_class_asix.h index 477b632..717842c 100644 --- a/common/usbx_host_classes/inc/ux_host_class_asix.h +++ b/common/usbx_host_classes/inc/ux_host_class_asix.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_asix.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_ASIX_H #define UX_HOST_CLASS_ASIX_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + #include "nx_api.h" #include "ux_network_driver.h" @@ -415,4 +429,10 @@ UINT _ux_host_class_asix_setup(UX_HOST_CLASS_ASIX *asix); #define ux_host_class_asix_read _ux_host_class_asix_read #define ux_host_class_asix_write _ux_host_class_asix_write +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_audio.h b/common/usbx_host_classes/inc/ux_host_class_audio.h index db23a18..476bd7b 100644 --- a/common/usbx_host_classes/inc/ux_host_class_audio.h +++ b/common/usbx_host_classes/inc/ux_host_class_audio.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_audio.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_AUDIO_H #define UX_HOST_CLASS_AUDIO_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define Audio Class main constants. */ @@ -445,6 +459,12 @@ UINT _ux_host_class_audio_write(UX_HOST_CLASS_AUDIO *audio, UX_HOST_CLASS_AUD #define ux_host_class_audio_streaming_terminal_get _ux_host_class_audio_streaming_terminal_get #define ux_host_class_audio_write _ux_host_class_audio_write +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_cdc_acm.h b/common/usbx_host_classes/inc/ux_host_class_cdc_acm.h index 0e0795a..5227541 100644 --- a/common/usbx_host_classes/inc/ux_host_class_cdc_acm.h +++ b/common/usbx_host_classes/inc/ux_host_class_cdc_acm.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_cdc_acm.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_CDC_ACM_H #define UX_HOST_CLASS_CDC_ACM_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define CDC ACM Class constants. */ #define UX_HOST_CLASS_CDC_ACM_DEVICE_INIT_DELAY 1000 @@ -317,4 +331,10 @@ VOID _ux_host_class_cdc_acm_reception_callback (UX_TRANSFER *transfer_request); #define ux_host_class_cdc_acm_reception_stop _ux_host_class_cdc_acm_reception_stop +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_cdc_ecm.h b/common/usbx_host_classes/inc/ux_host_class_cdc_ecm.h index f139d03..9c6ff12 100644 --- a/common/usbx_host_classes/inc/ux_host_class_cdc_ecm.h +++ b/common/usbx_host_classes/inc/ux_host_class_cdc_ecm.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_cdc_ecm.h PORTABLE C */ -/* 6.1.4 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -50,12 +50,26 @@ /* compile option for using */ /* packet pool from NetX, */ /* resulting in version 6.1.4 */ +/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_CDC_ECM_H #define UX_HOST_CLASS_CDC_ECM_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Include the NetX API. */ #include "nx_api.h" #include "ux_network_driver.h" @@ -306,4 +320,10 @@ UINT _ux_host_class_cdc_ecm_mac_address_get(UX_HOST_CLASS_CDC_ECM *cdc_ecm); #define ux_host_class_cdc_ecm_entry _ux_host_class_cdc_ecm_entry #define ux_host_class_cdc_ecm_write _ux_host_class_cdc_ecm_write +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_gser.h b/common/usbx_host_classes/inc/ux_host_class_gser.h index 5b84686..b176f15 100644 --- a/common/usbx_host_classes/inc/ux_host_class_gser.h +++ b/common/usbx_host_classes/inc/ux_host_class_gser.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_gser.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_GSER_H #define UX_HOST_CLASS_GSER_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define Sierra Wireless AR Class constants. */ @@ -263,4 +277,10 @@ UINT _ux_host_class_gser_reception_start (UX_HOST_CLASS_GSER *gser, #define ux_host_class_gser_reception_start _ux_host_class_gser_reception_start #define ux_host_class_gser_reception_stop _ux_host_class_gser_reception_stop +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_hid.h b/common/usbx_host_classes/inc/ux_host_class_hid.h index 49b1cec..253b789 100644 --- a/common/usbx_host_classes/inc/ux_host_class_hid.h +++ b/common/usbx_host_classes/inc/ux_host_class_hid.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_hid.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -47,12 +47,26 @@ /* them directly, fixed struct */ /* field definition issues, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_HID_H #define UX_HOST_CLASS_HID_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define HID Class constants. */ @@ -1032,5 +1046,11 @@ VOID _ux_host_class_hid_transfer_request_completed(UX_TRANSFER *transfer_requ #define ux_host_class_hid_report_id_get _ux_host_class_hid_report_id_get #define ux_host_class_hid_report_set _ux_host_class_hid_report_set +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_hid_keyboard.h b/common/usbx_host_classes/inc/ux_host_class_hid_keyboard.h index 229302a..df42c23 100644 --- a/common/usbx_host_classes/inc/ux_host_class_hid_keyboard.h +++ b/common/usbx_host_classes/inc/ux_host_class_hid_keyboard.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_hid_keyboard.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_HID_KEYBOARD_H #define UX_HOST_CLASS_HID_KEYBOARD_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define HID Keyboard Class constants. */ @@ -220,5 +234,11 @@ UINT _ux_host_class_hid_keyboard_ioctl(UX_HOST_CLASS_HID_KEYBOARD *keyboard_i #define ux_host_class_hid_keyboard_key_get _ux_host_class_hid_keyboard_key_get #define ux_host_class_hid_keyboard_ioctl _ux_host_class_hid_keyboard_ioctl +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_hid_mouse.h b/common/usbx_host_classes/inc/ux_host_class_hid_mouse.h index 00846a7..9df9526 100644 --- a/common/usbx_host_classes/inc/ux_host_class_hid_mouse.h +++ b/common/usbx_host_classes/inc/ux_host_class_hid_mouse.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_hid_mouse.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -43,12 +43,26 @@ /* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */ /* 09-30-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_HID_MOUSE_H #define UX_HOST_CLASS_HID_MOUSE_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define HID Mouse Class constants. */ @@ -106,4 +120,10 @@ UINT _ux_host_class_hid_mouse_wheel_get(UX_HOST_CLASS_HID_MOUSE *mouse_instance #define ux_host_class_hid_mouse_position_get _ux_host_class_hid_mouse_position_get #define ux_host_class_hid_mouse_wheel_get _ux_host_class_hid_mouse_wheel_get +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_hid_remote_control.h b/common/usbx_host_classes/inc/ux_host_class_hid_remote_control.h index a8685fa..03bb69d 100644 --- a/common/usbx_host_classes/inc/ux_host_class_hid_remote_control.h +++ b/common/usbx_host_classes/inc/ux_host_class_hid_remote_control.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_hid_remote_control.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -43,12 +43,26 @@ /* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */ /* 09-30-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_HID_REMOTE_CONTROL_H #define UX_HOST_CLASS_HID_REMOTE_CONTROL_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define HID Remote Control Class constants. */ @@ -85,5 +99,11 @@ UINT _ux_host_class_hid_remote_control_usage_get(UX_HOST_CLASS_HID_REMOTE_CON #define ux_host_class_hid_remote_control_entry _ux_host_class_hid_remote_control_entry #define ux_host_class_hid_remote_control_usage_get _ux_host_class_hid_remote_control_usage_get +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_hub.h b/common/usbx_host_classes/inc/ux_host_class_hub.h index 50f76d5..7611dec 100644 --- a/common/usbx_host_classes/inc/ux_host_class_hub.h +++ b/common/usbx_host_classes/inc/ux_host_class_hub.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_hub.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -43,12 +43,26 @@ /* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */ /* 09-30-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_HUB_H #define UX_HOST_CLASS_HUB_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define HUB Class constants. */ @@ -196,5 +210,11 @@ UINT _ux_host_class_hub_ports_power(UX_HOST_CLASS_HUB *hub); UINT _ux_host_class_hub_status_get(UX_HOST_CLASS_HUB *hub, UINT port, USHORT *port_status, USHORT *port_change); VOID _ux_host_class_hub_transfer_request_completed(UX_TRANSFER *transfer_request); +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_pima.h b/common/usbx_host_classes/inc/ux_host_class_pima.h index 5b3d0b6..f555552 100644 --- a/common/usbx_host_classes/inc/ux_host_class_pima.h +++ b/common/usbx_host_classes/inc/ux_host_class_pima.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_pima.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_PIMA_H #define UX_HOST_CLASS_PIMA_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define PIMA Class constants. */ #define UX_HOST_CLASS_PIMA_CLASS_TRANSFER_TIMEOUT 300000 @@ -572,4 +586,10 @@ UINT _ux_host_class_pima_device_info_get(UX_HOST_CLASS_PIMA *pima, #define ux_host_class_pima_object_handles_get _ux_host_class_pima_object_handles_get #define ux_host_class_pima_num_objects_get _ux_host_class_pima_num_objects_get +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_printer.h b/common/usbx_host_classes/inc/ux_host_class_printer.h index 933c5ba..0a53f22 100644 --- a/common/usbx_host_classes/inc/ux_host_class_printer.h +++ b/common/usbx_host_classes/inc/ux_host_class_printer.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_printer.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_PRINTER_H #define UX_HOST_CLASS_PRINTER_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define Printer Class constants. */ @@ -121,4 +135,10 @@ UINT _ux_host_class_printer_write(UX_HOST_CLASS_PRINTER *printer, UCHAR * dat #define ux_host_class_printer_status_get _ux_host_class_printer_status_get #define ux_host_class_printer_write _ux_host_class_printer_write +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_prolific.h b/common/usbx_host_classes/inc/ux_host_class_prolific.h index 5e69646..6534f41 100644 --- a/common/usbx_host_classes/inc/ux_host_class_prolific.h +++ b/common/usbx_host_classes/inc/ux_host_class_prolific.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_prolific.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_PROLIFIC_H #define UX_HOST_CLASS_PROLIFIC_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define PROLIFIC Class constants. */ #define UX_HOST_CLASS_PROLIFIC_DEVICE_INIT_DELAY (1 * UX_PERIODIC_RATE) @@ -295,4 +309,10 @@ UINT _ux_host_class_prolific_setup(UX_HOST_CLASS_PROLIFIC *prolific); #define ux_host_class_prolific_reception_start _ux_host_class_prolific_reception_start #define ux_host_class_prolific_setup _ux_host_class_prolific_setup +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_storage.h b/common/usbx_host_classes/inc/ux_host_class_storage.h index 977d66c..ea4b678 100755 --- a/common/usbx_host_classes/inc/ux_host_class_storage.h +++ b/common/usbx_host_classes/inc/ux_host_class_storage.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_storage.h PORTABLE C */ -/* 6.1.3 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -57,12 +57,26 @@ /* resulting in version 6.1.2 */ /* 12-31-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1.3 */ +/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_STORAGE_H #define UX_HOST_CLASS_STORAGE_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + #if !defined(UX_HOST_CLASS_STORAGE_NO_FILEX) /* Include the FileX API. */ @@ -538,4 +552,10 @@ UINT _ux_host_class_storage_unit_ready_test(UX_HOST_CLASS_STORAGE *storage); #define ux_host_class_storage_media_unlock _ux_host_class_storage_media_unlock #endif +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_swar.h b/common/usbx_host_classes/inc/ux_host_class_swar.h index a5e9fb6..e6934d7 100644 --- a/common/usbx_host_classes/inc/ux_host_class_swar.h +++ b/common/usbx_host_classes/inc/ux_host_class_swar.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_swar.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,12 +46,26 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_SWAR_H #define UX_HOST_CLASS_SWAR_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define Sierra Wireless AR Class constants. */ @@ -146,4 +160,10 @@ UINT _ux_host_class_swar_reception_start (UX_HOST_CLASS_SWAR *swar, #define ux_host_class_swar_reception_start _ux_host_class_swar_reception_start #define ux_host_class_swar_setup _ux_host_class_swar_setup +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/inc/ux_host_class_video.h b/common/usbx_host_classes/inc/ux_host_class_video.h index 2d5822b..109d5c9 100644 --- a/common/usbx_host_classes/inc/ux_host_class_video.h +++ b/common/usbx_host_classes/inc/ux_host_class_video.h @@ -26,7 +26,7 @@ /* COMPONENT DEFINITION RELEASE */ /* */ /* ux_host_class_video.h PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -49,12 +49,29 @@ /* symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ -/* */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* added extern "C" keyword */ +/* for compatibility with C++, */ +/* added new definitions */ +/* according to UVC 1.5 Class */ +/* specification, */ +/* resulting in version 6.1.8 */ +/* */ /**************************************************************************/ #ifndef UX_HOST_CLASS_VIDEO_H #define UX_HOST_CLASS_VIDEO_H +/* Determine if a C++ compiler is being used. If so, ensure that standard + C is used to process the API information. */ + +#ifdef __cplusplus + +/* Yes, C++ compiler is present. Use standard C. */ +extern "C" { + +#endif + /* Define external static data. */ extern UCHAR _ux_system_class_video_interface_descriptor_structure[]; extern UCHAR _ux_system_class_video_input_terminal_descriptor_structure[]; @@ -86,6 +103,7 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_SUBCLASS_UNDEFINED 0 #define UX_HOST_CLASS_VIDEO_SUBCLASS_CONTROL 1 #define UX_HOST_CLASS_VIDEO_SUBCLASS_STREAMING 2 +#define UX_HOST_CLASS_VIDEO_SUBCLASS_INTERFACE_COLLECTION 3 /* Define Video Class main descriptor types. */ @@ -106,6 +124,7 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_VC_SELECTOR_UNIT 0x04 #define UX_HOST_CLASS_VIDEO_VC_PROCESSING_UNIT 0x05 #define UX_HOST_CLASS_VIDEO_VC_EXTENSION_UNIT 0x06 +#define UX_HOST_CLASS_VIDEO_VC_ENCODING_UNIT 0x07 /* Define Video Class specific VS . */ @@ -123,6 +142,12 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_VS_FORMAT_FRAME_BASED 0x10 #define UX_HOST_CLASS_VIDEO_VS_FRAME_FRAME_BASED 0x11 #define UX_HOST_CLASS_VIDEO_VS_FORMAT_STREAM_BASED 0x12 +#define UX_HOST_CLASS_VIDEO_VS_FORMAT_H264 0x13 +#define UX_HOST_CLASS_VIDEO_VS_FRAME_H264 0x14 +#define UX_HOST_CLASS_VIDEO_VS_FORMAT_H264_SIMULCAST 0x15 +#define UX_HOST_CLASS_VIDEO_VS_FORMAT_VP8 0x16 +#define UX_HOST_CLASS_VIDEO_VS_FRAME_VP8 0x17 +#define UX_HOST_CLASS_VIDEO_VS_FORMAT_VP8_SIMULCAST 0x18 /* Define Video Class specific Control Selectors. */ @@ -145,6 +170,10 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_CT_ROLL_ABSOLUTE_CONTROL 0x0F #define UX_HOST_CLASS_VIDEO_CT_ROLL_RELATIVE_CONTROL 0x10 #define UX_HOST_CLASS_VIDEO_CT_PRIVACY_CONTROL 0x11 +#define UX_HOST_CLASS_VIDEO_CT_FOCUS_SIMPLE_CONTROL 0x12 +#define UX_HOST_CLASS_VIDEO_CT_WINDOW_CONTROL 0x13 +#define UX_HOST_CLASS_VIDEO_CT_REGION_OF_INTEREST_CONTROL 0x14 + #define UX_HOST_CLASS_VIDEO_PU_CONTROL_UNDEFINED 0x00 #define UX_HOST_CLASS_VIDEO_PU_BACKLIGHT_COMPENSATION_CONTROL 0x01 @@ -165,6 +194,7 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_PU_HUE_AUTO_CONTROL 0x10 #define UX_HOST_CLASS_VIDEO_PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 #define UX_HOST_CLASS_VIDEO_PU_ANALOG_LOCK_STATUS_CONTROL 0x12 +#define UX_HOST_CLASS_VIDEO_PU_CONTRAST_AUTO_CONTROL 0x13 #define UX_HOST_CLASS_VIDEO_VS_CONTROL_UNDEFINED 0x00 @@ -203,6 +233,7 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_REQUEST_ERROR_CODE_INVALID_INPUT 0x05 #define UX_HOST_CLASS_VIDEO_REQUEST_ERROR_CODE_INVALID_CONTROL 0x06 #define UX_HOST_CLASS_VIDEO_REQUEST_ERROR_CODE_INVALID_REQUEST 0x07 +#define UX_HOST_CLASS_VIDEO_REQUEST_ERROR_CODE_INVALID_VALUE_WITHIN_RANGE 0x08 #define UX_HOST_CLASS_VIDEO_REQUEST_ERROR_CODE_UNKNOWN 0xFF @@ -245,6 +276,11 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_GET_RES 0x84 #define UX_HOST_CLASS_VIDEO_GET_INFO 0x86 #define UX_HOST_CLASS_VIDEO_GET_DEF 0x87 +#define UX_HOST_CLASS_VIDEO_GET_CUR_ALL 0x91 +#define UX_HOST_CLASS_VIDEO_GET_MIN_ALL 0x92 +#define UX_HOST_CLASS_VIDEO_GET_MAX_ALL 0x93 +#define UX_HOST_CLASS_VIDEO_GET_RES_ALL 0x94 +#define UX_HOST_CLASS_VIDEO_GET_GET_DEF_ALL 0x97 /* Define Video Class error codes. */ @@ -302,6 +338,7 @@ extern UCHAR _ux_system_host_class_video_name[]; #define UX_HOST_CLASS_VIDEO_TCS_PU_HUE_AUTO_CONTROL 0x10 #define UX_HOST_CLASS_VIDEO_TCS_PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 #define UX_HOST_CLASS_VIDEO_TCS_PU_ANALOG_LOCK_STATUS_CONTROL 0x12 +#define UX_HOST_CLASS_VIDEO_TCS_PU_CONTRAST_AUTO_CONTROL 0x13 #define UX_HOST_CLASS_VIDEO_TCS_XU_CONTROL_UNDEFINED 0x00 @@ -650,6 +687,12 @@ UINT _ux_host_class_video_control_request(UX_HOST_CLASS_VIDEO *video, #define ux_host_class_video_entities_parse _ux_host_class_video_entities_parse #define ux_host_class_video_control_request _ux_host_class_video_control_request +/* Determine if a C++ compiler is being used. If so, complete the standard + C conditional started above. */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/common/usbx_host_classes/src/ux_host_class_asix_transmission_callback.c b/common/usbx_host_classes/src/ux_host_class_asix_transmission_callback.c index f21e96a..a7e3da0 100644 --- a/common/usbx_host_classes/src/ux_host_class_asix_transmission_callback.c +++ b/common/usbx_host_classes/src/ux_host_class_asix_transmission_callback.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_asix_transmission_callback PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -71,6 +71,9 @@ /* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */ /* 09-30-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed spelling error, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ VOID _ux_host_class_asix_transmission_callback (UX_TRANSFER *transfer_request) @@ -115,7 +118,7 @@ UCHAR *packet_header; /* Load the address of the current packet header of the physical header. */ packet_header = next_packet -> nx_packet_prepend_ptr; - /* Substract 2 USHORT to store length of the packet. */ + /* Subtract 2 USHORT to store length of the packet. */ packet_header -= sizeof(USHORT) * 2; /* Store the length of the payload in the first USHORT. */ diff --git a/common/usbx_host_classes/src/ux_host_class_asix_write.c b/common/usbx_host_classes/src/ux_host_class_asix_write.c index d42ff5d..b5b4938 100644 --- a/common/usbx_host_classes/src/ux_host_class_asix_write.c +++ b/common/usbx_host_classes/src/ux_host_class_asix_write.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_asix_write PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -71,6 +71,9 @@ /* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */ /* 09-30-2020 Chaoqiong Xiao Modified comment(s), */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed spelling error, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ UINT _ux_host_class_asix_write(VOID *asix_class, NX_PACKET *packet) @@ -105,7 +108,7 @@ UX_HOST_CLASS_ASIX *asix; /* Load the address of the current packet header at the physical header. */ packet_header = packet -> nx_packet_prepend_ptr; - /* Substract 2 USHORT to store length of the packet. */ + /* Subtract 2 USHORT to store length of the packet. */ packet_header -= sizeof(USHORT) * 2; #if defined(UX_HOST_CLASS_ASIX_HEADER_CHECK_ENABLE) diff --git a/common/usbx_host_classes/src/ux_host_class_hid_report_add.c b/common/usbx_host_classes/src/ux_host_class_hid_report_add.c index 65bfaae..f97ccc7 100644 --- a/common/usbx_host_classes/src/ux_host_class_hid_report_add.c +++ b/common/usbx_host_classes/src/ux_host_class_hid_report_add.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_hid_report_add PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -75,6 +75,9 @@ /* verified memset and memcpy */ /* cases, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed spelling error, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ UINT _ux_host_class_hid_report_add(UX_HOST_CLASS_HID *hid, UCHAR *descriptor, UX_HOST_CLASS_HID_ITEM *item) @@ -164,7 +167,7 @@ ULONG current_field_address; if ((hid_report != UX_NULL) && (hid_report -> ux_host_class_hid_report_id == hid_parser -> ux_host_class_hid_parser_global.ux_host_class_hid_global_item_report_id)) { - /* So we did not need a new report afterall! */ + /* So we did not need a new report after all! */ _ux_utility_memory_free(new_hid_report); new_hid_report = hid_report; } diff --git a/common/usbx_host_classes/src/ux_host_class_storage_device_initialize.c b/common/usbx_host_classes/src/ux_host_class_storage_device_initialize.c index e3798a9..799dfee 100644 --- a/common/usbx_host_classes/src/ux_host_class_storage_device_initialize.c +++ b/common/usbx_host_classes/src/ux_host_class_storage_device_initialize.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_storage_device_initialize PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -79,6 +79,10 @@ /* added option to disable FX */ /* media integration, */ /* resulting in version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed logic of creating */ +/* multiple storage media, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ UINT _ux_host_class_storage_device_initialize(UX_HOST_CLASS_STORAGE *storage) @@ -159,7 +163,9 @@ UINT inst_index; { case UX_HOST_CLASS_STORAGE_MEDIA_FAT_DISK: + /* Fall through. */ case UX_HOST_CLASS_STORAGE_MEDIA_OPTICAL_DISK: + /* Fall through. */ case UX_HOST_CLASS_STORAGE_MEDIA_IOMEGA_CLICK: #if !defined(UX_HOST_CLASS_STORAGE_NO_FILEX) @@ -186,25 +192,28 @@ UINT inst_index; storage_media ++, inst_index++) { - /* Skip used storage media slots. */ - if (storage_media -> ux_host_class_storage_media_storage != UX_NULL) - continue; + /* Find an unused storage media slot. */ + if (storage_media -> ux_host_class_storage_media_storage == UX_NULL) + { - /* Use this free storage media slot. */ - storage_media -> ux_host_class_storage_media_storage = storage; + /* Use this free storage media slot. */ + storage_media -> ux_host_class_storage_media_storage = storage; - /* Save media information. */ - storage_media -> ux_host_class_storage_media_lun = (UCHAR)storage -> ux_host_class_storage_lun; - storage_media -> ux_host_class_storage_media_sector_size = (USHORT)storage -> ux_host_class_storage_sector_size; - storage_media -> ux_host_class_storage_media_number_sectors = storage -> ux_host_class_storage_last_sector_number + 1; + /* Save media information. */ + storage_media -> ux_host_class_storage_media_lun = (UCHAR)storage -> ux_host_class_storage_lun; + storage_media -> ux_host_class_storage_media_sector_size = (USHORT)storage -> ux_host_class_storage_sector_size; + storage_media -> ux_host_class_storage_media_number_sectors = storage -> ux_host_class_storage_last_sector_number + 1; - /* Invoke callback for media insertion. */ - if (_ux_system_host -> ux_system_host_change_function != UX_NULL) - { + /* Invoke callback for media insertion. */ + if (_ux_system_host -> ux_system_host_change_function != UX_NULL) + { - /* Call system change function. */ - _ux_system_host -> ux_system_host_change_function(UX_STORAGE_MEDIA_INSERTION, - storage -> ux_host_class_storage_class, (VOID *) storage_media); + /* Call system change function. */ + _ux_system_host -> ux_system_host_change_function(UX_STORAGE_MEDIA_INSERTION, + storage -> ux_host_class_storage_class, (VOID *) storage_media); + } + + break; } } #endif diff --git a/common/usbx_host_classes/src/ux_host_class_storage_media_get.c b/common/usbx_host_classes/src/ux_host_class_storage_media_get.c index 86b3281..0e35ebc 100644 --- a/common/usbx_host_classes/src/ux_host_class_storage_media_get.c +++ b/common/usbx_host_classes/src/ux_host_class_storage_media_get.c @@ -36,7 +36,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_storage_media_get PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -68,6 +68,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed spelling error, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ UINT _ux_host_class_storage_media_get(UX_HOST_CLASS_STORAGE *storage, @@ -89,10 +92,10 @@ UINT scan_index, found_index; /* Get storage class instance. */ class_inst = storage -> ux_host_class_storage_class; - /* Get shared storage medias array. */ + /* Get shared storage media array. */ storage_medias = (UX_HOST_CLASS_STORAGE_MEDIA *)class_inst -> ux_host_class_media; - /* Search medias to find the right one. */ + /* Search media to find the right one. */ for(scan_index = 0, found_index = 0; scan_index < UX_HOST_CLASS_STORAGE_MAX_MEDIA; scan_index ++) diff --git a/common/usbx_host_classes/src/ux_host_class_video_entities_parse.c b/common/usbx_host_classes/src/ux_host_class_video_entities_parse.c index 372f9f3..e628c6f 100644 --- a/common/usbx_host_classes/src/ux_host_class_video_entities_parse.c +++ b/common/usbx_host_classes/src/ux_host_class_video_entities_parse.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _ux_host_class_video_entities_parse PORTABLE C */ -/* 6.1 */ +/* 6.1.8 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -79,6 +79,9 @@ /* DATE NAME DESCRIPTION */ /* */ /* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */ +/* 08-02-2021 Wen Wang Modified comment(s), */ +/* fixed spelling error, */ +/* resulting in version 6.1.8 */ /* */ /**************************************************************************/ UINT _ux_host_class_video_entities_parse(UX_HOST_CLASS_VIDEO *video, @@ -133,7 +136,7 @@ UINT status; if (descriptor[5] == UX_HOST_CLASS_VIDEO_CLASS) { - /* VideoControl Inteface. */ + /* VideoControl Interface. */ if (descriptor[6] == UX_HOST_CLASS_VIDEO_SUBCLASS_CONTROL) /* Mark we have found it. */ |