Skip to content

Commit b693cdd

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.11
1 parent 388e973 commit b693cdd

File tree

237 files changed

+8816
-591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+8816
-591
lines changed

‎common/core/inc/ux_api.h‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* ux_api.h PORTABLE C */
29-
/* 6.1.10 */
29+
/* 6.1.11 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -110,6 +110,11 @@
110110
/* added some general errors, */
111111
/* added printer trace IDs, */
112112
/* resulting in version 6.1.10 */
113+
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
114+
/* assumed OS types to avoid */
115+
/* standalone compiling error, */
116+
/* added CCID trace IDs, */
117+
/* resulting in version 6.1.11 */
113118
/* */
114119
/**************************************************************************/
115120

@@ -277,7 +282,7 @@ typedef signed char SCHAR;
277282
#define AZURE_RTOS_USBX
278283
#define USBX_MAJOR_VERSION 6
279284
#define USBX_MINOR_VERSION 1
280-
#define USBX_PATCH_VERSION 10
285+
#define USBX_PATCH_VERSION 11
281286

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

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

772+
#define UX_TRACE_DEVICE_CLASS_CCID_ACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 110) /* I1 = class instance */
773+
#define UX_TRACE_DEVICE_CLASS_CCID_DEACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 111) /* I1 = class instance */
774+
#define UX_TRACE_DEVICE_CLASS_CCID_REQ_ABORT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 112) /* I1 = class instance , I2 = slot */
775+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_POWER_ON (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 113) /* I1 = class instance , I2 = slot */
776+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_POWER_OFF (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 114) /* I1 = class instance , I2 = slot */
777+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_GET_SLOT_STATUS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 115) /* I1 = class instance , I2 = slot */
778+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_XFR_BLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 116) /* I1 = class instance , I2 = slot */
779+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_GET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 117) /* I1 = class instance , I2 = slot */
780+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_RESET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 118) /* I1 = class instance , I2 = slot */
781+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SET_PARAMETERS (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 119) /* I1 = class instance , I2 = slot */
782+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ESCAPE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 120) /* I1 = class instance , I2 = slot */
783+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ICC_CLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 121) /* I1 = class instance , I2 = slot */
784+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_T0_APDU (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 122) /* I1 = class instance , I2 = slot */
785+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SECURE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 123) /* I1 = class instance , I2 = slot */
786+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_MECHANICAL (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 124) /* I1 = class instance , I2 = slot */
787+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_ABORT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 125) /* I1 = class instance , I2 = slot */
788+
#define UX_TRACE_DEVICE_CLASS_CCID_PC_TO_RDR_SET_RATE_CLOCK (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 126) /* I1 = class instance , I2 = slot */
789+
#define UX_TRACE_DEVICE_CLASS_CCID_RDR_TO_PC_RESPONSE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 127) /* I1 = class instance , I2 = slot */
790+
#define UX_TRACE_DEVICE_CLASS_CCID_ICC_INSERT (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 128) /* I1 = class instance , I2 = slot */
791+
#define UX_TRACE_DEVICE_CLASS_CCID_ICC_REMOVE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 129) /* I1 = class instance , I2 = slot */
792+
#define UX_TRACE_DEVICE_CLASS_CCID_AUTO_SEQ_START (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 130) /* I1 = class instance , I2 = slot */
793+
#define UX_TRACE_DEVICE_CLASS_CCID_AUTO_SEQ_STOP (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 131) /* I1 = class instance , I2 = slot */
794+
#define UX_TRACE_DEVICE_CLASS_CCID_TIME_EXTENSION (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 132) /* I1 = class instance , I2 = slot , I3 = time */
795+
#define UX_TRACE_DEVICE_CLASS_CCID_HARDWARE_ERROR (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 133) /* I1 = class instance , I2 = slot */
796+
797+
767798
/* Define the USBX Error Event. */
768799

769800
#define UX_TRACE_ERROR 999
@@ -858,12 +889,16 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
858889
#ifndef UX_TIMER
859890
#ifdef TX_API_H
860891
#define UX_TIMER TX_TIMER
892+
#else
893+
#define UX_TIMER VOID* /* Dummy type for standalone compile. */
861894
#endif
862895
#endif
863896

864897
#ifndef UX_THREAD
865898
#ifdef TX_API_H
866899
#define UX_THREAD TX_THREAD
900+
#else
901+
#define UX_THREAD VOID* /* Dummy type for standalone compile. */
867902
#endif
868903
#endif
869904

@@ -933,6 +968,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
933968
#ifndef UX_SEMAPHORE
934969
#ifdef TX_API_H
935970
#define UX_SEMAPHORE TX_SEMAPHORE
971+
#else
972+
#define UX_SEMAPHORE VOID* /* Dummy type for standalone compile. */
936973
#endif
937974
#endif
938975

@@ -942,6 +979,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
942979
#ifndef UX_MUTEX
943980
#ifdef TX_API_H
944981
#define UX_MUTEX TX_MUTEX
982+
#else
983+
#define UX_MUTEX VOID* /* Dummy type for standalone compile. */
945984
#endif
946985
#endif
947986

@@ -951,6 +990,8 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
951990
#ifndef UX_EVENT_FLAGS_GROUP
952991
#ifdef TX_API_H
953992
#define UX_EVENT_FLAGS_GROUP TX_EVENT_FLAGS_GROUP
993+
#else
994+
#define UX_EVENT_FLAGS_GROUP VOID* /* Dummy type for standalone compile. */
954995
#endif
955996
#endif
956997

‎common/core/inc/ux_system.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* ux_system.h PORTABLE C */
29-
/* 6.1.10 */
29+
/* 6.1.11 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -50,6 +50,9 @@
5050
/* added standalone support, */
5151
/* added device printer name, */
5252
/* resulting in version 6.1.10 */
53+
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
54+
/* added device CCID name, */
55+
/* resulting in version 6.1.11 */
5356
/* */
5457
/**************************************************************************/
5558

@@ -145,6 +148,7 @@ extern UCHAR _ux_system_slave_class_cdc_ecm_name[];
145148
extern UCHAR _ux_system_slave_class_dfu_name[];
146149

147150
extern UCHAR _ux_system_device_class_printer_name[];
151+
extern UCHAR _ux_system_device_class_ccid_name[];
148152

149153
#if defined(UX_HOST_SIDE_ONLY)
150154
#define _ux_system_host_tasks_run _ux_host_stack_tasks_run

‎common/core/inc/ux_utility.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* ux_utility.h PORTABLE C */
29-
/* 6.1.10 */
29+
/* 6.1.11 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -50,6 +50,9 @@
5050
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
5151
/* added standalone support, */
5252
/* resulting in version 6.1.10 */
53+
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
54+
/* fixed standalone compile, */
55+
/* resulting in version 6.1.11 */
5356
/* */
5457
/**************************************************************************/
5558

@@ -186,6 +189,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
186189
#if !defined(UX_DEVICE_STANDALONE)
187190
#define _ux_device_thread_create _ux_utility_thread_create
188191
#define _ux_device_thread_delete _ux_utility_thread_delete
192+
#define _ux_device_thread_entry(t) ((t)->tx_thread_entry)
189193
#define _ux_device_thread_suspend _ux_utility_thread_suspend
190194
#define _ux_device_thread_resume _ux_utility_thread_resume
191195
#define _ux_device_thread_relinquish _ux_utility_thread_relinquish
@@ -206,6 +210,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
206210
#else
207211
#define _ux_device_thread_create(t,name,entry,entry_param,stack,stack_size,priority,preempt_threshold,time_slice,auto_start) (UX_SUCCESS)
208212
#define _ux_device_thread_delete(t) do{}while(0)
213+
#define _ux_device_thread_entry(t) ((UX_THREAD_ENTRY)t)
209214
#define _ux_device_thread_suspend(t) do{}while(0)
210215
#define _ux_device_thread_resume(t) do{}while(0)
211216
#define _ux_device_thread_relinquish(t) do{}while(0)
@@ -230,6 +235,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
230235
#define _ux_host_thread_create _ux_utility_thread_create
231236
#define _ux_host_thread_created(thr) ((thr)->tx_thread_id != 0)
232237
#define _ux_host_thread_delete _ux_utility_thread_delete
238+
#define _ux_host_thread_entry(thr) ((thr)->tx_thread_entry)
233239
#define _ux_host_thread_resume _ux_utility_thread_resume
234240
#define _ux_host_thread_sleep _ux_utility_thread_sleep
235241
#define _ux_host_thread_schedule_other _ux_utility_thread_schedule_other
@@ -255,6 +261,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
255261
#define _ux_host_thread_create(t,name,entry,entry_param,stack,stack_size,priority,preempt_threshold,time_slice,auto_start) (UX_SUCCESS)
256262
#define _ux_host_thread_created(t) (UX_FALSE)
257263
#define _ux_host_thread_delete(t) do{}while(0)
264+
#define _ux_host_thread_entry(thr) (UX_NULL)
258265
#define _ux_host_thread_resume(t) do{}while(0)
259266
#define _ux_host_thread_sleep(t) do{}while(0)
260267
#define _ux_host_thread_schedule_other(t) do{}while(0)
@@ -266,7 +273,7 @@ extern ALIGN_TYPE _ux_utility_time_elapsed(ALIGN_TYPE, ALIGN_TYPE);
266273
#define _ux_host_semaphore_get_norc(sem,t) do{}while(0)
267274
#define _ux_host_semaphore_put(sem) do{}while(0)
268275
#define _ux_host_semaphore_put_rc(sem) (UX_SUCCESS)
269-
#define _ux_host_mutex_create(mutex,name) do{}while(0)
276+
#define _ux_host_mutex_create(mutex,name) (UX_SUCCESS)
270277
#define _ux_host_mutex_delete(mutex) do{}while(0)
271278
#define _ux_host_mutex_off(mutex) do{}while(0)
272279
#define _ux_host_mutex_on(mutex) do{}while(0)

‎common/core/src/ux_device_stack_descriptor_send.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/* FUNCTION RELEASE */
4141
/* */
4242
/* _ux_device_stack_descriptor_send PORTABLE C */
43-
/* 6.1.3 */
43+
/* 6.1.11 */
4444
/* AUTHOR */
4545
/* */
4646
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -85,6 +85,9 @@
8585
/* 12-31-2020 Chaoqiong Xiao Modified comment(s), */
8686
/* added BOS support, */
8787
/* resulting in version 6.1.3 */
88+
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
89+
/* internal clean up, */
90+
/* resulting in version 6.1.11 */
8891
/* */
8992
/**************************************************************************/
9093
UINT _ux_device_stack_descriptor_send(ULONG descriptor_type, ULONG request_index, ULONG host_length)
@@ -104,7 +107,7 @@ UCHAR *device_framework;
104107
UCHAR *device_framework_end;
105108
ULONG device_framework_length;
106109
ULONG descriptor_length;
107-
ULONG target_descriptor_length;
110+
ULONG target_descriptor_length = 0;
108111
UINT status = UX_ERROR;
109112
ULONG length;
110113
UCHAR *string_memory;

‎common/core/src/ux_device_stack_initialize.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ UCHAR _ux_system_slave_class_dfu_name[] = "ux_
4343
UCHAR _ux_system_slave_class_audio_name[] = "ux_slave_class_audio";
4444

4545
UCHAR _ux_system_device_class_printer_name[] = "ux_device_class_printer";
46+
UCHAR _ux_system_device_class_ccid_name[] = "ux_device_class_ccid";
47+
UCHAR _ux_system_device_class_video_name[] = "ux_device_class_video";
4648

4749
/* Define USBX Host variable. */
4850
UX_SYSTEM_SLAVE *_ux_system_slave;
@@ -52,7 +54,7 @@ UX_SYSTEM_SLAVE *_ux_system_slave;
5254
/* FUNCTION RELEASE */
5355
/* */
5456
/* _ux_device_stack_initialize PORTABLE C */
55-
/* 6.1.10 */
57+
/* 6.1.11 */
5658
/* AUTHOR */
5759
/* */
5860
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -103,6 +105,10 @@ UX_SYSTEM_SLAVE *_ux_system_slave;
103105
/* added standalone support, */
104106
/* added printer support, */
105107
/* resulting in version 6.1.10 */
108+
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
109+
/* added CCID support, */
110+
/* added video support, */
111+
/* resulting in version 6.1.11 */
106112
/* */
107113
/**************************************************************************/
108114
UINT _ux_device_stack_initialize(UCHAR * device_framework_high_speed, ULONG device_framework_length_high_speed,

0 commit comments

Comments
 (0)