Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-23 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

unload audiodxe before system start

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-06-18 19:08:00 +03:00
parent 9be63c456d
commit 109d1f581c
9 changed files with 1249 additions and 1228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Drivers/AudioDxe/AudioDxe.c
View File

@ -52,7 +52,8 @@ EFI_STATUS
EFIAPI
AudioDxeInit(
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable) {
IN EFI_SYSTEM_TABLE *SystemTable)
{
DEBUG((DEBUG_INFO, "Starting AudioDxe...\n"));
// Create variables.

2059
Drivers/AudioDxe/HdaCodec/HdaCodec.c
View File

File diff suppressed because it is too large Load Diff

35
Drivers/AudioDxe/HdaCodec/HdaCodecAudioIo.c
View File

@ -589,24 +589,25 @@ HdaCodecAudioIoStartPlaybackAsync(
EFI_STATUS
EFIAPI
HdaCodecAudioIoStopPlayback(
IN EFI_AUDIO_IO_PROTOCOL *This) {
DEBUG((DEBUG_INFO, "HdaCodecAudioIoStopPlayback(): start\n"));
// Create variables.
AUDIO_IO_PRIVATE_DATA *AudioIoPrivateData;
EFI_HDA_IO_PROTOCOL *HdaIo;
// If a parameter is invalid, return error.
if (This == NULL)
return EFI_INVALID_PARAMETER;
// Get private data.
AudioIoPrivateData = AUDIO_IO_PRIVATE_DATA_FROM_THIS(This);
IN EFI_AUDIO_IO_PROTOCOL *This)
{
DEBUG((DEBUG_INFO, "HdaCodecAudioIoStopPlayback(): start\n"));
// Create variables.
AUDIO_IO_PRIVATE_DATA *AudioIoPrivateData;
EFI_HDA_IO_PROTOCOL *HdaIo;
// If a parameter is invalid, return error.
if (This == NULL)
return EFI_INVALID_PARAMETER;
// Get private data.
AudioIoPrivateData = AUDIO_IO_PRIVATE_DATA_FROM_THIS(This);
if (!AudioIoPrivateData || !AudioIoPrivateData->HdaCodecDev || !AudioIoPrivateData->HdaCodecDev->HdaIo) {
return EFI_NOT_FOUND;
}
HdaIo = AudioIoPrivateData->HdaCodecDev->HdaIo;
// Stop stream.
return HdaIo->StopStream(HdaIo, EfiHdaIoTypeOutput);
HdaIo = AudioIoPrivateData->HdaCodecDev->HdaIo;
// Stop stream.
return HdaIo->StopStream(HdaIo, EfiHdaIoTypeOutput);
}

341
Drivers/AudioDxe/HdaController/HdaController.c
View File

@ -216,45 +216,45 @@ EFIAPI
HdaControllerReset(
IN HDA_CONTROLLER_DEV *HdaControllerDev)
{
// DEBUG((DEBUG_INFO, "HdaControllerReset(): start\n"));
// Create variables.
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo = HdaControllerDev->PciIo;
UINT32 HdaGCtl = 0;
UINT64 Tmp = 0;
// Get value of CRST bit.
Status = PciIo->Mem.Read(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL, 1, &HdaGCtl);
if (EFI_ERROR(Status))
return Status;
// Check if the controller is already in reset. If not, clear bit.
if (!(HdaGCtl & HDA_REG_GCTL_CRST)) {
HdaGCtl &= ~HDA_REG_GCTL_CRST;
Status = PciIo->Mem.Write(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL, 1, &HdaGCtl);
if (EFI_ERROR(Status))
return Status;
}
// Set CRST bit to begin the process of coming out of reset.
HdaGCtl |= HDA_REG_GCTL_CRST;
// DEBUG((DEBUG_INFO, "HdaControllerReset(): start\n"));
// Create variables.
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo = HdaControllerDev->PciIo;
UINT32 HdaGCtl = 0;
UINT64 Tmp = 0;
// Get value of CRST bit.
Status = PciIo->Mem.Read(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL, 1, &HdaGCtl);
if (EFI_ERROR(Status))
return Status;
// Check if the controller is already in reset. If not, clear bit.
if (!(HdaGCtl & HDA_REG_GCTL_CRST)) {
HdaGCtl &= ~HDA_REG_GCTL_CRST;
Status = PciIo->Mem.Write(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL, 1, &HdaGCtl);
if (EFI_ERROR(Status))
return Status;
// Wait for bit to be set. Once bit is set, the controller is ready.
Status = PciIo->PollMem(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL,
HDA_REG_GCTL_CRST, HDA_REG_GCTL_CRST, MS_TO_NANOSECOND(100), &Tmp);
if (EFI_ERROR(Status))
return Status;
// Wait 100ms to ensure all codecs have also reset.
gBS->Stall(MS_TO_MICROSECOND(100));
// Controller is reset.
// DEBUG((DEBUG_INFO, "HdaControllerReset(): done\n"));
return EFI_SUCCESS;
return Status;
}
// Set CRST bit to begin the process of coming out of reset.
HdaGCtl |= HDA_REG_GCTL_CRST;
Status = PciIo->Mem.Write(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL, 1, &HdaGCtl);
if (EFI_ERROR(Status))
return Status;
// Wait for bit to be set. Once bit is set, the controller is ready.
Status = PciIo->PollMem(PciIo, EfiPciIoWidthUint32, PCI_HDA_BAR, HDA_REG_GCTL,
HDA_REG_GCTL_CRST, HDA_REG_GCTL_CRST, MS_TO_NANOSECOND(100), &Tmp);
if (EFI_ERROR(Status))
return Status;
// Wait 100ms to ensure all codecs have also reset.
gBS->Stall(MS_TO_MICROSECOND(100));
// Controller is reset.
// DEBUG((DEBUG_INFO, "HdaControllerReset(): done\n"));
return EFI_SUCCESS;
}
EFI_STATUS
@ -262,141 +262,142 @@ EFIAPI
HdaControllerScanCodecs(
IN HDA_CONTROLLER_DEV *HdaControllerDev)
{
// DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): start\n"));
// Create variables.
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo;
UINT16 HdaStatests = 0;
EFI_HDA_IO_VERB_LIST HdaCodecVerbList;
UINT32 VendorVerb;
UINT32 VendorResponse;
UINT8 i;
// Streams.
UINTN CurrentOutputStreamIndex = 0;
UINTN CurrentInputStreamIndex = 0;
// Protocols.
HDA_IO_PRIVATE_DATA *HdaIoPrivateData;
VOID *TmpProtocol;
if (!HdaControllerDev) {
return EFI_INVALID_PARAMETER;
}
PciIo = HdaControllerDev->PciIo;
// Get STATESTS register.
Status = PciIo->Mem.Read(PciIo, EfiPciIoWidthUint16, PCI_HDA_BAR, HDA_REG_STATESTS, 1, &HdaStatests);
if (EFI_ERROR(Status))
return Status;
// Create verb list with single item.
VendorVerb = HDA_CODEC_VERB(HDA_VERB_GET_PARAMETER, HDA_PARAMETER_VENDOR_ID);
SetMem(&HdaCodecVerbList, sizeof(EFI_HDA_IO_VERB_LIST), 0);
HdaCodecVerbList.Count = 1;
HdaCodecVerbList.Verbs = &VendorVerb;
HdaCodecVerbList.Responses = &VendorResponse;
// Iterate through register looking for active codecs.
for (i = 0; i < HDA_MAX_CODECS; i++) {
// Do we have a codec at this address?
if ((HdaStatests & (1 << i))) {
// DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): found codec @ 0x%X\n", i));
// Try to get the vendor ID. If this fails, ignore the codec.
VendorResponse = 0;
Status = HdaControllerSendCommands(HdaControllerDev, i, HDA_NID_ROOT, &HdaCodecVerbList);
if ((EFI_ERROR(Status)) || (VendorResponse == 0))
continue;
// Create HDA I/O protocol private data structure.
HdaIoPrivateData = AllocateZeroPool(sizeof(HDA_IO_PRIVATE_DATA));
if (HdaIoPrivateData == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto FREE_CODECS;
}
// Fill HDA I/O protocol private data structure.
HdaIoPrivateData->Signature = HDA_CONTROLLER_PRIVATE_DATA_SIGNATURE;
HdaIoPrivateData->HdaCodecAddress = i;
HdaIoPrivateData->HdaControllerDev = HdaControllerDev;
HdaIoPrivateData->HdaIo.GetAddress = HdaControllerHdaIoGetAddress;
HdaIoPrivateData->HdaIo.SendCommand = HdaControllerHdaIoSendCommand;
HdaIoPrivateData->HdaIo.SetupStream = HdaControllerHdaIoSetupStream;
HdaIoPrivateData->HdaIo.CloseStream = HdaControllerHdaIoCloseStream;
HdaIoPrivateData->HdaIo.GetStream = HdaControllerHdaIoGetStream;
HdaIoPrivateData->HdaIo.StartStream = HdaControllerHdaIoStartStream;
HdaIoPrivateData->HdaIo.StopStream = HdaControllerHdaIoStopStream;
// Assign output stream.
if (CurrentOutputStreamIndex < HdaControllerDev->OutputStreamsCount) {
// DEBUG((DEBUG_INFO, "Assigning output stream %u to codec\n", CurrentOutputStreamIndex));
HdaIoPrivateData->HdaOutputStream = HdaControllerDev->OutputStreams + CurrentOutputStreamIndex;
CurrentOutputStreamIndex++;
}
// Assign input stream.
if (CurrentInputStreamIndex < HdaControllerDev->InputStreamsCount) {
// DEBUG((DEBUG_INFO, "Assigning input stream %u to codec\n", CurrentInputStreamIndex));
HdaIoPrivateData->HdaInputStream = HdaControllerDev->InputStreams + CurrentInputStreamIndex;
CurrentInputStreamIndex++;
}
// Add to array.
HdaControllerDev->HdaIoChildren[i].PrivateData = HdaIoPrivateData;
}
}
// Clear STATESTS register.
HdaStatests = HDA_REG_STATESTS_CLEAR;
Status = PciIo->Mem.Write(PciIo, EfiPciIoWidthUint16, PCI_HDA_BAR, HDA_REG_STATESTS, 1, &HdaStatests);
if (EFI_ERROR(Status))
return Status;
// Install protocols on each codec.
// DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): start\n"));
for (i = 0; i < HDA_MAX_CODECS; i++) {
// Do we have a codec at this address?
if (HdaControllerDev->HdaIoChildren[i].PrivateData != NULL) {
// Create Device Path for codec.
EFI_HDA_IO_DEVICE_PATH HdaIoDevicePathNode; //EFI_HDA_IO_DEVICE_PATH_TEMPLATE;
HdaIoDevicePathNode.Header.Type = MESSAGING_DEVICE_PATH;
HdaIoDevicePathNode.Header.SubType = MSG_VENDOR_DP;
HdaIoDevicePathNode.Header.Length[0] = (UINT8)(sizeof(EFI_HDA_IO_DEVICE_PATH));
HdaIoDevicePathNode.Header.Length[1] = (UINT8)((sizeof(EFI_HDA_IO_DEVICE_PATH)) >> 8);
HdaIoDevicePathNode.Guid = gEfiHdaIoDevicePathGuid;
// CopyMem((VOID*)&HdaIoDevicePathNode.Guid, (VOID*)&gEfiHdaIoDevicePathGuid, sizeof(EFI_GUID));
HdaIoDevicePathNode.Address = i;
HdaControllerDev->HdaIoChildren[i].DevicePath = AppendDevicePathNode(HdaControllerDev->DevicePath, (EFI_DEVICE_PATH_PROTOCOL*)&HdaIoDevicePathNode);
if (HdaControllerDev->HdaIoChildren[i].DevicePath == NULL) {
Status = EFI_INVALID_PARAMETER;
goto FREE_CODECS;
}
// Install protocols for the codec. The codec driver will later bind to this.
HdaControllerDev->HdaIoChildren[i].Handle = NULL;
Status = gBS->InstallMultipleProtocolInterfaces(&HdaControllerDev->HdaIoChildren[i].Handle,
&gEfiDevicePathProtocolGuid, HdaControllerDev->HdaIoChildren[i].DevicePath,
&gEfiHdaIoProtocolGuid, &HdaControllerDev->HdaIoChildren[i].PrivateData->HdaIo, NULL);
if (EFI_ERROR(Status))
goto FREE_CODECS;
// Connect child to parent.
Status = gBS->OpenProtocol(HdaControllerDev->ControllerHandle, &gEfiPciIoProtocolGuid, &TmpProtocol,
HdaControllerDev->DriverBinding->DriverBindingHandle, HdaControllerDev->HdaIoChildren[i].Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);
if (EFI_ERROR(Status))
goto FREE_CODECS;
}
}
return EFI_SUCCESS;
FREE_CODECS:
//DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): failed to load driver for codec @ 0x%X\n", i));
// Create variables.
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo;
UINT16 HdaStatests = 0;
EFI_HDA_IO_VERB_LIST HdaCodecVerbList;
UINT32 VendorVerb;
UINT32 VendorResponse;
UINT8 i;
// Streams.
UINTN CurrentOutputStreamIndex = 0;
UINTN CurrentInputStreamIndex = 0;
// Protocols.
HDA_IO_PRIVATE_DATA *HdaIoPrivateData;
VOID *TmpProtocol;
if (!HdaControllerDev) {
return EFI_INVALID_PARAMETER;
}
PciIo = HdaControllerDev->PciIo;
// Get STATESTS register.
Status = PciIo->Mem.Read(PciIo, EfiPciIoWidthUint16, PCI_HDA_BAR, HDA_REG_STATESTS, 1, &HdaStatests);
if (EFI_ERROR(Status))
return Status;
// Create verb list with single item.
VendorVerb = HDA_CODEC_VERB(HDA_VERB_GET_PARAMETER, HDA_PARAMETER_VENDOR_ID);
SetMem(&HdaCodecVerbList, sizeof(EFI_HDA_IO_VERB_LIST), 0);
HdaCodecVerbList.Count = 1;
HdaCodecVerbList.Verbs = &VendorVerb;
HdaCodecVerbList.Responses = &VendorResponse;
// Iterate through register looking for active codecs.
for (i = 0; i < HDA_MAX_CODECS; i++) {
// Do we have a codec at this address?
if ((HdaStatests & (1 << i))) {
// DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): found codec @ 0x%X\n", i));
// Try to get the vendor ID. If this fails, ignore the codec.
VendorResponse = 0;
Status = HdaControllerSendCommands(HdaControllerDev, i, HDA_NID_ROOT, &HdaCodecVerbList);
if ((EFI_ERROR(Status)) || (VendorResponse == 0))
continue;
// Create HDA I/O protocol private data structure.
HdaIoPrivateData = AllocateZeroPool(sizeof(HDA_IO_PRIVATE_DATA));
if (HdaIoPrivateData == NULL) {
Status = EFI_OUT_OF_RESOURCES;
goto FREE_CODECS;
}
// Fill HDA I/O protocol private data structure.
HdaIoPrivateData->Signature = HDA_CONTROLLER_PRIVATE_DATA_SIGNATURE;
HdaIoPrivateData->HdaCodecAddress = i;
HdaIoPrivateData->HdaControllerDev = HdaControllerDev;
HdaIoPrivateData->HdaIo.GetAddress = HdaControllerHdaIoGetAddress;
HdaIoPrivateData->HdaIo.SendCommand = HdaControllerHdaIoSendCommand;
HdaIoPrivateData->HdaIo.SetupStream = HdaControllerHdaIoSetupStream;
HdaIoPrivateData->HdaIo.CloseStream = HdaControllerHdaIoCloseStream;
HdaIoPrivateData->HdaIo.GetStream = HdaControllerHdaIoGetStream;
HdaIoPrivateData->HdaIo.StartStream = HdaControllerHdaIoStartStream;
HdaIoPrivateData->HdaIo.StopStream = HdaControllerHdaIoStopStream;
// Assign output stream.
if (CurrentOutputStreamIndex < HdaControllerDev->OutputStreamsCount) {
// DEBUG((DEBUG_INFO, "Assigning output stream %u to codec\n", CurrentOutputStreamIndex));
HdaIoPrivateData->HdaOutputStream = HdaControllerDev->OutputStreams + CurrentOutputStreamIndex;
CurrentOutputStreamIndex++;
}
// Assign input stream.
if (CurrentInputStreamIndex < HdaControllerDev->InputStreamsCount) {
// DEBUG((DEBUG_INFO, "Assigning input stream %u to codec\n", CurrentInputStreamIndex));
HdaIoPrivateData->HdaInputStream = HdaControllerDev->InputStreams + CurrentInputStreamIndex;
CurrentInputStreamIndex++;
}
// Add to array.
HdaControllerDev->HdaIoChildren[i].PrivateData = HdaIoPrivateData;
}
}
// Clear STATESTS register.
HdaStatests = HDA_REG_STATESTS_CLEAR;
Status = PciIo->Mem.Write(PciIo, EfiPciIoWidthUint16, PCI_HDA_BAR, HDA_REG_STATESTS, 1, &HdaStatests);
if (EFI_ERROR(Status)) {
return Status;
}
// Install protocols on each codec.
for (i = 0; i < HDA_MAX_CODECS; i++) {
// Do we have a codec at this address?
if (HdaControllerDev->HdaIoChildren[i].PrivateData != NULL) {
// Create Device Path for codec.
EFI_HDA_IO_DEVICE_PATH HdaIoDevicePathNode; //EFI_HDA_IO_DEVICE_PATH_TEMPLATE;
HdaIoDevicePathNode.Header.Type = MESSAGING_DEVICE_PATH;
HdaIoDevicePathNode.Header.SubType = MSG_VENDOR_DP;
HdaIoDevicePathNode.Header.Length[0] = (UINT8)(sizeof(EFI_HDA_IO_DEVICE_PATH));
HdaIoDevicePathNode.Header.Length[1] = (UINT8)((sizeof(EFI_HDA_IO_DEVICE_PATH)) >> 8);
HdaIoDevicePathNode.Guid = gEfiHdaIoDevicePathGuid;
// CopyMem((VOID*)&HdaIoDevicePathNode.Guid, (VOID*)&gEfiHdaIoDevicePathGuid, sizeof(EFI_GUID));
HdaIoDevicePathNode.Address = i;
HdaControllerDev->HdaIoChildren[i].DevicePath = AppendDevicePathNode(HdaControllerDev->DevicePath, (EFI_DEVICE_PATH_PROTOCOL*)&HdaIoDevicePathNode);
if (HdaControllerDev->HdaIoChildren[i].DevicePath == NULL) {
Status = EFI_INVALID_PARAMETER;
goto FREE_CODECS;
}
// Install protocols for the codec. The codec driver will later bind to this.
HdaControllerDev->HdaIoChildren[i].Handle = NULL;
Status = gBS->InstallMultipleProtocolInterfaces(&HdaControllerDev->HdaIoChildren[i].Handle,
&gEfiDevicePathProtocolGuid, HdaControllerDev->HdaIoChildren[i].DevicePath,
&gEfiHdaIoProtocolGuid, &HdaControllerDev->HdaIoChildren[i].PrivateData->HdaIo, NULL);
if (EFI_ERROR(Status))
goto FREE_CODECS;
// Connect child to parent.
Status = gBS->OpenProtocol(HdaControllerDev->ControllerHandle, &gEfiPciIoProtocolGuid, &TmpProtocol,
HdaControllerDev->DriverBinding->DriverBindingHandle, HdaControllerDev->HdaIoChildren[i].Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);
if (EFI_ERROR(Status))
goto FREE_CODECS;
}
}
return EFI_SUCCESS;
FREE_CODECS:
//DEBUG((DEBUG_INFO, "HdaControllerScanCodecs(): failed to load driver for codec @ 0x%X\n", i));
return Status;
}
EFI_STATUS

2
Drivers/AudioDxe/HdaController/HdaControllerHdaIo.c
View File

@ -134,7 +134,7 @@ HdaControllerHdaIoSetupStream(
UINT16 HdaStreamFormat = 0;
UINT8 HdaStreamId = 0;
EFI_TPL OldTpl = 0;
UINT8 i;
UINT8 i;
// If a parameter is invalid, return error.
if ((This == NULL) || (Type >= EfiHdaIoTypeMaximum) || (StreamId == NULL))

4
Drivers/AudioDxe/HdaController/HdaControllerMem.c
View File

@ -37,7 +37,7 @@ HdaControllerInitCorb(
EFI_PCI_IO_PROTOCOL *PciIo = HdaDev->PciIo;
// HDA register values.
UINT8 HdaCorbSize;
UINT8 HdaCorbSize = 0;
UINT32 HdaLowerCorbBaseAddr;
UINT32 HdaUpperCorbBaseAddr;
UINT16 HdaCorbWp;
@ -197,7 +197,7 @@ HdaControllerSetCorb(
// Create variables.
EFI_STATUS Status;
EFI_PCI_IO_PROTOCOL *PciIo = HdaDev->PciIo;
UINT8 HdaCorbCtl;
UINT8 HdaCorbCtl = 0;
UINT64 Tmp;
// Get current value of CORBCTL.

9
rEFIt_UEFI/Platform/DataHubCpu.cpp
View File

@ -325,11 +325,12 @@ SetVariablesForOSX(LOADER_ENTRY *Entry)
UINT16 DensityThreshold = 0x96;
UINT64 ConfigStatus = 0;
Color = gSettings.DefaultBackgroundColor;
AddNvramVariable(L"DefaultBackgroundColor", &gEfiAppleNvramGuid, Attributes, 4, &Color);
DBG("set DefaultBackgroundColor=0x%x\n", Color);
SetNvramVariable(L"DefaultBackgroundColor", &gEfiAppleNvramGuid, Attributes, 4, &Color);
// add some UI variables
AddNvramVariable(L"ActualDensity", &gEfiAppleBootGuid, Attributes, 2, &ActualDensity);
AddNvramVariable(L"DensityThreshold", &gEfiAppleBootGuid, Attributes, 2, &DensityThreshold);
AddNvramVariable(L"gfx-saved-config-restore-status", &gEfiAppleNvramGuid, Attributes, 8, &ConfigStatus);
SetNvramVariable(L"ActualDensity", &gEfiAppleBootGuid, Attributes, 2, &ActualDensity);
SetNvramVariable(L"DensityThreshold", &gEfiAppleBootGuid, Attributes, 2, &DensityThreshold);
SetNvramVariable(L"gfx-saved-config-restore-status", &gEfiAppleNvramGuid, Attributes, 8, &ConfigStatus);
}
if (gSettings.UIScale == 0x80000000) {

6
rEFIt_UEFI/Platform/StartupSound.cpp
View File

@ -393,8 +393,12 @@ EFI_STATUS CheckSyncSound(BOOLEAN Stop)
Status = HdaIo->GetStream(HdaIo, EfiHdaIoTypeOutput, &StreamRunning);
if ((EFI_ERROR(Status) || Stop) && StreamRunning) {
DBG("stream stopping\n");
DBG("stream stopping & controller reset\n");
HdaIo->StopStream(HdaIo, EfiHdaIoTypeOutput);
// HDA_IO_PRIVATE_DATA *HdaIoPrivateData = HDA_IO_PRIVATE_DATA_FROM_THIS(HdaIo);
// HDA_CONTROLLER_DEV *HdaControllerDev = HdaIoPrivateData->HdaControllerDev;
// EFI_PCI_IO_PROTOCOL *PciIo = HdaControllerDev->PciIo;
// HdaControllerCleanup(HdaControllerDev);
}
if (!StreamRunning) {

18
rEFIt_UEFI/refit/main.cpp
View File

@ -108,6 +108,8 @@ EFI_HANDLE ConsoleInHandle;
EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL* SimpleTextEx;
EFI_KEY_DATA KeyData;
EFI_HANDLE AudioDriverHandle;
CONST CHAR8* AudioOutputNames[] = {
"LineOut",
"Speaker",
@ -831,8 +833,13 @@ VOID LOADER_ENTRY::StartLoader()
}
if (AudioIo) {
// AudioIo->StopPlayback(AudioIo);
CheckSyncSound(true);
AudioIo->StopPlayback(AudioIo);
// CheckSyncSound(true);
EFI_DRIVER_BINDING_PROTOCOL *DriverBinding = NULL;
Status = gBS->HandleProtocol(AudioDriverHandle, &gEfiDriverBindingProtocolGuid, (VOID **)&DriverBinding);
if (DriverBinding) {
DriverBinding->Stop(DriverBinding, AudioDriverHandle, 0, NULL);
}
}
// DBG("Set FakeCPUID: 0x%X\n", gSettings.FakeCPUID);
@ -848,9 +855,9 @@ VOID LOADER_ENTRY::StartLoader()
// which is wrong
// apianti - only block console output if using graphics
// but don't block custom boot logo
if ( LoadOptions.containsIC("-v") ) {
if (LoadOptions.containsIC("-v")) {
Flags = OSFLAG_UNSET(Flags, OSFLAG_USEGRAPHICS);
}
}
}
else if (OSTYPE_IS_WINDOWS(LoaderType)) {
@ -1153,6 +1160,9 @@ static VOID ScanDriverDir(IN CONST CHAR16 *Path, OUT EFI_HANDLE **DriversToConne
if (EFI_ERROR(Status)) {
continue;
}
if (StrStr(FileName, L"AudioDxe") != NULL) {
AudioDriverHandle = DriverHandle;
}
if (StrStr(FileName, L"EmuVariable") != NULL) {
gDriversFlags.EmuVariableLoaded = TRUE;
} else if (StrStr(FileName, L"Video") != NULL) {