Remove Framework HII "class\subclass" in all VFR

class/subclass is the obseleted key word in VFR file. It is designed in framework HII.
After convert to UEFI HII, it is not used any longer. Now remove them from VFR

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17493 6f19259b-4bc3-4df7-8a09-765794883524

13 files changed, 0 insertions, 26 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index 48cc33c3f6..0d35c2c37e 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FORM_MAIN_TITLE),

   help = STRING_TOKEN(STR_NULL_STRING),

   classguid = BOOT_MAINT_FORMSET_GUID,

-  class = 0,

-  subclass = 0,

 

   varstore BMM_FAKE_NV_DATA,

     varid = VARSTORE_ID_BOOT_MAINT,

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index 1531617dc5..056694ebef 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FILE_EXPLORER_TITLE),

   help = STRING_TOKEN(STR_NULL_STRING),

   classguid = FILE_EXPLORE_FORMSET_GUID,

-  class = 0,

-  subclass = 0,

 

   varstore FILE_EXPLORER_NV_DATA,

     varid = VARSTORE_ID_BOOT_MAINT,

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
index 293e4e7832..0d8142c17d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
@@ -28,8 +28,6 @@ formset
   title     = STRING_TOKEN(STR_BM_BANNER),

   help      = STRING_TOKEN(STR_LAST_STRING),

   classguid = BOOT_MANAGER_FORMSET_GUID,

-  class     = BOOT_MANAGER_CLASS,

-  subclass  = BOOT_MANAGER_SUBCLASS,

 

   form formid = BOOT_MANAGER_FORM_ID,

        title  = STRING_TOKEN(STR_BM_BANNER);

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 4d7d43b7d1..0ad671bdca 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -30,8 +30,6 @@ formset
   title     = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE),

   help      = STRING_TOKEN(STR_EMPTY_STRING),

   classguid = DEVICE_MANAGER_FORMSET_GUID,

-  class     = DEVICE_MANAGER_CLASS,

-  subclass  = FRONT_PAGE_SUBCLASS,

 

   form formid = DEVICE_MANAGER_FORM_ID,

        title  = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE);

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index d5fe4f4c48..43e21ec516 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -41,8 +41,6 @@ formset
   title    = STRING_TOKEN(STR_FRONT_PAGE_TITLE),

   help     = STRING_TOKEN(STR_NULL_STRING),

   classguid = FRONT_PAGE_FORMSET_GUID,

-  class    = FRONT_PAGE_CLASS,

-  subclass = FRONT_PAGE_SUBCLASS,

 

   form formid = FRONT_PAGE_FORM_ID,

        title  = STRING_TOKEN(STR_FRONT_PAGE_TITLE);

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index b5b93d4c86..daa2577383 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
@@ -19,8 +19,6 @@ formset
   guid     = DRIVER_SAMPLE_INVENTORY_GUID,

   title    = STRING_TOKEN(STR_INV_FORM_SET_TITLE),

   help     = STRING_TOKEN(STR_INV_FORM_SET_HELP),

-  class    = 0x04,

-  subclass = 0x03,

 

   form formid = 1,

        title  = STRING_TOKEN(STR_INV_FORM1_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 018fe05988..2456c51c8c 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -20,8 +20,6 @@ formset
   guid     = IP4_ISCSI_CONFIG_GUID,

   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),

   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),

-  class    = EFI_NETWORK_DEVICE_CLASS,

-  subclass = 0x03,

 

   varstore ISCSI_CONFIG_IFR_NVDATA,

     name = ISCSI_CONFIG_IFR_NVDATA,

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index 661f6262c9..bd3e36ad06 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -19,8 +19,6 @@ formset
   guid     = EFI_NIC_IP4_CONFIG_NVDATA_GUID,

   title    = STRING_TOKEN(STR_IP4_CONFIG_FORM_TITLE),

   help     = STRING_TOKEN(STR_IP4_CONFIG_FORM_HELP),

-  class    = EFI_NETWORK_DEVICE_CLASS,

-  subclass = 0x03,

 

   varstore IP4_CONFIG_IFR_NVDATA,

     name = EfiNicIp4ConfigVariable,

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index eb0e3dec55..52240a1f77 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
@@ -28,8 +28,6 @@ formset
   guid     = PLAT_OVER_MNGR_GUID,

   title    = STRING_TOKEN(STR_ENTRY_TITLE),

   help     = STRING_TOKEN(STR_TITLE_HELP),

-  class    = EFI_DISK_DEVICE_CLASS,

-  subclass = 0xff,

 

   varstore PLAT_OVER_MNGR_DATA,

     varid = VARSTORE_ID_PLAT_OVER_MNGR,

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 80e833f10f..db77c0f215 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -20,8 +20,6 @@ formset
   guid     = ISCSI_CONFIG_GUID,

   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),

   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),

-  class    = EFI_NETWORK_DEVICE_CLASS,

-  subclass = 0x03,

 

   varstore ISCSI_CONFIG_IFR_NVDATA,

     varid = CONFIGURATION_VARSTORE_ID,

diff --git a/NetworkPkg/Ip6Dxe/Ip6Config.vfr b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
index 0d62b0a168..67fd386bca 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Config.vfr
+++ b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
@@ -21,8 +21,6 @@ formset
   guid     = IP6_CONFIG_NVDATA_GUID,

   title    = STRING_TOKEN(STR_IP6_CONFIG_FORM_TITLE),

   help     = STRING_TOKEN(STR_IP6_CONFIG_FORM_HELP),

-  class    = EFI_NETWORK_DEVICE_CLASS,

-  subclass = 0x03,

 

   varstore IP6_CONFIG_IFR_NVDATA,

     name = IP6_CONFIG_IFR_NVDATA,

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
index 59fb348651..2cf3359f2a 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
@@ -21,8 +21,6 @@ formset
   guid     = USER_PROFILE_MANAGER_GUID,

   title    = STRING_TOKEN(STR_FORMSET_TITLE),  

   help     = STRING_TOKEN(STR_TITLE_HELP),

-  class    = USER_MANAGER_CLASS,

-  subclass = USER_MANAGER_SUBCLASS,

     

   // User manager form

   form formid = FORMID_USER_MANAGE,

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
index 6922ce2c3f..e520033191 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Vfr.vfr
@@ -21,8 +21,6 @@ formset
   guid     = SYSTEM_CONFIGURATION_GUID,

   title    = STRING_TOKEN(STR_SYSTEM_SETUP_TITLE),

   help     = STRING_TOKEN(STR_SYSTEM_SETUP_HELP),

-  class    = 1,

-  subclass = 0,

 

 

   varstore SYSTEM_CONFIGURATION, name = Setup, guid = SYSTEM_CONFIGURATION_GUID;