summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c4
-rw-r--r--OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c1
-rw-r--r--OptionRomPkg/CirrusLogic5430Dxe/Edid.c4
-rw-r--r--OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c25
4 files changed, 9 insertions, 25 deletions
diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
index f3288eb4ec..8e18910379 100644
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.c
@@ -13,12 +13,12 @@
#include "AtapiPassThru.h"
-static SCSI_COMMAND_SET gEndTable = { 0xff, (DATA_DIRECTION) 0xff };
+SCSI_COMMAND_SET gEndTable = { 0xff, (DATA_DIRECTION) 0xff };
///
/// This table contains all the supported ATAPI commands.
///
-static SCSI_COMMAND_SET gSupportedATAPICommands[] = {
+SCSI_COMMAND_SET gSupportedATAPICommands[] = {
{ OP_INQUIRY, DataIn },
{ OP_LOAD_UNLOAD_CD, NoData },
{ OP_MECHANISM_STATUS, DataIn },
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
index 1507b55ee7..b3a0f7d00e 100644
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
@@ -718,7 +718,6 @@ SetDefaultPalette (
TODO: add return values
**/
-STATIC
VOID
ClearScreen (
CIRRUS_LOGIC_5430_PRIVATE_DATA *Private
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
index 4ef733b509..76a74ccf5e 100644
--- a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
@@ -105,7 +105,6 @@ EDID_TIMING mVbeEstablishedEdidTiming[] = {
@retval EFI_SUCCESS
**/
-STATIC
EFI_STATUS
ReadEdidData (
CIRRUS_LOGIC_5430_PRIVATE_DATA *Private,
@@ -164,7 +163,6 @@ ReadEdidData (
@return The 32 bit unique key for search.
**/
-STATIC
UINT32
CalculateEdidKey (
EDID_TIMING *EdidTiming
@@ -189,7 +187,6 @@ CalculateEdidKey (
@retval FALSE Not found.
**/
-STATIC
BOOLEAN
SearchEdidTiming (
VALID_EDID_TIMING *ValidEdidTiming,
@@ -220,7 +217,6 @@ SearchEdidTiming (
@retval FALSE The EDID data is invalid.
**/
-STATIC
BOOLEAN
ParseEdidData (
UINT8 *EdidBuffer,
diff --git a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
index 2a693cef5a..4d1a583e49 100644
--- a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
+++ b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
@@ -37,9 +37,8 @@
@param Data The date to write.
**/
-STATIC
VOID
-outb (
+I2cOutb (
EFI_PCI_IO_PROTOCOL *PciIo,
UINTN Address,
UINT8 Data
@@ -63,9 +62,8 @@ outb (
return byte value read from PCI I/O space.
**/
-STATIC
UINT8
-inb (
+I2cInb (
EFI_PCI_IO_PROTOCOL *PciIo,
UINTN Address
)
@@ -93,15 +91,14 @@ inb (
@retval 1 High on I2C Data or I2C Clock Pin.
**/
-STATIC
UINT8
I2cPinRead (
EFI_PCI_IO_PROTOCOL *PciIo,
UINT8 Bit
)
{
- outb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);
- return (UINT8) ((inb (PciIo, SEQ_DATA_REGISTER) >> Bit ) & 0xfe);
+ I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);
+ return (UINT8) ((I2cInb (PciIo, SEQ_DATA_REGISTER) >> Bit ) & 0xfe);
}
@@ -113,7 +110,6 @@ I2cPinRead (
@param Value 1 or 0 stands for Set or Clear I2C Data and I2C Clock Pins.
**/
-STATIC
VOID
I2cPinWrite (
EFI_PCI_IO_PROTOCOL *PciIo,
@@ -122,10 +118,10 @@ I2cPinWrite (
)
{
UINT8 Byte;
- outb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);
- Byte = (UINT8) (inb (PciIo, SEQ_DATA_REGISTER) & (UINT8) ~(1 << Bit)) ;
+ I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);
+ Byte = (UINT8) (I2cInb (PciIo, SEQ_DATA_REGISTER) & (UINT8) ~(1 << Bit)) ;
Byte = (UINT8) (Byte | ((Value & 0x01) << Bit));
- outb (PciIo, SEQ_DATA_REGISTER, (UINT8) (Byte | 0x40));
+ I2cOutb (PciIo, SEQ_DATA_REGISTER, (UINT8) (Byte | 0x40));
return;
}
@@ -133,7 +129,6 @@ I2cPinWrite (
Read/write delay acoording to I2C Bus Speed.
**/
-STATIC
VOID
I2cDelay (
VOID
@@ -149,7 +144,6 @@ I2cDelay (
@param Data The byte data to write.
**/
-STATIC
VOID
I2cSendByte (
EFI_PCI_IO_PROTOCOL *PciIo,
@@ -175,7 +169,6 @@ I2cSendByte (
Return the byte data read from I2C Data Pin.
**/
-STATIC
UINT8
I2cReceiveByte (
EFI_PCI_IO_PROTOCOL *PciIo
@@ -205,7 +198,6 @@ I2cReceiveByte (
@param PciIo The pointer to PCI_IO_PROTOCOL.
**/
-STATIC
BOOLEAN
I2cWaitAck (
EFI_PCI_IO_PROTOCOL *PciIo
@@ -231,7 +223,6 @@ I2cWaitAck (
@param PciIo The pointer to PCI_IO_PROTOCOL.
**/
-STATIC
VOID
I2cSendAck (
EFI_PCI_IO_PROTOCOL *PciIo
@@ -249,7 +240,6 @@ I2cSendAck (
@param PciIo The pointer to PCI_IO_PROTOCOL.
**/
-STATIC
VOID
I2cStart (
EFI_PCI_IO_PROTOCOL *PciIo
@@ -273,7 +263,6 @@ I2cStart (
@param PciIo The pointer to PCI_IO_PROTOCOL.
**/
-STATIC
VOID
I2cStop (
EFI_PCI_IO_PROTOCOL *PciIo