/** @file\r
Serial driver for standard UARTS on an ISA bus.\r
\r
-Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
+Copyright (c) 2006 - 2010, Intel Corporation<BR>\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
EFI_STATUS Status;\r
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
EFI_ISA_IO_PROTOCOL *IsaIo;\r
- UART_DEVICE_PATH UartNode;\r
+ UART_DEVICE_PATH *UartNode;\r
\r
//\r
- // Ignore the RemainingDevicePath\r
+ // Check RemainingDevicePath validation\r
//\r
+ if (RemainingDevicePath != NULL) {\r
+ //\r
+ // Check if RemainingDevicePath is the End of Device Path Node, \r
+ // if yes, go on checking other conditions\r
+ //\r
+ if (!IsDevicePathEnd (RemainingDevicePath)) {\r
+ //\r
+ // If RemainingDevicePath isn't the End of Device Path Node,\r
+ // check its validation\r
+ //\r
+ Status = EFI_UNSUPPORTED;\r
+\r
+ UartNode = (UART_DEVICE_PATH *) RemainingDevicePath;\r
+ if (UartNode->Header.Type != MESSAGING_DEVICE_PATH ||\r
+ UartNode->Header.SubType != MSG_UART_DP ||\r
+ sizeof (UART_DEVICE_PATH) != DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) UartNode)\r
+ ) {\r
+ goto Error;\r
+ }\r
+ \r
+ if (UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
+ goto Error;\r
+ }\r
+ \r
+ if (UartNode->Parity < NoParity || UartNode->Parity > SpaceParity) {\r
+ goto Error;\r
+ }\r
+ \r
+ if (UartNode->DataBits < 5 || UartNode->DataBits > 8) {\r
+ goto Error;\r
+ }\r
+ \r
+ if (UartNode->StopBits < OneStopBit || UartNode->StopBits > TwoStopBits) {\r
+ goto Error;\r
+ }\r
+ \r
+ if ((UartNode->DataBits == 5) && (UartNode->StopBits == TwoStopBits)) {\r
+ goto Error;\r
+ }\r
+ \r
+ if ((UartNode->DataBits >= 6) && (UartNode->DataBits <= 8) && (UartNode->StopBits == OneFiveStopBits)) {\r
+ goto Error;\r
+ }\r
+ \r
+ Status = EFI_SUCCESS;\r
+ }\r
+ }\r
+\r
//\r
// Open the IO Abstraction(s) needed to perform the supported test\r
//\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &gEfiDevicePathProtocolGuid,\r
- (VOID **) &ParentDevicePath,\r
+ &gEfiIsaIoProtocolGuid,\r
+ (VOID **) &IsaIo,\r
This->DriverBindingHandle,\r
Controller,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
return Status;\r
}\r
\r
+ //\r
+ // Close the I/O Abstraction(s) used to perform the supported test\r
+ //\r
gBS->CloseProtocol (\r
Controller,\r
- &gEfiDevicePathProtocolGuid,\r
+ &gEfiIsaIoProtocolGuid,\r
This->DriverBindingHandle,\r
Controller\r
);\r
\r
+ //\r
+ // Open the EFI Device Path protocol needed to perform the supported test\r
+ //\r
Status = gBS->OpenProtocol (\r
Controller,\r
- &gEfiIsaIoProtocolGuid,\r
- (VOID **) &IsaIo,\r
+ &gEfiDevicePathProtocolGuid,\r
+ (VOID **) &ParentDevicePath,\r
This->DriverBindingHandle,\r
Controller,\r
EFI_OPEN_PROTOCOL_BY_DRIVER\r
);\r
-\r
if (Status == EFI_ALREADY_STARTED) {\r
return EFI_SUCCESS;\r
}\r
Status = EFI_UNSUPPORTED;\r
goto Error;\r
}\r
- //\r
- // Make sure RemainingDevicePath is valid\r
- //\r
- if (RemainingDevicePath != NULL) {\r
- Status = EFI_UNSUPPORTED;\r
- CopyMem (\r
- &UartNode,\r
- (UART_DEVICE_PATH *) RemainingDevicePath,\r
- sizeof (UART_DEVICE_PATH)\r
- );\r
- if (UartNode.Header.Type != MESSAGING_DEVICE_PATH ||\r
- UartNode.Header.SubType != MSG_UART_DP ||\r
- sizeof (UART_DEVICE_PATH) != DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) &UartNode)\r
- ) {\r
- goto Error;\r
- }\r
-\r
- if (UartNode.BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
- goto Error;\r
- }\r
-\r
- if (UartNode.Parity < NoParity || UartNode.Parity > SpaceParity) {\r
- goto Error;\r
- }\r
-\r
- if (UartNode.DataBits < 5 || UartNode.DataBits > 8) {\r
- goto Error;\r
- }\r
-\r
- if (UartNode.StopBits < OneStopBit || UartNode.StopBits > TwoStopBits) {\r
- goto Error;\r
- }\r
-\r
- if ((UartNode.DataBits == 5) && (UartNode.StopBits == TwoStopBits)) {\r
- goto Error;\r
- }\r
-\r
- if ((UartNode.DataBits >= 6) && (UartNode.DataBits <= 8) && (UartNode.StopBits == OneFiveStopBits)) {\r
- goto Error;\r
- }\r
-\r
- Status = EFI_SUCCESS;\r
- }\r
\r
Error:\r
//\r
- // Close the I/O Abstraction(s) used to perform the supported test\r
+ // Close protocol, don't use device path protocol in the Support() function\r
//\r
gBS->CloseProtocol (\r
Controller,\r
- &gEfiIsaIoProtocolGuid,\r
+ &gEfiDevicePathProtocolGuid,\r
This->DriverBindingHandle,\r
Controller\r
);\r
EFI_ISA_IO_PROTOCOL *IsaIo;\r
SERIAL_DEV *SerialDevice;\r
UINTN Index;\r
- UART_DEVICE_PATH Node;\r
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;\r
UINTN EntryCount;\r
EFI_SERIAL_IO_PROTOCOL *SerialIo;\r
+ UART_DEVICE_PATH *UartNode;\r
\r
SerialDevice = NULL;\r
//\r
\r
if (Status == EFI_ALREADY_STARTED) {\r
\r
- if (RemainingDevicePath == NULL) {\r
+ if (RemainingDevicePath == NULL || IsDevicePathEnd (RemainingDevicePath)) {\r
+ //\r
+ // If RemainingDevicePath is NULL or is the End of Device Path Node\r
+ //\r
return EFI_SUCCESS;\r
}\r
+\r
//\r
// Make sure a child handle does not already exist. This driver can only\r
// produce one child per serial port.\r
\r
Status = EFI_ALREADY_STARTED;\r
for (Index = 0; Index < EntryCount; Index++) {\r
- if (OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) {\r
+ if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
Status = gBS->OpenProtocol (\r
OpenInfoBuffer[Index].ControllerHandle,\r
&gEfiSerialIoProtocolGuid,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
);\r
if (!EFI_ERROR (Status)) {\r
- CopyMem (&Node, RemainingDevicePath, sizeof (UART_DEVICE_PATH));\r
+ UartNode = (UART_DEVICE_PATH *) RemainingDevicePath;\r
Status = SerialIo->SetAttributes (\r
SerialIo,\r
- Node.BaudRate,\r
+ UartNode->BaudRate,\r
SerialIo->Mode->ReceiveFifoDepth,\r
SerialIo->Mode->Timeout,\r
- (EFI_PARITY_TYPE) Node.Parity,\r
- Node.DataBits,\r
- (EFI_STOP_BITS_TYPE) Node.StopBits\r
+ (EFI_PARITY_TYPE) UartNode->Parity,\r
+ UartNode->DataBits,\r
+ (EFI_STOP_BITS_TYPE) UartNode->StopBits\r
);\r
}\r
break;\r
}\r
}\r
\r
- gBS->FreePool (OpenInfoBuffer);\r
+ FreePool (OpenInfoBuffer);\r
return Status;\r
}\r
+\r
+ if (RemainingDevicePath != NULL) {\r
+ if (IsDevicePathEnd (RemainingDevicePath)) {\r
+ //\r
+ // If RemainingDevicePath is the End of Device Path Node,\r
+ // skip enumerate any device and return EFI_SUCESSS\r
+ // \r
+ return EFI_SUCCESS;\r
+ }\r
+ }\r
+\r
//\r
// Initialize the serial device instance\r
//\r
SerialDevice->IsaIo = IsaIo;\r
SerialDevice->ParentDevicePath = ParentDevicePath;\r
\r
+ //\r
+ // Check if RemainingDevicePath is NULL, \r
+ // if yes, use the values from the gSerialDevTempate as no remaining device path was\r
+ // passed in.\r
+ //\r
+ if (RemainingDevicePath != NULL) {\r
+ //\r
+ // If RemainingDevicePath isn't NULL, \r
+ // match the configuration of the RemainingDevicePath. IsHandleSupported()\r
+ // already checked to make sure the RemainingDevicePath contains settings\r
+ // that we can support.\r
+ //\r
+ CopyMem (&SerialDevice->UartDevicePath, RemainingDevicePath, sizeof (UART_DEVICE_PATH));\r
+ }\r
+\r
AddName (SerialDevice, IsaIo);\r
\r
for (Index = 0; SerialDevice->IsaIo->ResourceList->ResourceItem[Index].Type != EfiIsaAcpiResourceEndOfList; Index++) {\r
goto Error;\r
}\r
\r
- if (RemainingDevicePath != NULL) {\r
- //\r
- // Match the configuration of the RemainingDevicePath. IsHandleSupported()\r
- // already checked to make sure the RemainingDevicePath contains settings\r
- // that we can support.\r
- //\r
- CopyMem (&SerialDevice->UartDevicePath, RemainingDevicePath, sizeof (UART_DEVICE_PATH));\r
- } else {\r
- //\r
- // Use the values from the gSerialDevTempate as no remaining device path was\r
- // passed in.\r
- //\r
- }\r
//\r
// Build the device path by appending the UART node to the ParentDevicePath.\r
//The Uart setings are zero here, since SetAttribute() will update them to match \r
// Check for default settings and fill in actual values.\r
//\r
if (BaudRate == 0) {\r
- BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);\r
+ BaudRate = PcdGet64 (PcdUartDefaultBaudRate);\r
}\r
\r
if (ReceiveFifoDepth == 0) {\r
}\r
\r
if (Parity == DefaultParity) {\r
- Parity = (EFI_PARITY_TYPE)FixedPcdGet8 (PcdUartDefaultParity);\r
+ Parity = (EFI_PARITY_TYPE)PcdGet8 (PcdUartDefaultParity);\r
}\r
\r
if (DataBits == 0) {\r
- DataBits = FixedPcdGet8 (PcdUartDefaultDataBits);\r
+ DataBits = PcdGet8 (PcdUartDefaultDataBits);\r
}\r
\r
if (StopBits == DefaultStopBits) {\r
- StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits);\r
+ StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);\r
}\r
//\r
// 5 and 6 data bits can not be verified on a 16550A UART\r
projects / mirror_edk2.git / blobdiff