sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6296 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jji4
2008-10-30 06:05:06 +00:00
parent fe467413d2
commit fe1e36e550
97 changed files with 107 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
View File

@@ -345,7 +345,6 @@ UpdateChecksum (
@retval 1 Callbacks are not active on the handle
**/
STATIC
BOOLEAN
SetMakeCallback (
IN PXE_BASECODE_DEVICE *Private

5
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c
View File

@@ -23,10 +23,10 @@ Abstract:
// Definitions for ARP
// Per RFC 826
//
STATIC ARP_HEADER ArpHeader;
ARP_HEADER ArpHeader;
#pragma pack(1)
STATIC struct {
struct {
UINT8 MediaHeader[14];
ARP_HEADER ArpHeader;
UINT8 ArpData[64];
@@ -307,7 +307,6 @@ GetHwAddr (
@return other := ARP request could not be sent
**/
STATIC
EFI_STATUS
SendRequest (
IN PXE_BASECODE_DEVICE *Private,

43
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
View File

@@ -22,12 +22,12 @@ Abstract:
#include "PxeArch.h"
STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort = DHCP_SERVER_PORT;
STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort = DHCP_CLIENT_PORT;
STATIC EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort = PXE_DISCOVERY_PORT;
EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort = DHCP_SERVER_PORT;
EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort = DHCP_CLIENT_PORT;
EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort = PXE_DISCOVERY_PORT;
#define PSEUDO_DHCP_CLIENT_PORT PseudoDhcpServerPort
STATIC EFI_IP_ADDRESS BroadcastIP = {{0xffffffff}};
STATIC EFI_IP_ADDRESS DefaultSubnetMask = {{0xffffff00}};
EFI_IP_ADDRESS BroadcastIP = {{0xffffffff}};
EFI_IP_ADDRESS DefaultSubnetMask = {{0xffffff00}};
typedef union {
DHCPV4_OP_STRUCT *OpPtr;
@@ -50,7 +50,7 @@ typedef union {
// option structure for DHCPREQUEST at end of DISCOVER options
// and for DHCPDECLINE
//
STATIC const struct requestopendstr {
const struct requestopendstr {
DHCPV4_OP_REQUESTED_IP OpReqIP;
DHCPV4_OP_SERVER_IP DhcServerIpPtr;
UINT8 End[1];
@@ -87,7 +87,7 @@ PXE_OP_BOOT_ITEM DefaultBootItem = {
//
// PXE discovery control default structure
//
STATIC PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {
PXE_OP_DISCOVERY_CONTROL DefaultDisCtl = {
{ VEND_PXE_DISCOVERY_CONTROL, DHCPV4_OPTION_LENGTH(PXE_OP_DISCOVERY_CONTROL) },
0
};
@@ -120,7 +120,7 @@ typedef struct { // discoveropendstr {
// common option beginning for all our DHCP messages except
// DHCPDECLINE and DHCPRELEASE
//
STATIC struct optionsstr {
struct optionsstr {
UINT8 DhcpCookie[4];
DHCPV4_OP_MESSAGE_TYPE DhcpMessageType;
DHCPV4_OP_MAX_MESSAGE_SIZE DhcpMaxMessageSize;
@@ -246,7 +246,7 @@ struct opreleasestr {
// value 0 -> not of interest, else value is index into PXE OPTION array
// option values from 1 to MAX_OUR_PXE_OPT
//
STATIC UINT8 ourPXEopts[MAX_OUR_PXE_OPT] = {
UINT8 ourPXEopts[MAX_OUR_PXE_OPT] = {
VEND_PXE_MTFTP_IP_IX, // multicast IP address of bootfile for MTFTP listen
VEND_PXE_MTFTP_CPORT_IX, // UDP Port to monitor for MTFTP responses - Intel order
VEND_PXE_MTFTP_SPORT_IX, // Server UDP Port for MTFTP open - Intel order
@@ -327,7 +327,7 @@ STATIC UINT8 ourPXEopts[MAX_OUR_PXE_OPT] = {
// value 0 -> not of interest, else value is index into OPTION array
// option values from 1 to MAX_OUR_OPT
//
STATIC UINT8 OurDhcpOptions[MAX_OUR_OPT] = {
UINT8 OurDhcpOptions[MAX_OUR_OPT] = {
OP_SUBNET_MASK_IX, // OP_SUBNET_MASK 1 // data is the subnet mask
OP_TIME_OFFSET_IX, // OP_TIME_OFFSET 2 // data is the time offset of subnet to UTC in seconds
OP_ROUTER_LIST_IX, // OP_ROUTER_LIST 3 // list of routers on subnet
@@ -527,7 +527,6 @@ PxeBcLibGetSmbiosSystemGuidAndSerialNumber (
//
// add router list to list
//
STATIC
VOID
Ip4AddRouterList (
PXE_BASECODE_DEVICE *Private,
@@ -553,7 +552,6 @@ Ip4AddRouterList (
//
// send ARP for our IP - fail if someone has it
//
STATIC
BOOLEAN
SetStationIP (
PXE_BASECODE_DEVICE *Private
@@ -613,7 +611,6 @@ SetStationIP (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
AddRouters (
PXE_BASECODE_DEVICE *Private,
@@ -627,7 +624,6 @@ AddRouters (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
EFI_STATUS
DoUdpWrite (
PXE_BASECODE_DEVICE *Private,
@@ -665,7 +661,6 @@ typedef struct {
UINT8 x[4];
} C4Str;
STATIC
VOID
InitDhcpv4TxBuf (
PXE_BASECODE_DEVICE *Private
@@ -741,7 +736,6 @@ InitDhcpv4TxBuf (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
UINT32
DecodePxeOptions (
DHCP_RECEIVE_BUFFER *RxBufPtr,
@@ -789,7 +783,6 @@ DecodePxeOptions (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
DecodeOptions (
DHCP_RECEIVE_BUFFER *RxBufPtr,
@@ -897,7 +890,6 @@ Parse (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
CopyParseRxBuf (
PXE_BASECODE_DEVICE *Private,
@@ -919,7 +911,6 @@ CopyParseRxBuf (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
CopyProxyRxBuf (
PXE_BASECODE_DEVICE *Private,
@@ -931,7 +922,6 @@ CopyProxyRxBuf (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
CopyParse (
PXE_BASECODE_DEVICE *Private,
@@ -1401,7 +1391,6 @@ GetOffers (
//
// send DHCPDECLINE
//
STATIC
VOID
DeclineOffer (
PXE_BASECODE_DEVICE *Private
@@ -1447,7 +1436,6 @@ DeclineOffer (
//
// send DHCPRELEASE
//
STATIC
BOOLEAN
Release (
PXE_BASECODE_DEVICE *Private
@@ -1498,7 +1486,6 @@ Release (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
BOOLEAN
GetBINLAck (
PXE_BASECODE_DEVICE *Private,
@@ -1583,7 +1570,6 @@ GetBINLAck (
// make sure we can get BINL
// send DHCPREQUEST to PXE server
//
STATIC
BOOLEAN
TryBINL (
PXE_BASECODE_DEVICE *Private,
@@ -1672,7 +1658,6 @@ TryBINL (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
BOOLEAN
TryFinishBINL (
PXE_BASECODE_DEVICE *Private,
@@ -1687,7 +1672,6 @@ TryFinishBINL (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
BOOLEAN
TryFinishProxyBINL (
PXE_BASECODE_DEVICE *Private
@@ -1709,7 +1693,6 @@ TryFinishProxyBINL (
//
// try to finish DORA - send DHCP request, wait for ACK, check with ARP
//
STATIC
BOOLEAN
TryFinishDORA (
PXE_BASECODE_DEVICE *Private,
@@ -1848,7 +1831,6 @@ TryFinishDORA (
//
// try a DHCP server of appropriate type
//
STATIC
BOOLEAN
TryDHCPFinishDORA (
PXE_BASECODE_DEVICE *Private,
@@ -1878,7 +1860,6 @@ TryDHCPFinishDORA (
//
// try a DHCP only server and a proxy of appropriate type
//
STATIC
BOOLEAN
TryProxyFinishDORA (
PXE_BASECODE_DEVICE *Private,
@@ -1919,7 +1900,6 @@ TryProxyFinishDORA (
//
// getting to the bottom of the barrel
//
STATIC
BOOLEAN
TryAnyWithBootfileFinishDORA (
PXE_BASECODE_DEVICE *Private
@@ -1970,7 +1950,6 @@ TryAnyWithBootfileFinishDORA (
/* DoDhcpDora()
*/
STATIC
EFI_STATUS
DoDhcpDora (
PXE_BASECODE_DEVICE *Private,
@@ -2390,7 +2369,6 @@ BcDhcp (
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
BOOLEAN
VerifyCredentialOption (
UINT8 *tx,
@@ -2728,7 +2706,6 @@ DoDiscover (
**/
STATIC
EFI_STATUS
Discover (
PXE_BASECODE_DEVICE *Private,

9
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_igmp.c
View File

@@ -21,11 +21,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
// Definitions for internet group management protocol version 2 message
// structure Per RFC 2236, November 1997
//
STATIC UINT8 RouterAlertOption[4] = { 0x80 | 20, 4, 0, 0 };
STATIC IPV4_ADDR AllRoutersGroup = { { 224, 0, 0, 2 } };
UINT8 RouterAlertOption[4] = { 0x80 | 20, 4, 0, 0 };
IPV4_ADDR AllRoutersGroup = { { 224, 0, 0, 2 } };
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
STATIC
VOID
ClearGroupTimer (
PXE_BASECODE_DEVICE *Private,
@@ -54,7 +53,6 @@ ClearGroupTimer (
**/
STATIC
VOID
SetGroupTimer (
PXE_BASECODE_DEVICE *Private,
@@ -107,7 +105,6 @@ SetGroupTimer (
**/
STATIC
VOID
SendIgmpMessage (
PXE_BASECODE_DEVICE *Private,
@@ -143,7 +140,6 @@ SendIgmpMessage (
**/
STATIC
VOID
ReportIgmp (
PXE_BASECODE_DEVICE *Private,
@@ -208,7 +204,6 @@ IgmpCheckTimers (
@return other := Group ID#
**/
STATIC
INTN
FindMulticastGroup (
PXE_BASECODE_DEVICE *Private,

2
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_ip.c
View File

@@ -119,7 +119,6 @@ IpAddRouter (
//
// return router ip to use for DestIp (0 if none)
//
STATIC
EFI_IP_ADDRESS *
GetRouterIp (
PXE_BASECODE_DEVICE *Private,
@@ -471,7 +470,6 @@ Ip4Send (
//
// return true if dst IP in receive header matched with what's enabled
//
STATIC
BOOLEAN
IPgood (
PXE_BASECODE_DEVICE *Private,

25
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
View File

@@ -77,7 +77,6 @@ Swap64 (
@return other :=
**/
STATIC
EFI_STATUS
TftpUdpRead (
PXE_BASECODE_DEVICE *Private,
@@ -167,7 +166,6 @@ TftpUdpRead (
**/
STATIC
VOID
SendError (
PXE_BASECODE_DEVICE *Private,
@@ -207,7 +205,6 @@ SendError (
**/
STATIC
EFI_STATUS
SendAckAndGetData (
PXE_BASECODE_DEVICE *Private,
@@ -336,7 +333,6 @@ SendAckAndGetData (
**/
STATIC
EFI_STATUS
LockStepReceive (
PXE_BASECODE_DEVICE *Private,
@@ -478,12 +474,12 @@ LockStepReceive (
//
// some literals
//
STATIC UINT8 Mode[] = MODE_BINARY;
STATIC UINT8 BlockSizeOp[] = OP_BLKSIZE;
STATIC UINT8 TsizeOp[] = OP_TFRSIZE;
STATIC UINT8 OverwriteOp[] = OP_OVERWRITE;
STATIC UINT8 BigBlkNumOp[] = OP_BIGBLKNUM;
STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
UINT8 Mode[] = MODE_BINARY;
UINT8 BlockSizeOp[] = OP_BLKSIZE;
UINT8 TsizeOp[] = OP_TFRSIZE;
UINT8 OverwriteOp[] = OP_OVERWRITE;
UINT8 BigBlkNumOp[] = OP_BIGBLKNUM;
EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -492,7 +488,6 @@ STATIC EFI_PXE_BASE_CODE_UDP_PORT TftpRequestPort = TFTP_OPEN_PORT;
@return Pointer to value field if option found or NULL if not found.
**/
STATIC
UINT8 *
FindOption (
UINT8 *OptionPtr,
@@ -521,7 +516,6 @@ FindOption (
#define TSIZEOP 2 // transfer size
#define OVERWRITEOP 4 // overwrite
#define BIGBLKNUMOP 8 // big block numbers
STATIC
EFI_STATUS
TftpRwReq (
UINT16 Req,
@@ -616,7 +610,6 @@ TftpRwReq (
**/
STATIC
EFI_STATUS
TftpRwReqwResp (
UINT16 Req,
@@ -738,7 +731,6 @@ TftpRwReqwResp (
**/
STATIC
EFI_STATUS
MtftpListen (
PXE_BASECODE_DEVICE *Private,
@@ -873,7 +865,6 @@ MtftpListen (
@retval GOTUNI returns NO_DATA go will go to TFTP session)
**/
STATIC
EFI_STATUS
MtftpOpen (
PXE_BASECODE_DEVICE * Private,
@@ -1069,7 +1060,6 @@ MtftpOpen (
**/
STATIC
EFI_STATUS
MtftpDownload (
PXE_BASECODE_DEVICE *Private,
@@ -1247,7 +1237,6 @@ MtftpDownload (
**/
STATIC
EFI_STATUS
TftpInfo (
PXE_BASECODE_DEVICE *Private,
@@ -1410,7 +1399,6 @@ TftpInfo (
**/
STATIC
EFI_STATUS
TftpDownload (
PXE_BASECODE_DEVICE *Private,
@@ -1578,7 +1566,6 @@ TftpDownload (
**/
STATIC
EFI_STATUS
TftpUpload (
PXE_BASECODE_DEVICE *Private,

13
MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
View File

@@ -58,7 +58,6 @@ typedef union {
-
**/
STATIC
EFI_PXE_BASE_CODE_CALLBACK_STATUS
EFIAPI
bc_callback (
@@ -149,7 +148,7 @@ bc_callback (
return EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE;
}
STATIC EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL _bc_callback = {
EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL _bc_callback = {
EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_REVISION,
&bc_callback
};
@@ -163,7 +162,6 @@ STATIC EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL _bc_callback = {
@return None
**/
STATIC
VOID
PrintIpv4 (
UINT8 *Ptr
@@ -183,7 +181,6 @@ PrintIpv4 (
@return None
**/
STATIC
VOID
ShowMyInfo (
IN PXE_BASECODE_DEVICE *Private
@@ -257,7 +254,6 @@ ShowMyInfo (
@retval LOCAL_BOOT
**/
STATIC
EFI_STATUS
DoPrompt (
PXE_BASECODE_DEVICE *Private,
@@ -447,7 +443,6 @@ DoPrompt (
@return None
**/
STATIC
VOID
PrintMenuItem (
PXE_BOOT_MENU_ENTRY *MenuItemPtr
@@ -475,7 +470,6 @@ PrintMenuItem (
@retval LOCAL_BOOT
**/
STATIC
EFI_STATUS
DoMenu (
PXE_BASECODE_DEVICE *Private,
@@ -765,7 +759,6 @@ DoMenu (
@return Value from DHCP option
**/
STATIC
UINT16
GetValue (
DHCPV4_OP_STRUCT *OpPtr
@@ -789,7 +782,6 @@ GetValue (
@return Pointer to opcode, may be NULL
**/
STATIC
UINT8 *
_PxeBcFindOpt (
UINT8 *BufferPtr,
@@ -837,7 +829,6 @@ _PxeBcFindOpt (
@return Pointer to option in packet
**/
STATIC
UINT8 *
PxeBcFindDhcpOpt (
EFI_PXE_BASE_CODE_PACKET *PacketPtr,
@@ -937,7 +928,6 @@ PxeBcFindDhcpOpt (
@return EFI_PROTOCOL_ERROR -
**/
STATIC
EFI_STATUS
DownloadFile (
IN PXE_BASECODE_DEVICE *Private,
@@ -1178,7 +1168,6 @@ DownloadFile (
@retval EFI_NOT_READY
**/
STATIC
EFI_STATUS
LoadfileStart (
IN PXE_BASECODE_DEVICE *Private,