diff options
3 files changed, 9 insertions, 19 deletions
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java index 03ac23f..4e6b30c 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java @@ -53,14 +53,13 @@ public class MigrationTool { }
new MsaWriter(mi).flush();
-/*
+
+ mi.addProtocol("protocol", UsageTypes.ALWAYS_CONSUMED);
mi.addGuid("guid", UsageTypes.ALWAYS_CONSUMED);
mi.addLibraryClass("class", UsageTypes.ALWAYS_CONSUMED);
mi.addPpi("ppi", UsageTypes.ALWAYS_CONSUMED);
- mi.addProtocol("protocol", UsageTypes.ALWAYS_CONSUMED);
-*/
mi.getMsaOwner().flush(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + mi.modulename + ".___");
-
+
if (MigrationTool.doCritic) {
Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);
}
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java index dd106d5..aa19522 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java @@ -60,7 +60,6 @@ public final class ModuleInfo { public final boolean addProtocol (String proname, UsageTypes.Enum usage) {
//protocols.add(proname);
- System.out.println("I'm in");
return msaowner.addProtocol(proname, usage);
}
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java index 6483de5..65873a3 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java @@ -58,11 +58,9 @@ public class MsaOwner { }
LibraryClassDocument.LibraryClass classname;
- List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
classname = libclassdefs.addNewLibraryClass();
classname.setKeyword(name);
- arch.add(usage);
- classname.setSupArchList(arch);
+ classname.setUsage(usage);
return true;
}
@@ -80,11 +78,9 @@ public class MsaOwner { }
GuidsDocument.Guids.GuidCNames guid;
- List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
guid = guids.addNewGuidCNames();
guid.setGuidCName(guidname);
- arch.add(usage);
- guid.setSupArchList(arch);
+ guid.setUsage(usage);
return true;
}
@@ -103,11 +99,9 @@ public class MsaOwner { }
PPIsDocument.PPIs.Ppi ppi;
- List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
ppi = ppis.addNewPpi();
ppi.setPpiCName(ppiname);
- arch.add(usage);
- ppi.setSupArchList(arch);
+ ppi.setUsage(usage);
return true;
}
@@ -140,7 +134,7 @@ public class MsaOwner { if (protocols == null) {
protocols = msa.addNewProtocols();
}
-
+
Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();
while (proit.hasNext()) {
if (proit.next().getProtocolCName() == proname) {
@@ -148,13 +142,11 @@ public class MsaOwner { return false;
}
}
-
+
ProtocolsDocument.Protocols.Protocol protocol;
- List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
protocol = protocols.addNewProtocol();
protocol.setProtocolCName(proname);
- arch.add(usage);
- protocol.setSupArchList(arch);
+ protocol.setUsage(usage);
return true;
}
|