Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 21:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HDAUDBUS] Return failure from HDA_SendVerbs on a timeout

Browse source 
Addendum to 48b3c61b5d
This commit is contained in:
Victor Perevertkin 2021-01-18 04:02:32 +03:00
parent 497ca54205
commit af0f8581ad
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/wdm/audio/hdaudbus/fdo.cpp
View file

@ -134,7 +134,7 @@ HDA_DpcForIsr(
} }
VOID NTSTATUS
HDA_SendVerbs( HDA_SendVerbs(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PHDA_CODEC_ENTRY Codec, IN PHDA_CODEC_ENTRY Codec,
@ -188,13 +188,15 @@ HDA_SendVerbs(
if (waitStatus == STATUS_TIMEOUT) if (waitStatus == STATUS_TIMEOUT)
{ {
DPRINT1("HDA_SendVerbs: timeout! Queued: %u\n", Queued); DPRINT1("HDA_SendVerbs: timeout! Queued: %u\n", Queued);
break; return STATUS_INVALID_DEVICE_REQUEST;
} }
} }
if (Responses != NULL) { if (Responses != NULL) {
memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG)); memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG));
} }
return STATUS_SUCCESS;
} }
NTSTATUS NTSTATUS
@ -234,7 +236,13 @@ HDA_InitCodec(
verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_SUB_NODE_COUNT); verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_SUB_NODE_COUNT);
/* get basic info */ /* get basic info */
HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3); Status = HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3);
if (!NT_SUCCESS(Status))
{
FreeItem(Entry);
DeviceExtension->Codecs[codecAddress] = NULL;
return Status;
}
/* store codec details */ /* store codec details */
Entry->Major = Response.major; Entry->Major = Response.major;
@ -252,10 +260,13 @@ HDA_InitCodec(
/* get function type */ /* get function type */
verbs[0] = MAKE_VERB(codecAddress, NodeId, VID_GET_PARAMETER, PID_FUNCTION_GROUP_TYPE); verbs[0] = MAKE_VERB(codecAddress, NodeId, VID_GET_PARAMETER, PID_FUNCTION_GROUP_TYPE);
HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1); Status = HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1);
DPRINT1("NodeId %u GroupType %x\n", NodeId, GroupType); DPRINT1("Status %x NodeId %u GroupType %x\n", Status, NodeId, GroupType);
if ((GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) {
if (NT_SUCCESS(Status) &&
(GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO)
{
if (Entry->AudioGroupCount >= HDA_MAX_AUDIO_GROUPS) if (Entry->AudioGroupCount >= HDA_MAX_AUDIO_GROUPS)
{ {
DPRINT1("Too many audio groups in node %u. Skipping.\n", NodeId); DPRINT1("Too many audio groups in node %u. Skipping.\n", NodeId);

2
drivers/wdm/audio/hdaudbus/hdaudbus.h
View file

@ -139,7 +139,7 @@ HDA_FDOQueryBusRelations(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp); IN PIRP Irp);
VOID NTSTATUS
HDA_SendVerbs( HDA_SendVerbs(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PHDA_CODEC_ENTRY Codec, IN PHDA_CODEC_ENTRY Codec,