From fe1e36e550c6ffcd2561903d434683d3939e1942 Mon Sep 17 00:00:00 2001 From: jji4 Date: Thu, 30 Oct 2008 06:05:06 +0000 Subject: Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6296 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +- MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c | 5 +---- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c | 1 - .../Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c | 11 ----------- MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c | 6 ------ 5 files changed, 2 insertions(+), 23 deletions(-) (limited to 'MdeModulePkg/Bus/Usb') diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c index c9d4f7030c..ad84da90e7 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c @@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // Use a shor form Usb class Device Path, which could match any usb device, in WantedUsbIoDPList to indicate all Usb devices // are wanted Usb devices // -STATIC USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = { +USB_CLASS_FORMAT_DEVICE_PATH mAllUsbClassDevicePath = { { { MESSAGING_DEVICE_PATH, diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c index 0c5705ba97..d2bac53a52 100644 --- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c +++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c @@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // Static English keyboard layout // Format:, , , , // -STATIC UINT8 KeyboardLayoutTable[USB_KEYCODE_MAX_MAKE + 8][5] = { {EfiKeyC1, 'a', 'A', EFI_NULL_MODIFIER, EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_CAPS_LOCK}, // 0x04 {EfiKeyB5, 'b', 'B', EFI_NULL_MODIFIER, EFI_AFFECTED_BY_STANDARD_SHIFT | EFI_AFFECTED_BY_CAPS_LOCK}, // 0x05 @@ -168,7 +167,6 @@ LoadDefaultKeyboardLayout ( // // EFI_KEY to USB Scan Code convertion table // -STATIC UINT8 UsbScanCodeConvertionTable[] = { 0xe0, // EfiKeyLCtrl 0xe3, // EfiKeyA0 @@ -280,7 +278,6 @@ UINT8 UsbScanCodeConvertionTable[] = { // // Keyboard Layout Modifier to EFI Scan Code convertion table // -STATIC UINT8 EfiScanCodeConvertionTable[] = { SCAN_NULL, // EFI_NULL_MODIFIER SCAN_NULL, // EFI_LEFT_CONTROL_MODIFIER @@ -321,7 +318,7 @@ UINT8 EfiScanCodeConvertionTable[] = { EFI_GUID mKeyboardLayoutEventGuid = EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID; -STATIC KB_MODIFIER KB_Mod[8] = { +KB_MODIFIER KB_Mod[8] = { { MOD_CONTROL_L, 0xe0 }, // 11100000 { MOD_CONTROL_R, 0xe4 }, // 11100100 { MOD_SHIFT_L, 0xe1 }, // 11100001 diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c index 07469283d4..33e1ae8f96 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c @@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "UsbMassImpl.h" -STATIC USB_MASS_TRANSPORT *mUsbMassTransport[] = { &mUsbCbi0Transport, &mUsbCbi1Transport, diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c index af68e610a3..f7186af0fc 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c @@ -77,19 +77,16 @@ EFI_DRIVER_BINDING_PROTOCOL gUsbMouseAbsolutePointerDriverBinding = { // // helper functions // -STATIC BOOLEAN IsUsbMouseAbsolutePointer ( IN EFI_USB_IO_PROTOCOL *UsbIo ); -STATIC EFI_STATUS InitializeUsbMouseAbsolutePointerDevice ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointerDev ); -STATIC VOID EFIAPI UsbMouseAbsolutePointerWaitForInput ( @@ -100,7 +97,6 @@ UsbMouseAbsolutePointerWaitForInput ( // // Mouse interrupt handler // -STATIC EFI_STATUS EFIAPI OnMouseAbsolutePointerInterruptComplete ( @@ -113,7 +109,6 @@ OnMouseAbsolutePointerInterruptComplete ( // // Mouse simulate TouchPad, Using AbsolutePointer Protocol // -STATIC EFI_STATUS EFIAPI GetMouseAbsolutePointerState ( @@ -121,7 +116,6 @@ GetMouseAbsolutePointerState ( OUT EFI_ABSOLUTE_POINTER_STATE *MouseAbsolutePointerState ); -STATIC EFI_STATUS EFIAPI UsbMouseAbsolutePointerReset ( @@ -638,7 +632,6 @@ IsUsbMouseAbsolutePointer ( memory **/ -STATIC EFI_STATUS InitializeUsbMouseAbsolutePointerDevice ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointerDev @@ -775,7 +768,6 @@ InitializeUsbMouseAbsolutePointerDevice ( @return EFI_DEVICE_ERROR **/ -STATIC EFI_STATUS EFIAPI OnMouseAbsolutePointerInterruptComplete ( @@ -860,7 +852,6 @@ OnMouseAbsolutePointerInterruptComplete ( @return EFI_NOT_READY **/ -STATIC EFI_STATUS EFIAPI GetMouseAbsolutePointerState ( @@ -909,7 +900,6 @@ GetMouseAbsolutePointerState ( @return EFI_SUCCESS **/ -STATIC EFI_STATUS EFIAPI UsbMouseAbsolutePointerReset ( @@ -945,7 +935,6 @@ UsbMouseAbsolutePointerReset ( VOID **/ -STATIC VOID EFIAPI UsbMouseAbsolutePointerWaitForInput ( diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c index 1d2721c310..21b8d05aa8 100644 --- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c +++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/mousehid.c @@ -36,7 +36,6 @@ Abstract: @return Position **/ -STATIC UINT8 * GetNextItem ( IN UINT8 *StartPos, @@ -136,7 +135,6 @@ GetNextItem ( @return HidItem Data **/ -STATIC UINT32 GetItemData ( IN HID_ITEM *HidItem @@ -169,7 +167,6 @@ GetItemData ( **/ -STATIC VOID ParseLocalItem ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointer, @@ -216,7 +213,6 @@ ParseLocalItem ( } } -STATIC VOID ParseGlobalItem ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointer, @@ -257,7 +253,6 @@ ParseGlobalItem ( @return VOID **/ -STATIC VOID ParseMainItem ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointer, @@ -280,7 +275,6 @@ ParseMainItem ( @return VOID **/ -STATIC VOID ParseHidItem ( IN USB_MOUSE_ABSOLUTE_POINTER_DEV *UsbMouseAbsolutePointer, -- cgit v1.2.3