Skip to content

Some PIMA functions returns != UX_SUCCESS even when success #196

New issue

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

#

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

Already on GitHub? # to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Some PIMA functions returns != UX_SUCCESS even when success #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions common/usbx_device_classes/src/ux_device_class_pima_object_info_send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,18 @@ ULONG object_handle;
/* Send the object to the application. */
status = pima -> ux_device_class_pima_object_info_send(pima, object, storage_id, parent_object_handle, &object_handle);

/* Now we return a response with success. */
status = (status == UX_SUCCESS) ? UX_DEVICE_CLASS_PIMA_RC_OK : status;
_ux_device_class_pima_response_send(pima, status, 3, pima -> ux_device_class_pima_storage_id,
if (status != UX_SUCCESS)
{
/* Now we return a response with error. */
_ux_device_class_pima_response_send(pima, status, 3, pima -> ux_device_class_pima_storage_id,
object -> ux_device_class_pima_object_parent_object, object_handle);
}
else
{
/* Now we return a response with success. */
_ux_device_class_pima_response_send(pima, UX_DEVICE_CLASS_PIMA_RC_OK, 3, pima -> ux_device_class_pima_storage_id,
object -> ux_device_class_pima_object_parent_object, object_handle);
}

/* Store the object handle. It will be used for the OBJECT_SEND command. */
pima -> ux_device_class_pima_current_object_handle = object_handle;
Expand Down
14 changes: 10 additions & 4 deletions common/usbx_device_classes/src/ux_device_class_pima_object_references_set.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,16 @@ ULONG object_references_length;

/* Send the object references to the application. */
status = pima -> ux_device_class_pima_object_references_set(pima, object_handle, object_references, object_references_length);

/* Now we return a response with success. */
status = (status == UX_SUCCESS) ? UX_DEVICE_CLASS_PIMA_RC_OK : status;
_ux_device_class_pima_response_send(pima, status, 0, 0, 0, 0);

/* Check error code from application. */
if (status == UX_SUCCESS)

/* Now we return a response with success. */
_ux_device_class_pima_response_send(pima, UX_DEVICE_CLASS_PIMA_RC_OK, 0, 0, 0, 0);
else

/* We return an error. The code is passed by the application. */
_ux_device_class_pima_response_send(pima, status, 0, 0, 0, 0);

}
else
Expand Down