move iscsi driver into network directory, and change its name to comply with name convention.

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

32 files changed, 276 insertions, 276 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 34854f5e1a..4845262905 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -275,7 +275,7 @@
 

   MdeModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf

 

-  MdeModulePkg/Universal/iScsi/IScsi.inf

+  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

 

   MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf 

diff --git a/MdeModulePkg/Universal/iScsi/ComponentName.c b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
index 146dd3ce73..3deab7705b 100644
--- a/MdeModulePkg/Universal/iScsi/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index 3231e61652..c86aae680b 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
index 130cccf96f..2889167b32 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiCHAP.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h
new file mode 100644
index 0000000000..3f5e0187b7
--- /dev/null
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCommon.h
@@ -0,0 +1,28 @@
+/*++

+

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

+

+  IScsiCommon.h

+

+Abstract:

+

+--*/

+

+#ifndef _ISCSI_COMMON_H_

+#define _ISCSI_COMMON_H_

+

+typedef struct _ISCSI_SESSION             ISCSI_SESSION;

+typedef struct _ISCSI_CONNECTION          ISCSI_CONNECTION;

+typedef struct _ISCSI_DRIVER_DATA         ISCSI_DRIVER_DATA;

+typedef struct _ISCSI_SESSION_CONFIG_DATA ISCSI_SESSION_CONFIG_DATA;

+

+#endif

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index a4c581e9bc..14e42e358e 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

@@ -958,7 +958,7 @@ Returns:
   //

   // Publish our HII data

   //

-  PackageList = PreparePackageList (2, &mVendorGuid, iSCSIStrings, IScsiConfigDxeBin);

+  PackageList = PreparePackageList (2, &mVendorGuid, IScsiDxeStrings, IScsiConfigDxeBin);

   ASSERT (PackageList != NULL);

   

   Status = HiiDatabase->NewPackageList (

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index 32f950211b..7fb98a70cd 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

@@ -29,7 +29,7 @@ Abstract:
 #include "IScsiConfigNVDataStruc.h"

 

 extern UINT8  IScsiConfigDxeBin[];

-extern UINT8  iSCSIStrings[];

+extern UINT8  IScsiDxeStrings[];

 

 #define ISCSI_INITATOR_NAME_VAR_NAME        L"I_NAME"

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index db89affce2..db89affce2 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
index b0f02507c6..b0f02507c6 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfigDxeStrings.uni
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni
diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 7e1d2f86cd..768547a314 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index ec80ff4d67..c7e8e8d661 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDhcp.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
index 7111b87f57..73f1a8d27c 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiDhcp.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 68c6cb1342..1602d5bd55 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
index 5334e340f2..ec24a343b5 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiDriver.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsi.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 0e4569ca7e..95aa242674 100644
--- a/MdeModulePkg/Universal/iScsi/IScsi.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -1,5 +1,5 @@
 #/** @file

-#  Component description file for iSCSI module.

+#  Component description file for IScsi module.

 #

 #  Copyright (c) 2006 - 2007, Intel Corporation

 #  All rights reserved. This program and the accompanying materials

@@ -15,7 +15,7 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = iSCSI

+  BASE_NAME                      = IScsiDxe

   FILE_GUID                      = 4579B72D-7EC4-4dd4-8486-083C86B182A7

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

diff --git a/MdeModulePkg/Universal/iScsi/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index 42b29eff36..2729c3b429 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiExtScsiPassThru.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h
new file mode 100644
index 0000000000..d2226c396b
--- /dev/null
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.h
@@ -0,0 +1,27 @@
+/*++

+

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

+

+  IScsiExtScsiPassThru.h

+

+Abstract:

+

+--*/

+

+#ifndef _ISCSI_EXT_SCSI_PASS_THRU_H_

+#define _ISCSI_EXT_SCSI_PASS_THRU_H_

+

+#include <protocol/ScsiPassThruExt.h>

+

+extern EFI_EXT_SCSI_PASS_THRU_PROTOCOL  gIScsiExtScsiPassThruProtocolTemplate;

+

+#endif

diff --git a/MdeModulePkg/Universal/iScsi/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 1a60a35394..0c06437de1 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiIbft.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h
new file mode 100644
index 0000000000..d07c5b2536
--- /dev/null
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.h
@@ -0,0 +1,40 @@
+/*++

+

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

+

+  IScsiIbft.h

+

+Abstract:

+

+  Some extra definitions for iBFT.

+

+--*/

+

+#ifndef _ISCSI_IBFT_H_

+#define _ISCSI_IBFT_H_

+

+#include <industrystandard/IScsiBootFirmwareTable.h>

+#include <protocol/AcpiSupport.h>

+#include <protocol/PciIo.h>

+

+#define IBFT_TABLE_VAR_NAME L"iBFT"

+#define IBFT_MAX_SIZE       4096

+#define IBFT_HEAP_OFFSET    2048

+

+#define IBFT_ROUNDUP(size)  NET_ROUNDUP ((size), EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_STRUCTURE_ALIGNMENT)

+

+VOID

+IScsiPublishIbft (

+  IN VOID

+  );

+

+#endif

diff --git a/MdeModulePkg/Universal/iScsi/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 535bc8461e..7019a78c9e 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiInitiatorName.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c
index f026174ac4..f93594fdcd 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiInitiatorName.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 2c0b788ef6..8dee904bab 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
index 1f98a8e220..33315ae581 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiMisc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 54bad42933..93e03b0fef 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index bab2ffcd24..d01b635afc 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiProto.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index b5b85a7b8a..d43437be2d 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiTcp4Io.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiTcp4Io.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
index c983e05b61..655ccfe8c3 100644
--- a/MdeModulePkg/Universal/iScsi/IScsiTcp4Io.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
index d283c629d7..44aceaeafa 100644
--- a/MdeModulePkg/Universal/iScsi/Md5.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/Md5.h b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
index ee06fd7e1b..1ab090d91d 100644
--- a/MdeModulePkg/Universal/iScsi/Md5.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

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

 

diff --git a/MdeModulePkg/Universal/iScsi/IScsiCommon.h b/MdeModulePkg/Universal/iScsi/IScsiCommon.h
deleted file mode 100644
index 2d0991cfa2..0000000000
--- a/MdeModulePkg/Universal/iScsi/IScsiCommon.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*++

-

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-Module Name:

-

-  IScsiCommon.h

-

-Abstract:

-

---*/

-

-#ifndef _ISCSI_COMMON_H_

-#define _ISCSI_COMMON_H_

-

-typedef struct _ISCSI_SESSION             ISCSI_SESSION;

-typedef struct _ISCSI_CONNECTION          ISCSI_CONNECTION;

-typedef struct _ISCSI_DRIVER_DATA         ISCSI_DRIVER_DATA;

-typedef struct _ISCSI_SESSION_CONFIG_DATA ISCSI_SESSION_CONFIG_DATA;

-

-#endif

diff --git a/MdeModulePkg/Universal/iScsi/IScsiExtScsiPassThru.h b/MdeModulePkg/Universal/iScsi/IScsiExtScsiPassThru.h
deleted file mode 100644
index 7cb9be273c..0000000000
--- a/MdeModulePkg/Universal/iScsi/IScsiExtScsiPassThru.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*++

-

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-Module Name:

-

-  IScsiExtScsiPassThru.h

-

-Abstract:

-

---*/

-

-#ifndef _ISCSI_EXT_SCSI_PASS_THRU_H_

-#define _ISCSI_EXT_SCSI_PASS_THRU_H_

-

-#include <protocol/ScsiPassThruExt.h>

-

-extern EFI_EXT_SCSI_PASS_THRU_PROTOCOL  gIScsiExtScsiPassThruProtocolTemplate;

-

-#endif

diff --git a/MdeModulePkg/Universal/iScsi/IScsiIbft.h b/MdeModulePkg/Universal/iScsi/IScsiIbft.h
deleted file mode 100644
index b925b14782..0000000000
--- a/MdeModulePkg/Universal/iScsi/IScsiIbft.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*++

-

-Copyright (c)  2007 Intel Corporation. All rights reserved

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-Module Name:

-

-  IScsiIbft.h

-

-Abstract:

-

-  Some extra definitions for iBFT.

-

---*/

-

-#ifndef _ISCSI_IBFT_H_

-#define _ISCSI_IBFT_H_

-

-#include <industrystandard/IScsiBootFirmwareTable.h>

-#include <protocol/AcpiSupport.h>

-#include <protocol/PciIo.h>

-

-#define IBFT_TABLE_VAR_NAME L"iBFT"

-#define IBFT_MAX_SIZE       4096

-#define IBFT_HEAP_OFFSET    2048

-

-#define IBFT_ROUNDUP(size)  NET_ROUNDUP ((size), EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_STRUCTURE_ALIGNMENT)

-

-VOID

-IScsiPublishIbft (

-  IN VOID

-  );

-

-#endif