Skip to content

Commit

Permalink
Release 6.1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuxin-azrtos
yuxin-azrtos committed Apr 20, 2022
1 parent 388e973 commit b693cdd
Show file tree
Hide file tree
Showing 237 changed files with 8,816 additions and 591 deletions.
45 changes: 43 additions & 2 deletions common/core/inc/ux_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* ux_api.h PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
Expand Down Expand Up @@ -110,6 +110,11 @@
/* added some general errors, */
/* added printer trace IDs, */
/* resulting in version 6.1.10 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* assumed OS types to avoid */
/* standalone compiling error, */
/* added CCID trace IDs, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -277,7 +282,7 @@ typedef signed char SCHAR;
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 1
#define USBX_PATCH_VERSION 10
#define USBX_PATCH_VERSION 11

/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */

Expand Down Expand Up @@ -764,6 +769,32 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#define UX_TRACE_DEVICE_CLASS_PRINTER_READ (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 102) /* I1 = class instance , I2 = buffer , I3 = requested_length */
#define UX_TRACE_DEVICE_CLASS_PRINTER_WRITE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 103) /* I1 = class instance , I2 = buffer , I3 = requested_length */

#define UX_TRACE_DEVICE_CLASS_CCID_ACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 110) /* I1 = class instance */
#define UX_TRACE_DEVICE_CLASS_CCID_DEACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 111) /* I1 = class instance */
#define UX_TRACE_DEVICE_CLASS_CCID_REQ_ABORT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 112) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_POWER_ON (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 113) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_POWER_OFF (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 114) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_GET_SLOT_STATUS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 115) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_XFR_BLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 116) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_GET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 117) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_RESET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 118) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 119) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ESCAPE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 120) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_CLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 121) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_T0_APDU (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 122) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SECURE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 123) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_MECHANICAL (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 124) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ABORT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 125) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SET_RATE_CLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 126) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_RDR_TO_PC_RESPONSE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 127) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_ICC_INSERT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 128) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_ICC_REMOVE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 129) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_AUTO_SEQ_START (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 130) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_AUTO_SEQ_STOP (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 131) /* I1 = class instance , I2 = slot */
#define UX_TRACE_DEVICE_CLASS_CCID_TIME_EXTENSION (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 132) /* I1 = class instance , I2 = slot , I3 = time */
#define UX_TRACE_DEVICE_CLASS_CCID_HARDWARE_ERROR (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 133) /* I1 = class instance , I2 = slot */


/* Define the USBX Error Event. */

#define UX_TRACE_ERROR 999
Expand Down Expand Up @@ -858,12 +889,16 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#ifndef UX_TIMER
#ifdef TX_API_H
#define UX_TIMER TX_TIMER
#else
#define UX_TIMER VOID* /* Dummy type for standalone compile. */
#endif
#endif

#ifndef UX_THREAD
#ifdef TX_API_H
#define UX_THREAD TX_THREAD
#else
#define UX_THREAD VOID* /* Dummy type for standalone compile. */
#endif
#endif

Expand Down Expand Up @@ -933,6 +968,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#ifndef UX_SEMAPHORE
#ifdef TX_API_H
#define UX_SEMAPHORE TX_SEMAPHORE
#else
#define UX_SEMAPHORE VOID* /* Dummy type for standalone compile. */
#endif
#endif

Expand All @@ -942,6 +979,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#ifndef UX_MUTEX
#ifdef TX_API_H
#define UX_MUTEX TX_MUTEX
#else
#define UX_MUTEX VOID* /* Dummy type for standalone compile. */
#endif
#endif

Expand All @@ -951,6 +990,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#ifndef UX_EVENT_FLAGS_GROUP
#ifdef TX_API_H
#define UX_EVENT_FLAGS_GROUP TX_EVENT_FLAGS_GROUP
#else
#define UX_EVENT_FLAGS_GROUP VOID* /* Dummy type for standalone compile. */
#endif
#endif

Expand Down
6 changes: 5 additions & 1 deletion common/core/inc/ux_system.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_system.h PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
Expand All @@ -50,6 +50,9 @@
/* added standalone support, */
/* added device printer name, */
/* resulting in version 6.1.10 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* added device CCID name, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -145,6 +148,7 @@ extern UCHAR _ux_system_slave_class_cdc_ecm_name[];
extern UCHAR _ux_system_slave_class_dfu_name[];

extern UCHAR _ux_system_device_class_printer_name[];
extern UCHAR _ux_system_device_class_ccid_name[];

#if defined(UX_HOST_SIDE_ONLY)
#define _ux_system_host_tasks_run _ux_host_stack_tasks_run
Expand Down
11 changes: 9 additions & 2 deletions common/core/inc/ux_utility.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_utility.h PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
Expand All @@ -50,6 +50,9 @@
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
/* added standalone support, */
/* resulting in version 6.1.10 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* fixed standalone compile, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -186,6 +189,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
#if !defined(UX_DEVICE_STANDALONE)
#define _ux_device_thread_create _ux_utility_thread_create
#define _ux_device_thread_delete _ux_utility_thread_delete
#define _ux_device_thread_entry(t) ((t)->tx_thread_entry)
#define _ux_device_thread_suspend _ux_utility_thread_suspend
#define _ux_device_thread_resume _ux_utility_thread_resume
#define _ux_device_thread_relinquish _ux_utility_thread_relinquish
Expand All @@ -206,6 +210,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
#else
#define _ux_device_thread_create(t,name,entry,entry_param,stack,stack_size,priority,preempt_threshold,time_slice,auto_start) (UX_SUCCESS)
#define _ux_device_thread_delete(t) do{}while(0)
#define _ux_device_thread_entry(t) ((UX_THREAD_ENTRY)t)
#define _ux_device_thread_suspend(t) do{}while(0)
#define _ux_device_thread_resume(t) do{}while(0)
#define _ux_device_thread_relinquish(t) do{}while(0)
Expand All @@ -230,6 +235,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
#define _ux_host_thread_create _ux_utility_thread_create
#define _ux_host_thread_created(thr) ((thr)->tx_thread_id != 0)
#define _ux_host_thread_delete _ux_utility_thread_delete
#define _ux_host_thread_entry(thr) ((thr)->tx_thread_entry)
#define _ux_host_thread_resume _ux_utility_thread_resume
#define _ux_host_thread_sleep _ux_utility_thread_sleep
#define _ux_host_thread_schedule_other _ux_utility_thread_schedule_other
Expand All @@ -255,6 +261,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
#define _ux_host_thread_create(t,name,entry,entry_param,stack,stack_size,priority,preempt_threshold,time_slice,auto_start) (UX_SUCCESS)
#define _ux_host_thread_created(t) (UX_FALSE)
#define _ux_host_thread_delete(t) do{}while(0)
#define _ux_host_thread_entry(thr) (UX_NULL)
#define _ux_host_thread_resume(t) do{}while(0)
#define _ux_host_thread_sleep(t) do{}while(0)
#define _ux_host_thread_schedule_other(t) do{}while(0)
Expand All @@ -266,7 +273,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
#define _ux_host_semaphore_get_norc(sem,t) do{}while(0)
#define _ux_host_semaphore_put(sem) do{}while(0)
#define _ux_host_semaphore_put_rc(sem) (UX_SUCCESS)
#define _ux_host_mutex_create(mutex,name) do{}while(0)
#define _ux_host_mutex_create(mutex,name) (UX_SUCCESS)
#define _ux_host_mutex_delete(mutex) do{}while(0)
#define _ux_host_mutex_off(mutex) do{}while(0)
#define _ux_host_mutex_on(mutex) do{}while(0)
Expand Down
7 changes: 5 additions & 2 deletions common/core/src/ux_device_stack_descriptor_send.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_device_stack_descriptor_send PORTABLE C */
/* 6.1.3 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
Expand Down Expand Up @@ -85,6 +85,9 @@
/* 12-31-2020 Chaoqiong Xiao Modified comment(s), */
/* added BOS support, */
/* resulting in version 6.1.3 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* internal clean up, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
UINT _ux_device_stack_descriptor_send(ULONG descriptor_type, ULONG request_index, ULONG host_length)
Expand All @@ -104,7 +107,7 @@ UCHAR *device_framework;
UCHAR *device_framework_end;
ULONG device_framework_length;
ULONG descriptor_length;
ULONG target_descriptor_length;
ULONG target_descriptor_length = 0;
UINT status = UX_ERROR;
ULONG length;
UCHAR *string_memory;
Expand Down
8 changes: 7 additions & 1 deletion common/core/src/ux_device_stack_initialize.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ UCHAR _ux_system_slave_class_dfu_name[] = "ux_
UCHAR _ux_system_slave_class_audio_name[] = "ux_slave_class_audio";

UCHAR _ux_system_device_class_printer_name[] = "ux_device_class_printer";
UCHAR _ux_system_device_class_ccid_name[] = "ux_device_class_ccid";
UCHAR _ux_system_device_class_video_name[] = "ux_device_class_video";

/* Define USBX Host variable. */
UX_SYSTEM_SLAVE *_ux_system_slave;
Expand All @@ -52,7 +54,7 @@ UX_SYSTEM_SLAVE *_ux_system_slave;
/* FUNCTION RELEASE */
/* */
/* _ux_device_stack_initialize PORTABLE C */
/* 6.1.10 */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
Expand Down Expand Up @@ -103,6 +105,10 @@ UX_SYSTEM_SLAVE *_ux_system_slave;
/* added standalone support, */
/* added printer support, */
/* resulting in version 6.1.10 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* added CCID support, */
/* added video support, */
/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
UINT _ux_device_stack_initialize(UCHAR * device_framework_high_speed, ULONG device_framework_length_high_speed,
Expand Down
Loading

0 comments on commit b693cdd

Please sign in to comment.