summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeevan Shriram <jshriram@codeaurora.org>2016-08-18 18:57:30 -0700
committerJeevan Shriram <jshriram@codeaurora.org>2016-08-19 17:47:39 -0700
commit304c23b142140abee112000b5b0ab5d93a32954a (patch)
tree144b5df31873f4dbbcfd9aae23b36f3695b1b9b5
parent5d2531c2c7aec4e755de714fb125746c53e3b3ec (diff)
QcomModulePkg: Remove the guid externs from the source files
guid are defined in .dsc files and are available to source code during compilation. All the externs in the source code can be removed. CRs-Fixed: 1057168 Change-Id: I4149cb075fb824b919f763dcdaf8910f6ffe205d
-rw-r--r--QcomModulePkg/Application/FastbootApp/FastbootCmds.c9
-rw-r--r--QcomModulePkg/Application/FastbootApp/PartitionTableUpdate.c10
-rw-r--r--QcomModulePkg/Application/LinuxLoader/LinuxLoader.c1
-rw-r--r--QcomModulePkg/Include/Library/LinuxLoaderLib.h11
-rw-r--r--QcomModulePkg/Library/BootLib/Board.c2
-rw-r--r--QcomModulePkg/Library/BootLib/LinuxLoaderLib.c12
-rw-r--r--QcomModulePkg/Library/BootLib/MenuKeysDetection.c4
-rw-r--r--QcomModulePkg/Library/BootLib/Recovery.c2
-rw-r--r--QcomModulePkg/Library/BootLib/UpdateDeviceTree.c1
9 files changed, 0 insertions, 52 deletions
diff --git a/QcomModulePkg/Application/FastbootApp/FastbootCmds.c b/QcomModulePkg/Application/FastbootApp/FastbootCmds.c
index c193ef38ec..00a0d1b15b 100644
--- a/QcomModulePkg/Application/FastbootApp/FastbootCmds.c
+++ b/QcomModulePkg/Application/FastbootApp/FastbootCmds.c
@@ -222,15 +222,6 @@ EnumeratePartitions ()
UINT32 i;
/* Find the definition of these in QcomModulePkg.dec file */
//eMMC Physical Partition GUIDs
- extern EFI_GUID gEfiEmmcUserPartitionGuid;
- extern EFI_GUID gEfiUfsLU0Guid;
- extern EFI_GUID gEfiUfsLU1Guid;
- extern EFI_GUID gEfiUfsLU2Guid;
- extern EFI_GUID gEfiUfsLU3Guid;
- extern EFI_GUID gEfiUfsLU4Guid;
- extern EFI_GUID gEfiUfsLU5Guid;
- extern EFI_GUID gEfiUfsLU6Guid;
- extern EFI_GUID gEfiUfsLU7Guid;
//UFS LUN GUIDs
EFI_GUID LunGuids[] = {
diff --git a/QcomModulePkg/Application/FastbootApp/PartitionTableUpdate.c b/QcomModulePkg/Application/FastbootApp/PartitionTableUpdate.c
index 97a167c8f1..e8dd958059 100644
--- a/QcomModulePkg/Application/FastbootApp/PartitionTableUpdate.c
+++ b/QcomModulePkg/Application/FastbootApp/PartitionTableUpdate.c
@@ -190,17 +190,8 @@ STATIC INTN ParseGptHeader(struct GptHeaderData *GptHeader, UINT8 *GptBuffer, UI
STATIC UINTN GetStorageHandle(INTN Lun, HandleInfo *BlockIoHandle, UINTN *MaxHandles)
{
EFI_STATUS Status = EFI_INVALID_PARAMETER;
- extern EFI_GUID gEfiEmmcUserPartitionGuid;
UINT32 Attribs = 0;
PartiSelectFilter HandleFilter;
- extern EFI_GUID gEfiUfsLU0Guid;
- extern EFI_GUID gEfiUfsLU1Guid;
- extern EFI_GUID gEfiUfsLU2Guid;
- extern EFI_GUID gEfiUfsLU3Guid;
- extern EFI_GUID gEfiUfsLU4Guid;
- extern EFI_GUID gEfiUfsLU5Guid;
- extern EFI_GUID gEfiUfsLU6Guid;
- extern EFI_GUID gEfiUfsLU7Guid;
//UFS LUN GUIDs
EFI_GUID LunGuids[] = {
@@ -342,7 +333,6 @@ STATIC INTN WriteGpt(INTN Lun, UINT32 Sz, UINT8 *Gpt)
EFI_ERASE_BLOCK_PROTOCOL *EraseProt = NULL;
UINTN TokenIndex;
EFI_ERASE_BLOCK_TOKEN EraseToken;
- extern EFI_GUID gEfiEraseBlockProtocolGuid;
EFI_BLOCK_IO_PROTOCOL *BlockIo = NULL;
HandleInfo BlockIoHandle[MAX_HANDLEINF_LST_SIZE];
UINTN MaxHandles = MAX_HANDLEINF_LST_SIZE;
diff --git a/QcomModulePkg/Application/LinuxLoader/LinuxLoader.c b/QcomModulePkg/Application/LinuxLoader/LinuxLoader.c
index 224bf0b960..f516522012 100644
--- a/QcomModulePkg/Application/LinuxLoader/LinuxLoader.c
+++ b/QcomModulePkg/Application/LinuxLoader/LinuxLoader.c
@@ -130,7 +130,6 @@ STATIC UINT8 GetRebootReason(UINT32 *ResetReason)
{
EFI_RESETREASON_PROTOCOL *RstReasonIf;
EFI_STATUS Status;
- extern EFI_GUID gEfiResetReasonProtocolGuid;
Status = gBS->LocateProtocol(&gEfiResetReasonProtocolGuid, NULL, (VOID **) &RstReasonIf);
if (Status != EFI_SUCCESS)
diff --git a/QcomModulePkg/Include/Library/LinuxLoaderLib.h b/QcomModulePkg/Include/Library/LinuxLoaderLib.h
index acea3ccf1f..784d59ebf4 100644
--- a/QcomModulePkg/Include/Library/LinuxLoaderLib.h
+++ b/QcomModulePkg/Include/Library/LinuxLoaderLib.h
@@ -94,17 +94,6 @@
/* Macro to avoid integer overflow */
#define ADD_OF(a, b) (MAX_UINT32 - b > a) ? (a + b) : MAX_UINT32
-/**
- External reference to the gQcomTokenSpaceGuid GUID.
- */
-extern EFI_GUID gQcomTokenSpaceGuid;
-
-/**
- * Extern referecen to gEfiPartitionTypeGuid GUID.
- */
-extern GUID gEfiPartitionTypeGuid;
-
-extern EFI_GUID gEfiPartitionRecordGuid;
/* Any data specific to additional attributes can be added here. */
typedef struct {
diff --git a/QcomModulePkg/Library/BootLib/Board.c b/QcomModulePkg/Library/BootLib/Board.c
index 6dd0e84084..0d960a5fa3 100644
--- a/QcomModulePkg/Library/BootLib/Board.c
+++ b/QcomModulePkg/Library/BootLib/Board.c
@@ -197,8 +197,6 @@ EFI_STATUS BoardSerialNum(CHAR8 *StrSerialNum, UINT32 Len)
EFI_STATUS Status = EFI_INVALID_PARAMETER;
MEM_CARD_INFO CardInfoData;
EFI_MEM_CARDINFO_PROTOCOL *CardInfo;
- extern EFI_GUID gEfiEmmcUserPartitionGuid;
- extern EFI_GUID gEfiUfsLU0Guid;
UINT32 SerialNo;
HandleInfo HandleInfoList[128];
UINT32 Attribs = 0;
diff --git a/QcomModulePkg/Library/BootLib/LinuxLoaderLib.c b/QcomModulePkg/Library/BootLib/LinuxLoaderLib.c
index b97e8b5a88..1f67303fc4 100644
--- a/QcomModulePkg/Library/BootLib/LinuxLoaderLib.c
+++ b/QcomModulePkg/Library/BootLib/LinuxLoaderLib.c
@@ -44,17 +44,6 @@
we can set FileInfo-size = SIZE_OF_EFI_FILE_INFO + 256*/
#define FILE_INFO_SIZE (SIZE_OF_EFI_FILE_INFO + 256)
-extern EFI_GUID gEfiEmmcUserPartitionGuid;
-extern EFI_GUID gEfiFileInfoGuid;
-extern EFI_GUID gQcomKeypadDeviceGuid;
-//Partition Guid
-extern EFI_GUID gEfiEmmcGppPartition1Guid;
-extern EFI_GUID gEfiEmmcUserPartitionGuid;
-extern EFI_GUID gEfiLogFSPartitionGuid;
-//Partition Type
-extern EFI_GUID gEfiPlatPartitionTypeGuid;
-
-extern EFI_GUID gQcomMemoryCaptureGuid;
UINT32 TimerFreq, FactormS;
/**
Returns a list of BlkIo handles based on required criteria
@@ -569,7 +558,6 @@ BOOLEAN IsSecureBootEnabled()
{
EFI_STATUS Status = EFI_INVALID_PARAMETER;
QCOM_VERIFIEDBOOT_PROTOCOL *VbIntf;
- extern EFI_GUID gEfiQcomVerifiedBootProtocolGuid;
BOOLEAN IsSecure = FALSE;
// Initialize verified boot & Read Device Info
diff --git a/QcomModulePkg/Library/BootLib/MenuKeysDetection.c b/QcomModulePkg/Library/BootLib/MenuKeysDetection.c
index f994734967..130eaf1728 100644
--- a/QcomModulePkg/Library/BootLib/MenuKeysDetection.c
+++ b/QcomModulePkg/Library/BootLib/MenuKeysDetection.c
@@ -99,8 +99,6 @@ STATIC VOID SetDeviceUnlockValue(INTN Type, BOOLEAN Status)
DeviceInfo *DevInfo = NULL;
struct RecoveryMessage Msg;
- extern EFI_GUID gEfiMiscPartitionGuid;
-
/* Read Device Info */
DevInfo = AllocateZeroPool(sizeof(DeviceInfo));
if (DevInfo == NULL) {
@@ -139,8 +137,6 @@ STATIC VOID UpdateDeviceStatus(OPTION_MENU_INFO *MsgInfo, INTN Reason)
{
CHAR8 FfbmPageBuffer[FFBM_MODE_BUF_SIZE];
- extern EFI_GUID gEfiMiscPartitionGuid;
-
/* Clear the screen */
gST->ConOut->ClearScreen (gST->ConOut);
diff --git a/QcomModulePkg/Library/BootLib/Recovery.c b/QcomModulePkg/Library/BootLib/Recovery.c
index dbdb609d20..cca0f87164 100644
--- a/QcomModulePkg/Library/BootLib/Recovery.c
+++ b/QcomModulePkg/Library/BootLib/Recovery.c
@@ -83,7 +83,6 @@ EFI_STATUS RecoveryInit(BOOLEAN *BootIntoRecovery)
{
EFI_STATUS Status;
struct RecoveryMessage *Msg = NULL;
- extern EFI_GUID gEfiMiscPartitionGuid;
Status = ReadFromPartition(&gEfiMiscPartitionGuid, &Msg);
if (Status != EFI_SUCCESS)
@@ -120,7 +119,6 @@ EFI_STATUS GetFfbmCommand(CHAR8 *FfbmString, UINT32 Sz)
CONST CHAR8 *FfbmCmd = "ffbm-";
CHAR8 *FfbmData = NULL;
EFI_STATUS Status;
- extern EFI_GUID gEfiMiscPartitionGuid;
Status = ReadFromPartition(&gEfiMiscPartitionGuid, &FfbmData);
if (Status != EFI_SUCCESS)
diff --git a/QcomModulePkg/Library/BootLib/UpdateDeviceTree.c b/QcomModulePkg/Library/BootLib/UpdateDeviceTree.c
index 85e9ad788b..81a62e3f23 100644
--- a/QcomModulePkg/Library/BootLib/UpdateDeviceTree.c
+++ b/QcomModulePkg/Library/BootLib/UpdateDeviceTree.c
@@ -403,7 +403,6 @@ STATIC EFI_STATUS UpdatePartialGoodsBinA(UINT32 *PartialGoodType)
EFI_LIMITS_PROTOCOL *Limits_Protocol;
UINT32 Value;
INTN Status;
- extern EFI_GUID gEfiLimitsProtocolGuid;
Status = gBS->LocateProtocol(&gEfiLimitsProtocolGuid, NULL, (VOID **) &Limits_Protocol);
if (Status != EFI_SUCCESS)