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

BaseTools:added extern protocol/PPI/GUID definition in AutoGen for Library

Browse Source 
We already added the extern declaration for protocols/PPI/GUID in AutoGen.h
file for driver, but missing this feature for the Library. so this patch
add it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18661 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yonghong Zhu
2015-10-26 03:26:55 +00:00
committed by yzhu52
parent 9382b53a23
commit 7beed8a3da
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BaseTools/Source/Python/AutoGen/GenC.py
View File

@ -1384,21 +1384,20 @@ def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):
# @param AutoGenH The TemplateString object for header file # @param AutoGenH The TemplateString object for header file
# #
def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH): def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):
if Info.IsLibrary:
return
if Info.ModuleType in ["USER_DEFINED", "BASE"]: if Info.ModuleType in ["USER_DEFINED", "BASE"]:
GuidType = "GUID" GuidType = "GUID"
else: else:
GuidType = "EFI_GUID" GuidType = "EFI_GUID"
if Info.GuidList: if Info.GuidList:
if not Info.IsLibrary:
AutoGenC.Append("\n// Guids\n") AutoGenC.Append("\n// Guids\n")
AutoGenH.Append("\n// Guids\n") AutoGenH.Append("\n// Guids\n")
# #
# GUIDs # GUIDs
# #
for Key in Info.GuidList: for Key in Info.GuidList:
if not Info.IsLibrary:
AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.GuidList[Key])) AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.GuidList[Key]))
AutoGenH.Append('extern %s %s;\n' % (GuidType, Key)) AutoGenH.Append('extern %s %s;\n' % (GuidType, Key))
@ -1409,21 +1408,20 @@ def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):
# @param AutoGenH The TemplateString object for header file # @param AutoGenH The TemplateString object for header file
# #
def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH): def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):
if Info.IsLibrary:
return
if Info.ModuleType in ["USER_DEFINED", "BASE"]: if Info.ModuleType in ["USER_DEFINED", "BASE"]:
GuidType = "GUID" GuidType = "GUID"
else: else:
GuidType = "EFI_GUID" GuidType = "EFI_GUID"
if Info.ProtocolList: if Info.ProtocolList:
if not Info.IsLibrary:
AutoGenC.Append("\n// Protocols\n") AutoGenC.Append("\n// Protocols\n")
AutoGenH.Append("\n// Protocols\n") AutoGenH.Append("\n// Protocols\n")
# #
# Protocol GUIDs # Protocol GUIDs
# #
for Key in Info.ProtocolList: for Key in Info.ProtocolList:
if not Info.IsLibrary:
AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.ProtocolList[Key])) AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.ProtocolList[Key]))
AutoGenH.Append('extern %s %s;\n' % (GuidType, Key)) AutoGenH.Append('extern %s %s;\n' % (GuidType, Key))
@ -1434,21 +1432,20 @@ def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):
# @param AutoGenH The TemplateString object for header file # @param AutoGenH The TemplateString object for header file
# #
def CreatePpiDefinitionCode(Info, AutoGenC, AutoGenH): def CreatePpiDefinitionCode(Info, AutoGenC, AutoGenH):
if Info.IsLibrary:
return
if Info.ModuleType in ["USER_DEFINED", "BASE"]: if Info.ModuleType in ["USER_DEFINED", "BASE"]:
GuidType = "GUID" GuidType = "GUID"
else: else:
GuidType = "EFI_GUID" GuidType = "EFI_GUID"
if Info.PpiList: if Info.PpiList:
if not Info.IsLibrary:
AutoGenC.Append("\n// PPIs\n") AutoGenC.Append("\n// PPIs\n")
AutoGenH.Append("\n// PPIs\n") AutoGenH.Append("\n// PPIs\n")
# #
# PPI GUIDs # PPI GUIDs
# #
for Key in Info.PpiList: for Key in Info.PpiList:
if not Info.IsLibrary:
AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.PpiList[Key])) AutoGenC.Append('GLOBAL_REMOVE_IF_UNREFERENCED %s %s = %s;\n' % (GuidType, Key, Info.PpiList[Key]))
AutoGenH.Append('extern %s %s;\n' % (GuidType, Key)) AutoGenH.Append('extern %s %s;\n' % (GuidType, Key))