diff options
| author | Michael Kinney <michael.d.kinney@intel.com> | 2015-12-15 05:59:34 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-15 05:59:34 +0000 |
| commit | 7f58594c3263afcce15bcd1d784590a4f0083646 (patch) | |
| tree | 4d37de0cd413bf1395bec6f402dd1752e42ab022 | |
| parent | 3163594ee114acff704c40fff4cfb007a55b9dac (diff) | |
| download | edk2-platforms-7f58594c3263afcce15bcd1d784590a4f0083646.tar.xz | |
MdeModulePkg/PciSioSerialDxe: Fix compiler warnings
Add missing braces in module global mControllerDevicePathTemplate.
Initialize ControllerNumber and ContainsControllerNode in
SerialControllerDriverStart() to address warning for potential use
before initialization warning.
Move initialization of local SerialIo earlier in
SerialControllerDriverStart() to address warning for potential use
before initialization warning.
(Sync patch r19232 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19269 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c index 86e75a43f7..7fc053578d 100644 --- a/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c +++ b/MdeModulePkg/Bus/Pci/PciSioSerialDxe/Serial.c @@ -31,8 +31,10 @@ CONTROLLER_DEVICE_PATH mControllerDevicePathTemplate = { {
HARDWARE_DEVICE_PATH,
HW_CONTROLLER_DP,
- sizeof (CONTROLLER_DEVICE_PATH),
- 0
+ {
+ (UINT8) (sizeof (CONTROLLER_DEVICE_PATH)),
+ (UINT8) ((sizeof (CONTROLLER_DEVICE_PATH)) >> 8)
+ }
},
0
};
@@ -858,7 +860,8 @@ SerialControllerDriverStart ( return EFI_SUCCESS;
}
-
+ ControllerNumber = 0;
+ ContainsControllerNode = FALSE;
SerialDevices = GetChildSerialDevices (Controller, IoProtocolGuid, &SerialDeviceCount);
//
// If the SerialIo instance specified by RemainingDevicePath is already created,
@@ -870,6 +873,7 @@ SerialControllerDriverStart ( if ((!SerialDevices[Index]->ContainsControllerNode && !ContainsControllerNode) ||
(SerialDevices[Index]->ContainsControllerNode && ContainsControllerNode && SerialDevices[Index]->Instance == ControllerNumber)
) {
+ SerialIo = &SerialDevices[Index]->SerialIo;
Status = EFI_INVALID_PARAMETER;
//
// Pass NULL ActualBaudRate to VerifyUartParameters to disallow baudrate degrade.
@@ -877,7 +881,6 @@ SerialControllerDriverStart ( //
if (VerifyUartParameters (SerialDevices[Index]->ClockRate, Uart->BaudRate, Uart->DataBits,
(EFI_PARITY_TYPE) Uart->Parity, (EFI_STOP_BITS_TYPE) Uart->StopBits, NULL, NULL)) {
- SerialIo = &SerialDevices[Index]->SerialIo;
Status = SerialIo->SetAttributes (
SerialIo,
Uart->BaudRate,
|