Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add missing free allocated memory for device classes, fix typo #159

Merged
merged 3 commits into from
Dec 12, 2024
+1,076 −632
Merged

add missing free allocated memory for device classes, fix typo #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4595e3
add missing free allocated memory for device classes, fix typo
ayedm1 Mar 22, 2024
46eca00
Merge branch 'master' into add_usbx_classes_free_memory_allocated
ayedm1 Nov 29, 2024
13b1909
Merge branch 'master' into add_usbx_classes_free_memory_allocated
ayedm1 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions common/usbx_device_classes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ target_sources(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_dfu_state_sync.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_dfu_tasks_run.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_dfu_thread.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_dfu_uninitialize.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_hid_activate.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_hid_control_request.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_hid_deactivate.c
Expand Down Expand Up @@ -145,6 +146,7 @@ target_sources(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_pima_storage_id_send.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_pima_storage_info_get.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_pima_thread.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_pima_uninitialize.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_printer_activate.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_printer_control_request.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_printer_deactivate.c
Expand All @@ -170,6 +172,7 @@ target_sources(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_rndis_msg_query.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_rndis_msg_reset.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_rndis_msg_set.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_rndis_uninitialize.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_rndis_write.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_storage_activate.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_device_class_storage_control_request.c
Expand Down
67 changes: 36 additions & 31 deletions common/usbx_device_classes/inc/ux_device_class_dfu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
*
* This program and the accompanying materials are made available under the
* terms of the MIT License which is available at
* https://opensource.org/licenses/MIT.
*
*
* SPDX-License-Identifier: MIT
**************************************************************************/

/**************************************************************************/
/**************************************************************************/
/** */
/** USBX Component */
/** */
/** USBX Component */
/** */
/** DFU Class */
/** */
/**************************************************************************/
/**************************************************************************/

/**************************************************************************/
/* */
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_device_class_dfu.h PORTABLE C */
/* 6.3.0 */
/**************************************************************************/
/* */
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_device_class_dfu.h PORTABLE C */
/* 6.x */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* This file defines the equivalences for the USBX Device Class DFU */
/* ACM component. */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* */
/* This file defines the equivalences for the USBX Device Class DFU */
/* ACM component. */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* used UX prefix to refer to */
Expand All @@ -62,29 +62,33 @@
/* 10-31-2023 Yajun xia Modified comment(s), */
/* added error checks support, */
/* resulting in version 6.3.0 */
/* xx-xx-xxxx Mohamed ayed Modified comment(s), */
/* added dfu deinit function, */
/* remove extra spaces, */
/* resulting in version 6.x */
/* */
/**************************************************************************/

#ifndef UX_DEVICE_CLASS_DFU_H
#define UX_DEVICE_CLASS_DFU_H

/* Determine if a C++ compiler is being used. If so, ensure that standard
C is used to process the API information. */
/* Determine if a C++ compiler is being used. If so, ensure that standard
C is used to process the API information. */

#ifdef __cplusplus
#ifdef __cplusplus

/* Yes, C++ compiler is present. Use standard C. */
extern "C" {
/* Yes, C++ compiler is present. Use standard C. */
extern "C" {

#endif
#endif

/* Internal option: enable the basic USBX error checking. This define is typically used
while debugging application. */
#if defined(UX_ENABLE_ERROR_CHECKING) && !defined(UX_DEVICE_CLASS_DFU_ENABLE_ERROR_CHECKING)
#define UX_DEVICE_CLASS_DFU_ENABLE_ERROR_CHECKING
#endif

/* Define DFU class descriptor capabilities. */
/* Define DFU class descriptor capabilities. */
#define UX_SLAVE_CLASS_DFU_CAPABILITY_WILL_DETACH 0x08
#define UX_SLAVE_CLASS_DFU_CAPABILITY_MANIFESTATION_TOLERANT 0x04
#define UX_SLAVE_CLASS_DFU_CAPABILITY_CAN_UPLOAD 0x02
Expand Down Expand Up @@ -187,7 +191,7 @@ extern "C" {
/* Define DFU application notification signals. */
#define UX_SLAVE_CLASS_DFU_MEDIA_STATUS_OK 0
#define UX_SLAVE_CLASS_DFU_MEDIA_STATUS_BUSY 1
#define UX_SLAVE_CLASS_DFU_MEDIA_STATUS_ERROR 2
#define UX_SLAVE_CLASS_DFU_MEDIA_STATUS_ERROR 2

/* Define DFU thread event signals. */
#define UX_DEVICE_CLASS_DFU_THREAD_EVENT_DISCONNECT 0x1u
Expand Down Expand Up @@ -257,6 +261,7 @@ UINT _ux_device_class_dfu_deactivate(UX_SLAVE_CLASS_COMMAND *command);
UINT _ux_device_class_dfu_entry(UX_SLAVE_CLASS_COMMAND *command);
UINT _ux_device_class_dfu_initialize(UX_SLAVE_CLASS_COMMAND *command);
VOID _ux_device_class_dfu_thread(ULONG dfu_class);
UINT _ux_device_class_dfu_uninitialize(UX_SLAVE_CLASS_COMMAND *command);

UCHAR _ux_device_class_dfu_state_get(UX_SLAVE_CLASS_DFU *dfu);
VOID _ux_device_class_dfu_state_sync(UX_SLAVE_CLASS_DFU *dfu);
Expand All @@ -270,10 +275,10 @@ UINT _uxe_device_class_dfu_initialize(UX_SLAVE_CLASS_COMMAND *command);
#define ux_device_class_dfu_state_get _ux_device_class_dfu_state_get
#define ux_device_class_dfu_state_sync _ux_device_class_dfu_state_sync

/* Determine if a C++ compiler is being used. If so, complete the standard
C conditional started above. */
/* Determine if a C++ compiler is being used. If so, complete the standard
C conditional started above. */
#ifdef __cplusplus
}
#endif
}
#endif

#endif /* UX_DEVICE_CLASS_DFU_H */
Loading
Loading