Update to support to produce Component Name and & Component Name 2 protocol based on Feature flag PcdComponentNameDisable & PcdComponentName2Disable.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4006 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 129 insertions, 128 deletions

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
index a387eb05d0..732c56b299 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
@@ -1,137 +1,138 @@
-/** @file
-
-Copyright (c) 2005 - 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:
-
-  MnpDriver.h
-
-Abstract:
-
-
-**/
-
-#ifndef _MNP_DRIVER_H_
-#define _MNP_DRIVER_H_
+/** @file

+

+Copyright (c) 2005 - 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:

+

+  MnpDriver.h

+

+Abstract:

+

+

+**/

+

+#ifndef _MNP_DRIVER_H_

+#define _MNP_DRIVER_H_

 #include <PiDxe.h>

 

 #include <Protocol/ManagedNetwork.h>

-#include <Protocol/SimpleNetwork.h>
+#include <Protocol/SimpleNetwork.h>

 #include <Protocol/ServiceBinding.h>

 

 #include <Library/DebugLib.h>

 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiLib.h>
-#include <Library/NetLib.h>
+#include <Library/UefiLib.h>

+#include <Library/NetLib.h>

 #include <Library/BaseLib.h>

-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseMemoryLib.h>
-
-#include "MnpDebug.h"
-
-//
-// Required Global Variables
-//
-extern EFI_DRIVER_BINDING_PROTOCOL  gMnpDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL  gMnpComponentName;
-
-#define MNP_SERVICE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('M', 'n', 'p', 'S')
-
-typedef struct _MNP_SERVICE_DATA {
-  UINT32                        Signature;
-
-  EFI_HANDLE                    ControllerHandle;
-
-  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;
-  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;
-
-  UINT32                        Mtu;
-
-  NET_LIST_ENTRY                ChildrenList;
-  UINTN                         ChildrenNumber;
-  UINTN                         ConfiguredChildrenNumber;
-
-  NET_LIST_ENTRY                GroupAddressList;
-  UINT32                        GroupAddressCount;
-
-  EFI_EVENT                     TxTimeoutEvent;
-
-  NET_BUF_QUEUE                 FreeNbufQue;
-  INTN                          NbufCnt;
-
-  EFI_EVENT                     PollTimer;
-  BOOLEAN                       EnableSystemPoll;
-
-  EFI_EVENT                     TimeoutCheckTimer;
-
-  UINT32                        UnicastCount;
-  UINT32                        BroadcastCount;
-  UINT32                        MulticastCount;
-  UINT32                        PromiscuousCount;
-
-  //
-  // The size of the data buffer in the MNP_PACKET_BUFFER used to
-  // store a packet.
-  //
-  UINT32                        BufferLength;
-  UINT32                        PaddingSize;
-  NET_BUF                       *RxNbufCache;
-  UINT8                         *TxBuf;
-} MNP_SERVICE_DATA;
-
-#define MNP_SERVICE_DATA_FROM_THIS(a) \
-  CR ( \
-  (a), \
-  MNP_SERVICE_DATA, \
-  ServiceBinding, \
-  MNP_SERVICE_DATA_SIGNATURE \
-  )
-
-EFI_STATUS
-EFIAPI
-MnpDriverBindingSupported (
-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,
-  IN EFI_HANDLE                   ControllerHandle,
-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL
-  );
-
-EFI_STATUS
-EFIAPI
-MnpDriverBindingStart (
-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,
-  IN EFI_HANDLE                   ControllerHandle,
-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL
-  );
-
-EFI_STATUS
-EFIAPI
-MnpDriverBindingStop (
-  IN EFI_DRIVER_BINDING_PROTOCOL  *This,
-  IN EFI_HANDLE                   ControllerHandle,
-  IN UINTN                        NumberOfChildren,
-  IN EFI_HANDLE                   *ChildHandleBuffer
-  );
-
-EFI_STATUS
-EFIAPI
-MnpServiceBindingCreateChild (
-  IN EFI_SERVICE_BINDING_PROTOCOL  *This,
-  IN EFI_HANDLE                    *ChildHandle
-  );
-
-EFI_STATUS
-EFIAPI
-MnpServiceBindingDestroyChild (
-  IN EFI_SERVICE_BINDING_PROTOCOL  *This,
-  IN EFI_HANDLE                    ChildHandle
-  );
-
-#endif
+#include <Library/MemoryAllocationLib.h>

+#include <Library/BaseMemoryLib.h>

+

+#include "MnpDebug.h"

+

+//

+// Required Global Variables

+//

+extern EFI_DRIVER_BINDING_PROTOCOL   gMnpDriverBinding;

+extern EFI_COMPONENT_NAME_PROTOCOL   gMnpComponentName;

+extern EFI_COMPONENT_NAME2_PROTOCOL  gMnpComponentName2;

+

+#define MNP_SERVICE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('M', 'n', 'p', 'S')

+

+typedef struct _MNP_SERVICE_DATA {

+  UINT32                        Signature;

+

+  EFI_HANDLE                    ControllerHandle;

+

+  EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;

+  EFI_SIMPLE_NETWORK_PROTOCOL   *Snp;

+

+  UINT32                        Mtu;

+

+  NET_LIST_ENTRY                ChildrenList;

+  UINTN                         ChildrenNumber;

+  UINTN                         ConfiguredChildrenNumber;

+

+  NET_LIST_ENTRY                GroupAddressList;

+  UINT32                        GroupAddressCount;

+

+  EFI_EVENT                     TxTimeoutEvent;

+

+  NET_BUF_QUEUE                 FreeNbufQue;

+  INTN                          NbufCnt;

+

+  EFI_EVENT                     PollTimer;

+  BOOLEAN                       EnableSystemPoll;

+

+  EFI_EVENT                     TimeoutCheckTimer;

+

+  UINT32                        UnicastCount;

+  UINT32                        BroadcastCount;

+  UINT32                        MulticastCount;

+  UINT32                        PromiscuousCount;

+

+  //

+  // The size of the data buffer in the MNP_PACKET_BUFFER used to

+  // store a packet.

+  //

+  UINT32                        BufferLength;

+  UINT32                        PaddingSize;

+  NET_BUF                       *RxNbufCache;

+  UINT8                         *TxBuf;

+} MNP_SERVICE_DATA;

+

+#define MNP_SERVICE_DATA_FROM_THIS(a) \

+  CR ( \

+  (a), \

+  MNP_SERVICE_DATA, \

+  ServiceBinding, \

+  MNP_SERVICE_DATA_SIGNATURE \

+  )

+

+EFI_STATUS

+EFIAPI

+MnpDriverBindingSupported (

+  IN EFI_DRIVER_BINDING_PROTOCOL  * This,

+  IN EFI_HANDLE                   ControllerHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL

+  );

+

+EFI_STATUS

+EFIAPI

+MnpDriverBindingStart (

+  IN EFI_DRIVER_BINDING_PROTOCOL  * This,

+  IN EFI_HANDLE                   ControllerHandle,

+  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL

+  );

+

+EFI_STATUS

+EFIAPI

+MnpDriverBindingStop (

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   ControllerHandle,

+  IN UINTN                        NumberOfChildren,

+  IN EFI_HANDLE                   *ChildHandleBuffer

+  );

+

+EFI_STATUS

+EFIAPI

+MnpServiceBindingCreateChild (

+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                    *ChildHandle

+  );

+

+EFI_STATUS

+EFIAPI

+MnpServiceBindingDestroyChild (

+  IN EFI_SERVICE_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                    ChildHandle

+  );

+

+#endif