diff options
Diffstat (limited to 'common/usbx_host_classes/inc')
| -rw-r--r-- | common/usbx_host_classes/inc/ux_host_class_cdc_ecm.h | 17 | ||||
| -rw-r--r-- | common/usbx_host_classes/inc/ux_host_class_printer.h | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | common/usbx_host_classes/inc/ux_host_class_storage.h | 0 |
3 files changed, 18 insertions, 1 deletions
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 ae5e1c8..f139d03 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 */ +/* 6.1.4 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -46,6 +46,10 @@ /* TX symbols instead of using */ /* them directly, */ /* resulting in version 6.1 */ +/* 02-02-2021 Xiuwen Cai Modified comment(s), added */ +/* compile option for using */ +/* packet pool from NetX, */ +/* resulting in version 6.1.4 */ /* */ /**************************************************************************/ @@ -210,6 +214,12 @@ #define UX_HOST_CLASS_CDC_ECM_PACKET_POOL_WAIT 1000 #endif +/* Define packet pool waiting time in milliseconds. */ + +#ifndef UX_HOST_CLASS_CDC_ECM_PACKET_POOL_INSTANCE_WAIT +#define UX_HOST_CLASS_CDC_ECM_PACKET_POOL_INSTANCE_WAIT 100 +#endif + /* Define CDC_ECM Class instance structure. */ typedef struct UX_HOST_CLASS_CDC_ECM_STRUCT @@ -246,8 +256,13 @@ typedef struct UX_HOST_CLASS_CDC_ECM_STRUCT ULONG ux_host_class_cdc_ecm_link_state; NX_PACKET *ux_host_class_cdc_ecm_xmit_queue_head; NX_PACKET *ux_host_class_cdc_ecm_xmit_queue_tail; +#ifndef UX_HOST_CLASS_CDC_ECM_USE_PACKET_POOL_FROM_NETX NX_PACKET_POOL ux_host_class_cdc_ecm_packet_pool; UCHAR *ux_host_class_cdc_ecm_pool_memory; +#else + NX_PACKET_POOL *ux_host_class_cdc_ecm_packet_pool; +#endif + UCHAR ux_host_class_cdc_ecm_node_id[UX_HOST_CLASS_CDC_ECM_NODE_ID_LENGTH]; VOID (*ux_host_class_cdc_ecm_device_status_change_callback)(struct UX_HOST_CLASS_CDC_ECM_STRUCT *cdc_ecm, ULONG device_state); 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 8caa2eb..933c5ba 100644 --- a/common/usbx_host_classes/inc/ux_host_class_printer.h +++ b/common/usbx_host_classes/inc/ux_host_class_printer.h @@ -103,6 +103,7 @@ UINT _ux_host_class_printer_deactivate(UX_HOST_CLASS_COMMAND *command); UINT _ux_host_class_printer_endpoints_get(UX_HOST_CLASS_PRINTER *printer); UINT _ux_host_class_printer_entry(UX_HOST_CLASS_COMMAND *command); UINT _ux_host_class_printer_name_get(UX_HOST_CLASS_PRINTER *printer); +UINT _ux_host_class_printer_device_id_get(UX_HOST_CLASS_PRINTER *printer, UCHAR *descriptor_buffer, ULONG length); UINT _ux_host_class_printer_read (UX_HOST_CLASS_PRINTER *printer, UCHAR *data_pointer, ULONG requested_length, ULONG *actual_length); UINT _ux_host_class_printer_soft_reset(UX_HOST_CLASS_PRINTER *printer); @@ -114,6 +115,7 @@ UINT _ux_host_class_printer_write(UX_HOST_CLASS_PRINTER *printer, UCHAR * dat #define ux_host_class_printer_activate _ux_host_class_printer_activate #define ux_host_class_printer_name_get _ux_host_class_printer_name_get +#define ux_host_class_printer_device_id_get _ux_host_class_printer_device_id_get #define ux_host_class_printer_read _ux_host_class_printer_read #define ux_host_class_printer_soft_reset _ux_host_class_printer_soft_reset #define ux_host_class_printer_status_get _ux_host_class_printer_status_get 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..977d66c 100644..100755 --- a/common/usbx_host_classes/inc/ux_host_class_storage.h +++ b/common/usbx_host_classes/inc/ux_host_class_storage.h |