Revision: 18199
http://sourceforge.net/p/edk2/code/18199
Author: fanwang2
Date: 2015-08-11 01:11:29 +0000 (Tue, 11 Aug 2015)
Log Message:
-----------
NetworkPkg: Change the macro name to fit coding style
Change several macro names to fit name EDK2 naming conventions: Use all capital
letters for #define.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: fanwang2 <[email protected]>
Reviewed-by: Jiaxin Wu <[email protected]>
Reviewed-by: Qiu Shumin <[email protected]>
Modified Paths:
--------------
trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c
trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.h
Modified: trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c
===================================================================
--- trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c 2015-08-10 07:55:26 UTC (rev
18198)
+++ trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c 2015-08-11 01:11:29 UTC (rev
18199)
@@ -1400,7 +1400,7 @@
PathLen = DevicePathNodeLength (&DPathNode->Ipv4);
- if (PathLen == IPv4_NODE_LEN_NEW_VERSIONS) {
+ if (PathLen == IP4_NODE_LEN_NEW_VERSIONS) {
IP4_COPY_ADDRESS (
&DPathNode->Ipv4.GatewayIpAddress,
@@ -1427,19 +1427,19 @@
PathLen = DevicePathNodeLength (&DPathNode->Ipv6);
- if (PathLen == IPv6_NODE_LEN_NEW_VERSIONS ) {
+ if (PathLen == IP6_NODE_LEN_NEW_VERSIONS ) {
DPathNode->Ipv6.IpAddressOrigin = 0;
DPathNode->Ipv6.PrefixLength = IP6_PREFIX_LENGTH;
ZeroMem (&DPathNode->Ipv6.GatewayIpAddress, sizeof
(EFI_IPv6_ADDRESS));
}
- else if (PathLen == IPv6_NODE_LEN_OLD_VERSIONS) {
+ else if (PathLen == IP6_NODE_LEN_OLD_VERSIONS) {
//
// StaticIPAddress is a field in old versions of IPv6_DEVICE_PATH,
while ignored in new
// version. Set StaticIPAddress through its' offset in old
IPv6_DEVICE_PATH.
//
- *((UINT8 *)(&DPathNode->Ipv6) + IPv6_OLD_IPADDRESS_OFFSET) =
+ *((UINT8 *)(&DPathNode->Ipv6) + IP6_OLD_IPADDRESS_OFFSET) =
(BOOLEAN)
(!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);
}
Modified: trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.h
===================================================================
--- trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.h 2015-08-10 07:55:26 UTC (rev
18198)
+++ trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.h 2015-08-11 01:11:29 UTC (rev
18199)
@@ -20,18 +20,18 @@
///
/// IPv4 Device Path Node Length
///
-#define IPv4_NODE_LEN_NEW_VERSIONS 27
+#define IP4_NODE_LEN_NEW_VERSIONS 27
///
/// IPv6 Device Path Node Length
///
-#define IPv6_NODE_LEN_OLD_VERSIONS 43
-#define IPv6_NODE_LEN_NEW_VERSIONS 60
+#define IP6_NODE_LEN_OLD_VERSIONS 43
+#define IP6_NODE_LEN_NEW_VERSIONS 60
///
/// The ignored field StaticIpAddress's offset in old IPv6 Device Path
///
-#define IPv6_OLD_IPADDRESS_OFFSET 42
+#define IP6_OLD_IPADDRESS_OFFSET 42
#pragma pack(1)
typedef struct _ISCSI_SESSION_CONFIG_NVDATA {
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits