From 0bb0f8b8937dea0727cf7b45c6f870f1f3dc49b0 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Fri, 31 Oct 2008 04:36:53 +0000 Subject: [PATCH] Update to use DOS format git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6336 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/DriverSampleDxe/DriverSample.h | 198 +++++++++--------- .../Universal/DriverSampleDxe/NVDataStruc.h | 150 ++++++------- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h index 20f9795583..0468fbd04f 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h @@ -1,99 +1,99 @@ -/** @file - -Copyright (c) 2007, Intel Corporation -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, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - DriverSample.h - -Abstract: - - -Revision History - - -**/ - -#ifndef _DRIVER_SAMPLE_H -#define _DRIVER_SAMPLE_H - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - - -#include "NVDataStruc.h" - -// -// This is the generated for defaults defined in VFR -// -extern UINT8 VfrMyIfrNVDataDefault0000[]; - -// -// This is the generated IFR binary data for each formset defined in VFR. -// This data array is ready to be used as input of HiiLibPreparePackageList() to -// create a packagelist (which contains Form packages, String packages, etc). -// -extern UINT8 VfrBin[]; -extern UINT8 InventoryBin[]; - -// -// This is the generated String package data for all .UNI files. -// This data array is ready to be used as input of HiiLibPreparePackageList() to -// create a packagelist (which contains Form packages, String packages, etc). -// -extern UINT8 DriverSampleStrings[]; - -#define SAMPLE_STRING L"This is an error!" - -#define DRIVER_SAMPLE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('D', 'S', 'p', 's') - -typedef struct { - UINTN Signature; - - EFI_HANDLE DriverHandle[2]; - EFI_HII_HANDLE HiiHandle[2]; - DRIVER_SAMPLE_CONFIGURATION Configuration; - UINT8 PasswordState; - - // - // Consumed protocol - // - EFI_HII_DATABASE_PROTOCOL *HiiDatabase; - EFI_HII_STRING_PROTOCOL *HiiString; - EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; - EFI_FORM_BROWSER2_PROTOCOL *FormBrowser2; - - // - // Produced protocol - // - EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess; -} DRIVER_SAMPLE_PRIVATE_DATA; - -#define DRIVER_SAMPLE_PRIVATE_FROM_THIS(a) CR (a, DRIVER_SAMPLE_PRIVATE_DATA, ConfigAccess, DRIVER_SAMPLE_PRIVATE_SIGNATURE) - -#endif +/** @file + +Copyright (c) 2007, Intel Corporation +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, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + DriverSample.h + +Abstract: + + +Revision History + + +**/ + +#ifndef _DRIVER_SAMPLE_H +#define _DRIVER_SAMPLE_H + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + +#include "NVDataStruc.h" + +// +// This is the generated for defaults defined in VFR +// +extern UINT8 VfrMyIfrNVDataDefault0000[]; + +// +// This is the generated IFR binary data for each formset defined in VFR. +// This data array is ready to be used as input of HiiLibPreparePackageList() to +// create a packagelist (which contains Form packages, String packages, etc). +// +extern UINT8 VfrBin[]; +extern UINT8 InventoryBin[]; + +// +// This is the generated String package data for all .UNI files. +// This data array is ready to be used as input of HiiLibPreparePackageList() to +// create a packagelist (which contains Form packages, String packages, etc). +// +extern UINT8 DriverSampleStrings[]; + +#define SAMPLE_STRING L"This is an error!" + +#define DRIVER_SAMPLE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('D', 'S', 'p', 's') + +typedef struct { + UINTN Signature; + + EFI_HANDLE DriverHandle[2]; + EFI_HII_HANDLE HiiHandle[2]; + DRIVER_SAMPLE_CONFIGURATION Configuration; + UINT8 PasswordState; + + // + // Consumed protocol + // + EFI_HII_DATABASE_PROTOCOL *HiiDatabase; + EFI_HII_STRING_PROTOCOL *HiiString; + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; + EFI_FORM_BROWSER2_PROTOCOL *FormBrowser2; + + // + // Produced protocol + // + EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess; +} DRIVER_SAMPLE_PRIVATE_DATA; + +#define DRIVER_SAMPLE_PRIVATE_FROM_THIS(a) CR (a, DRIVER_SAMPLE_PRIVATE_DATA, ConfigAccess, DRIVER_SAMPLE_PRIVATE_SIGNATURE) + +#endif diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h index f0906e76cc..1c93d33df9 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h +++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h @@ -1,75 +1,75 @@ -/** @file - -Copyright (c) 2007 - 2008, Intel Corporation -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, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - NVDataStruc.h - -Abstract: - - NVData structure used by the sample driver - -Revision History: - - -**/ - -#ifndef _NVDATASTRUC_H -#define _NVDATASTRUC_H - -#define FORMSET_GUID \ - { \ - 0xA04A27f4, 0xDF00, 0x4D42, 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D \ - } - -#define INVENTORY_GUID \ - { \ - 0xb3f56470, 0x6141, 0x4621, 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 \ - } - -#define VAR_EQ_TEST_NAME 0x100 - -#pragma pack(1) -typedef struct { - UINT16 WhatIsThePassword[20]; - UINT16 WhatIsThePassword2[20]; - UINT16 MyStringData[40]; - UINT16 PasswordClearText[20]; - UINT16 SomethingHiddenForHtml; - UINT8 HowOldAreYouInYearsManual; - UINT16 HowTallAreYouManual; - UINT8 HowOldAreYouInYears; - UINT16 HowTallAreYou; - UINT8 MyFavoriteNumber; - UINT8 TestLateCheck; - UINT8 TestLateCheck2; - UINT8 QuestionAboutTreeHugging; - UINT8 ChooseToActivateNuclearWeaponry; - UINT8 SuppressGrayOutSomething; - UINT8 OrderedList[8]; - UINT8 BootOrder[8]; - UINT8 BootOrderLarge; - UINT8 DynamicCheck; -} DRIVER_SAMPLE_CONFIGURATION; - -// -// 2nd NV data structure definition -// -typedef struct { - UINT8 Field8; - UINT16 Field16; - UINT8 OrderedList[3]; -} MY_DATA2; - - -#pragma pack() - -#endif +/** @file + +Copyright (c) 2007 - 2008, Intel Corporation +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, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +Module Name: + + NVDataStruc.h + +Abstract: + + NVData structure used by the sample driver + +Revision History: + + +**/ + +#ifndef _NVDATASTRUC_H +#define _NVDATASTRUC_H + +#define FORMSET_GUID \ + { \ + 0xA04A27f4, 0xDF00, 0x4D42, 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D \ + } + +#define INVENTORY_GUID \ + { \ + 0xb3f56470, 0x6141, 0x4621, 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 \ + } + +#define VAR_EQ_TEST_NAME 0x100 + +#pragma pack(1) +typedef struct { + UINT16 WhatIsThePassword[20]; + UINT16 WhatIsThePassword2[20]; + UINT16 MyStringData[40]; + UINT16 PasswordClearText[20]; + UINT16 SomethingHiddenForHtml; + UINT8 HowOldAreYouInYearsManual; + UINT16 HowTallAreYouManual; + UINT8 HowOldAreYouInYears; + UINT16 HowTallAreYou; + UINT8 MyFavoriteNumber; + UINT8 TestLateCheck; + UINT8 TestLateCheck2; + UINT8 QuestionAboutTreeHugging; + UINT8 ChooseToActivateNuclearWeaponry; + UINT8 SuppressGrayOutSomething; + UINT8 OrderedList[8]; + UINT8 BootOrder[8]; + UINT8 BootOrderLarge; + UINT8 DynamicCheck; +} DRIVER_SAMPLE_CONFIGURATION; + +// +// 2nd NV data structure definition +// +typedef struct { + UINT8 Field8; + UINT16 Field16; + UINT8 OrderedList[3]; +} MY_DATA2; + + +#pragma pack() + +#endif -- 2.39.2