sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM Packages: Fixed missing braces (the warning was disabled by GCC)

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15578 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin
2014-06-20 18:24:51 +00:00
committed by oliviermartin
parent ec6b8eda8f
commit b0fdce95f7
19 changed files with 82 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ArmPkg/Drivers/CpuDxe/CpuMpCore.c
View File

@@ -1,14 +1,14 @@
/** @file /** @file
* *
* Copyright (c) 2011, ARM Limited. All rights reserved. * Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
* which accompanies this distribution. The full text of the license may be found at
* http://opensource.org/licenses/bsd-license.php
* *
* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * are licensed and made available under the terms and conditions of the BSD License
* which accompanies this distribution. The full text of the license may be found at
* http://opensource.org/licenses/bsd-license.php
*
* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
* *
**/ **/
@@ -30,7 +30,7 @@ ARM_PROCESSOR_TABLE mArmProcessorTableTemplate = {
EFI_ARM_PROCESSOR_TABLE_OEM_REVISION, EFI_ARM_PROCESSOR_TABLE_OEM_REVISION,
EFI_ARM_PROCESSOR_TABLE_CREATOR_ID, EFI_ARM_PROCESSOR_TABLE_CREATOR_ID,
EFI_ARM_PROCESSOR_TABLE_CREATOR_REVISION, EFI_ARM_PROCESSOR_TABLE_CREATOR_REVISION,
0, { 0 },
0 0
}, //ARM Processor table header }, //ARM Processor table header
0, // Number of entries in ARM processor Table 0, // Number of entries in ARM processor Table

4
ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
View File

@@ -66,10 +66,10 @@ typedef struct {
SEMIHOST_DEVICE_PATH gDevicePath = { SEMIHOST_DEVICE_PATH gDevicePath = {
{ {
{ HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0 }, { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0 } },
EFI_CALLER_ID_GUID EFI_CALLER_ID_GUID
}, },
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }
}; };
typedef struct { typedef struct {

4
ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@@ -25,7 +25,7 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
ARM_EB_SMB_NOR_BASE, ARM_EB_SMB_NOR_BASE,
SIZE_128KB * 512, SIZE_128KB * 512,
SIZE_128KB, SIZE_128KB,
{0xE7223039, 0x5836, 0x41E1, 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59} {0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } }
} }
}; };

10
ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@@ -26,28 +26,28 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE,
SIZE_256KB * 255, SIZE_256KB * 255,
SIZE_256KB, SIZE_256KB,
{0xE7223039, 0x5836, 0x41E1, 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59} { 0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } }
}, },
{ // BootMon non-volatile storage { // BootMon non-volatile storage
ARM_VE_SMB_NOR0_BASE, ARM_VE_SMB_NOR0_BASE,
ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255, ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255,
SIZE_64KB * 4, SIZE_64KB * 4,
SIZE_64KB, SIZE_64KB,
{0x02118005, 0x9DA7, 0x443A, 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB} { 0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } }
}, },
{ // UEFI { // UEFI
ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE,
ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE,
SIZE_256KB * 255, SIZE_256KB * 255,
SIZE_256KB, SIZE_256KB,
{0x1F15DA3C, 0x37FF, 0x4070, 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A} { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } }
}, },
{ // UEFI Variable Services non-volatile storage { // UEFI Variable Services non-volatile storage
ARM_VE_SMB_NOR1_BASE, ARM_VE_SMB_NOR1_BASE,
ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255, ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255,
SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks
SIZE_64KB, SIZE_64KB,
{0xCC2CBF29, 0x1498, 0x4CDD, 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09} { 0xCC2CBF29, 0x1498, 0x4CDD, { 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09 } }
} }
}; };

10
ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2011, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@@ -43,7 +43,7 @@ LCD_INSTANCE mLcdTemplate = {
0, // HorizontalResolution 0, // HorizontalResolution
0, // VerticalResolution 0, // VerticalResolution
PixelBltOnly, // PixelFormat PixelBltOnly, // PixelFormat
0, // PixelInformation { 0 }, // PixelInformation
0, // PixelsPerScanLine 0, // PixelsPerScanLine
}, },
{ {
@@ -64,8 +64,7 @@ LCD_INSTANCE mLcdTemplate = {
{ {
{ {
HARDWARE_DEVICE_PATH, HW_VENDOR_DP, HARDWARE_DEVICE_PATH, HW_VENDOR_DP,
(UINT8) (sizeof(VENDOR_DEVICE_PATH)), { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },
(UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),
}, },
// Hardware Device Path for Lcd // Hardware Device Path for Lcd
EFI_CALLER_ID_GUID // Use the driver's GUID EFI_CALLER_ID_GUID // Use the driver's GUID
@@ -74,8 +73,7 @@ LCD_INSTANCE mLcdTemplate = {
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof(EFI_DEVICE_PATH_PROTOCOL), { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} }
}, },
(EFI_EVENT) NULL // ExitBootServicesEvent (EFI_EVENT) NULL // ExitBootServicesEvent

8
ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
View File

@@ -86,16 +86,14 @@ NOR_FLASH_INSTANCE mNorFlashInstanceTemplate = {
{ {
HARDWARE_DEVICE_PATH, HARDWARE_DEVICE_PATH,
HW_VENDOR_DP, HW_VENDOR_DP,
(UINT8)( sizeof(VENDOR_DEVICE_PATH) ), { (UINT8)sizeof(VENDOR_DEVICE_PATH), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) }
(UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),
}, },
{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, // GUID ... NEED TO BE FILLED { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }, // GUID ... NEED TO BE FILLED
}, },
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof (EFI_DEVICE_PATH_PROTOCOL), { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} }
} // DevicePath } // DevicePath
}; };

3
EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
View File

@@ -46,8 +46,7 @@ STATIC CONST MEMORY_DEVICE_PATH MemoryDevicePathTemplate =
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof (EFI_DEVICE_PATH_PROTOCOL), { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} // End } // End
}; };

6
EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
View File

@@ -318,10 +318,10 @@ TcpFastbootTransportStart (
255, // IPv4 Time to Live 255, // IPv4 Time to Live
{ // AccessPoint: { // AccessPoint:
TRUE, // Use default address TRUE, // Use default address
{0, 0, 0, 0}, // IP Address (ignored - use default) { {0, 0, 0, 0} }, // IP Address (ignored - use default)
{0, 0, 0, 0}, // Subnet mask (ignored - use default) { {0, 0, 0, 0} }, // Subnet mask (ignored - use default)
FixedPcdGet32 (PcdAndroidFastbootTcpPort), // Station port FixedPcdGet32 (PcdAndroidFastbootTcpPort), // Station port
{0, 0, 0, 0}, // Remote address: accept any { {0, 0, 0, 0} }, // Remote address: accept any
0, // Remote Port: accept any 0, // Remote Port: accept any
FALSE // ActiveFlag: be a "server" FALSE // ActiveFlag: be a "server"
}, },

5
EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
View File

@@ -26,14 +26,13 @@ LAN9118_DEVICE_PATH Lan9118PathTemplate = {
MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP,
{ (UINT8) (sizeof(MAC_ADDR_DEVICE_PATH)), (UINT8) ((sizeof(MAC_ADDR_DEVICE_PATH)) >> 8) } { (UINT8) (sizeof(MAC_ADDR_DEVICE_PATH)), (UINT8) ((sizeof(MAC_ADDR_DEVICE_PATH)) >> 8) }
}, },
{ 0 }, { { 0 } },
0 0
}, },
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof(EFI_DEVICE_PATH_PROTOCOL), { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} }
}; };

2
EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
View File

@@ -14,7 +14,7 @@
#include "Lan9118Dxe.h" #include "Lan9118Dxe.h"
STATIC EFI_MAC_ADDRESS mZeroMac = { 0 }; STATIC EFI_MAC_ADDRESS mZeroMac = { { 0 } };
/** /**
This internal function reverses bits for 32bit data. This internal function reverses bits for 32bit data.

10
EmbeddedPkg/Ebl/HwDebug.c
View File

@@ -297,10 +297,12 @@ EblPciCmd (
GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdPciDebugTemplate[] = { GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdPciDebugTemplate[] = {
"pci", {
" [bus] [dev] [func]; Dump PCI", "pci",
NULL, " [bus] [dev] [func]; Dump PCI",
EblPciCmd NULL,
EblPciCmd
}
}; };

14
EmbeddedPkg/GdbStub/SerialIo.c
View File

@@ -475,15 +475,17 @@ GDB_SERIAL_DEV gdbSerialDevTemplate = {
0, // Parity 0, // Parity
0 // StopBits 0 // StopBits
}, },
{ {
{ {
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
{ {
(UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)), HARDWARE_DEVICE_PATH,
(UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8) HW_VENDOR_DP,
{
(UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)),
(UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8)
},
}, },
EFI_SERIAL_IO_PROTOCOL_GUID, EFI_SERIAL_IO_PROTOCOL_GUID
}, },
0, 0,
{ {

13
EmbeddedPkg/SerialDxe/SerialIo.c
View File

@@ -1,14 +1,13 @@
/** @file /** @file
Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system
running GDB. One console for error information and another console for user input/output. running GDB. One console for error information and another console for user input/output.
Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $, Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $,
#, 0, 0. The 0 and 0 are the ascii characters for the checksum. #, 0, 0. The 0 and 0 are the ascii characters for the checksum.
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
Copyright (c) 2013, ARM Ltd. All rights reserved.<BR> Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@@ -37,18 +36,18 @@ typedef struct {
SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = { SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {
{ {
{ HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0}, { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },
EFI_CALLER_ID_GUID // Use the drivers GUID EFI_CALLER_ID_GUID // Use the drivers GUID
}, },
{ {
{ MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0}, { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },
0, // Reserved 0, // Reserved
FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate
FixedPcdGet8 (PcdUartDefaultDataBits), // DataBits FixedPcdGet8 (PcdUartDefaultDataBits), // DataBits
FixedPcdGet8 (PcdUartDefaultParity), // Parity (N) FixedPcdGet8 (PcdUartDefaultParity), // Parity (N)
FixedPcdGet8 (PcdUartDefaultStopBits) // StopBits FixedPcdGet8 (PcdUartDefaultStopBits) // StopBits
}, },
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }
}; };
EFI_HANDLE gHandle = NULL; EFI_HANDLE gHandle = NULL;

6
EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
View File

@@ -210,18 +210,18 @@ typedef struct {
SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = { SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {
{ {
{ HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0}, { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },
EFI_CALLER_ID_GUID EFI_CALLER_ID_GUID
}, },
{ {
{ MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0}, { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },
0, // Reserved 0, // Reserved
FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate FixedPcdGet64 (PcdUartDefaultBaudRate), // BaudRate
FixedPcdGet8 (PcdUartDefaultDataBits), // DataBits FixedPcdGet8 (PcdUartDefaultDataBits), // DataBits
FixedPcdGet8 (PcdUartDefaultParity), // Parity (N) FixedPcdGet8 (PcdUartDefaultParity), // Parity (N)
FixedPcdGet8 (PcdUartDefaultStopBits) // StopBits FixedPcdGet8 (PcdUartDefaultStopBits) // StopBits
}, },
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }
}; };

10
Omap35xxPkg/Flash/Flash.c
View File

@@ -39,17 +39,11 @@ typedef struct {
FLASH_DEVICE_PATH gDevicePath = { FLASH_DEVICE_PATH gDevicePath = {
{ {
{ HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0 } },
{ HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0 },
EFI_CALLER_ID_GUID EFI_CALLER_ID_GUID
}, },
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}
}; };

9
Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2011, ARM Ltd. All rights reserved.<BR> Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@@ -70,18 +70,15 @@ LCD_INSTANCE mLcdTemplate = {
{ {
{ {
HARDWARE_DEVICE_PATH, HW_VENDOR_DP, HARDWARE_DEVICE_PATH, HW_VENDOR_DP,
(UINT8) (sizeof(VENDOR_DEVICE_PATH)), { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },
(UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),
}, },
// Hardware Device Path for Lcd // Hardware Device Path for Lcd
EFI_CALLER_ID_GUID // Use the driver's GUID EFI_CALLER_ID_GUID // Use the driver's GUID
}, },
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof(EFI_DEVICE_PATH_PROTOCOL), { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0}
0
} }
} }
}; };

3
Omap35xxPkg/MMCHSDxe/MMCHS.c
View File

@@ -52,8 +52,7 @@ MMCHS_DEVICE_PATH gMmcHsDevicePath = {
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof (EFI_DEVICE_PATH_PROTOCOL), { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} }
}; };

30
Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
View File

@@ -1,15 +1,15 @@
/** @file /** @file
* *
* Copyright (c) 2008 - 2009, Apple Inc. All rights reserved. * Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
* Copyright (c) 2011, ARM Limited. All rights reserved. * Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
* which accompanies this distribution. The full text of the license may be found at
* http://opensource.org/licenses/bsd-license.php
* *
* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, * This program and the accompanying materials
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. * are licensed and made available under the terms and conditions of the BSD License
* which accompanies this distribution. The full text of the license may be found at
* http://opensource.org/licenses/bsd-license.php
*
* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
* *
**/ **/
@@ -28,17 +28,17 @@ typedef struct {
MMCHS_DEVICE_PATH gMMCDevicePath = { MMCHS_DEVICE_PATH gMMCDevicePath = {
{ {
HARDWARE_DEVICE_PATH, {
HW_VENDOR_DP, HARDWARE_DEVICE_PATH,
(UINT8)(sizeof(VENDOR_DEVICE_PATH)), HW_VENDOR_DP,
(UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8), { (UINT8)(sizeof(VENDOR_DEVICE_PATH)), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) },
0xb615f1f5, 0x5088, 0x43cd, 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 },
{ 0xb615f1f5, 0x5088, 0x43cd, { 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 } }
}, },
{ {
END_DEVICE_PATH_TYPE, END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE,
sizeof (EFI_DEVICE_PATH_PROTOCOL), { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }
0
} }
}; };

15
Omap35xxPkg/PciEmulation/PciEmulation.c
View File

@@ -39,16 +39,16 @@ typedef struct {
EFI_PCI_IO_DEVICE_PATH PciIoDevicePathTemplate = EFI_PCI_IO_DEVICE_PATH PciIoDevicePathTemplate =
{ {
{ {
{ ACPI_DEVICE_PATH, ACPI_DP, sizeof (ACPI_HID_DEVICE_PATH), 0}, { ACPI_DEVICE_PATH, ACPI_DP, { sizeof (ACPI_HID_DEVICE_PATH), 0 } },
EISA_PNP_ID(0x0A03), // HID EISA_PNP_ID(0x0A03), // HID
0 // UID 0 // UID
}, },
{ {
{ HARDWARE_DEVICE_PATH, HW_PCI_DP, sizeof (PCI_DEVICE_PATH), 0}, { HARDWARE_DEVICE_PATH, HW_PCI_DP, { sizeof (PCI_DEVICE_PATH), 0 } },
0, 0,
0 0
}, },
{ END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }
}; };
STATIC STATIC
@@ -422,12 +422,9 @@ EFI_PCI_IO_PROTOCOL PciIoTemplate =
{ {
PciIoPollMem, PciIoPollMem,
PciIoPollIo, PciIoPollIo,
PciIoMemRead, { PciIoMemRead, PciIoMemWrite },
PciIoMemWrite, { PciIoIoRead, PciIoIoWrite },
PciIoIoRead, { PciIoPciRead, PciIoPciWrite },
PciIoIoWrite,
PciIoPciRead,
PciIoPciWrite,
PciIoCopyMem, PciIoCopyMem,
PciIoMap, PciIoMap,
PciIoUnmap, PciIoUnmap,