tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Update the maximum length to 224 in ISCSI_CONFIG_IFR_NVDATA() to store 223 byte name plus one NULL-terminator. 

2. Update the minimum length to 4 in VFR file for target/initiator name for requiring prefix “iqn.”
3. Fix the 64bit unalignment exception at IPF due to Rsdt is 32 bit alignment but OemTableId field of Rsdt is UINT64 type.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9896 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
tye1 2010-02-01 05:01:07 +00:00
parent d2f9134515
commit 7d6cdbc8dd
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
View File

@ -1,7 +1,7 @@
/** @file /** @file
Vfr file for iSCSI config. Vfr file for iSCSI config.
Copyright (c) 2004 - 2008, Intel Corporation.<BR> Copyright (c) 2004 - 2010, Intel Corporation.<BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -34,7 +34,7 @@ formset
help = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP), help = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),
flags = INTERACTIVE, flags = INTERACTIVE,
key = KEY_INITIATOR_NAME, key = KEY_INITIATOR_NAME,
minsize = 8, minsize = ISCSI_NAME_IFR_MIN_SIZE,
maxsize = ISCSI_NAME_IFR_MAX_SIZE, maxsize = ISCSI_NAME_IFR_MAX_SIZE,
endstring; endstring;
@ -105,7 +105,7 @@ formset
help = STRING_TOKEN(STR_ISCSI_TARGET_NAME), help = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
flags = INTERACTIVE, flags = INTERACTIVE,
key = KEY_TARGET_NAME, key = KEY_TARGET_NAME,
minsize = 8, minsize = ISCSI_NAME_IFR_MIN_SIZE,
maxsize = ISCSI_NAME_IFR_MAX_SIZE, maxsize = ISCSI_NAME_IFR_MAX_SIZE,
endstring; endstring;

7
MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Define NVData structures used by the iSCSI configuration component Define NVData structures used by the iSCSI configuration component
Copyright (c) 2004 - 2007, Intel Corporation.<BR> Copyright (c) 2004 - 2010, Intel Corporation.<BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
// //
// Vfr has a limit on the size, it's 255 bytes. // Vfr has a limit on the size, it's 255 bytes.
// //
#define ISCSI_NAME_IFR_MIN_SIZE 4
#define ISCSI_NAME_IFR_MAX_SIZE 223 #define ISCSI_NAME_IFR_MAX_SIZE 223
#define IP_MIN_SIZE 7 #define IP_MIN_SIZE 7
@ -77,7 +78,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#pragma pack(1) #pragma pack(1)
typedef struct { typedef struct {
CHAR16 InitiatorName[ISCSI_NAME_IFR_MAX_SIZE]; CHAR16 InitiatorName[ISCSI_NAME_MAX_SIZE];
UINT8 Enabled; UINT8 Enabled;
@ -86,7 +87,7 @@ typedef struct {
CHAR16 SubnetMask[IP4_STR_MAX_SIZE]; CHAR16 SubnetMask[IP4_STR_MAX_SIZE];
CHAR16 Gateway[IP4_STR_MAX_SIZE]; CHAR16 Gateway[IP4_STR_MAX_SIZE];
CHAR16 TargetName[ISCSI_NAME_IFR_MAX_SIZE]; CHAR16 TargetName[ISCSI_NAME_MAX_SIZE];
CHAR16 TargetIp[IP4_STR_MAX_SIZE]; CHAR16 TargetIp[IP4_STR_MAX_SIZE];
UINT16 TargetPort; UINT16 TargetPort;
CHAR16 BootLun[ISCSI_LUN_STR_MAX_LEN]; CHAR16 BootLun[ISCSI_LUN_STR_MAX_LEN];

4
MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Implementation for iSCSI Boot Firmware Table publication. Implementation for iSCSI Boot Firmware Table publication.
Copyright (c) 2004 - 2009, Intel Corporation.<BR> Copyright (c) 2004 - 2010, Intel Corporation.<BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -45,7 +45,7 @@ IScsiInitIbfTableHeader (
Header->OemId[4] = 'L'; Header->OemId[4] = 'L';
CopyMem (Header->OemId, OemId, sizeof (Header->OemId)); CopyMem (Header->OemId, OemId, sizeof (Header->OemId));
Header->OemTableId = *OemTableId; CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));
} }
/** /**