From 3ae9910225f4bb39815dfb23f2fd9e712b9d75d2 Mon Sep 17 00:00:00 2001 From: eric_tian Date: Thu, 25 Jun 2009 03:14:12 +0000 Subject: change the enum field name convention to pass ECC git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8653 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c | 4 +-- .../Ps2MouseAbsolutePointer.c | 6 ++--- .../Ps2MouseAbsolutePointer.h | 30 +++++++++++----------- .../Bus/Isa/Ps2MouseDxe/CommPs2.c | 4 +-- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.c | 6 ++--- .../Bus/Isa/Ps2MouseDxe/Ps2Mouse.h | 30 +++++++++++----------- 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'IntelFrameworkModulePkg/Bus') diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c index b5d16792c4..1b753006dc 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c @@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Ps2MouseAbsolutePointer.h" #include "CommPs2.h" -UINT8 SampleRateTbl[MAX_SR] = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 }; +UINT8 SampleRateTbl[MaxSampleRate] = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 }; -UINT8 ResolutionTbl[MAX_CMR] = { 0, 1, 2, 3 }; +UINT8 ResolutionTbl[MaxResolution] = { 0, 1, 2, 3 }; /** Issue self test command via IsaIo interface. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c index 89f6d1d624..f9da93d0ac 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c @@ -205,9 +205,9 @@ PS2MouseAbsolutePointerDriverStart ( // MouseAbsolutePointerDev->Signature = PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE; MouseAbsolutePointerDev->Handle = Controller; - MouseAbsolutePointerDev->SampleRate = SSR_20; - MouseAbsolutePointerDev->Resolution = CMR4; - MouseAbsolutePointerDev->Scaling = SF1; + MouseAbsolutePointerDev->SampleRate = SampleRate20; + MouseAbsolutePointerDev->Resolution = MouseResolution4; + MouseAbsolutePointerDev->Scaling = Scaling1; MouseAbsolutePointerDev->DataPackageSize = 3; MouseAbsolutePointerDev->IsaIo = IsaIo; MouseAbsolutePointerDev->DevicePath = ParentDevicePath; diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h index 7a111f37f3..e6ba2bc68c 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h @@ -41,33 +41,33 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseAbsolutePointerComponentName2; // PS/2 mouse sample rate // typedef enum { - SSR_10, - SSR_20, - SSR_40, - SSR_60, - SSR_80, - SSR_100, - SSR_200, - MAX_SR + SampleRate10, + SampleRate20, + SampleRate40, + SampleRate60, + SampleRate80, + SampleRate100, + SampleRate200, + MaxSampleRate } MOUSE_SR; // // PS/2 mouse resolution // typedef enum { - CMR1, - CMR2, - CMR4, - CMR8, - MAX_CMR + MouseResolution1, + MouseResolution2, + MouseResolution4, + MouseResolution8, + MaxResolution } MOUSE_RE; // // PS/2 mouse scaling // typedef enum { - SF1, - SF2 + Scaling1, + Scaling2 } MOUSE_SF; // diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c index c396ab5813..6ddd5ebea4 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c @@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Ps2Mouse.h" #include "CommPs2.h" -UINT8 SampleRateTbl[MAX_SR] = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 }; +UINT8 SampleRateTbl[MaxSampleRate] = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 }; -UINT8 ResolutionTbl[MAX_CMR] = { 0, 1, 2, 3 }; +UINT8 ResolutionTbl[MaxResolution] = { 0, 1, 2, 3 }; /** Issue self test command via IsaIo interface. diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c index 600f031ec1..2bd8231494 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c @@ -205,9 +205,9 @@ PS2MouseDriverStart ( // MouseDev->Signature = PS2_MOUSE_DEV_SIGNATURE; MouseDev->Handle = Controller; - MouseDev->SampleRate = SSR_20; - MouseDev->Resolution = CMR4; - MouseDev->Scaling = SF1; + MouseDev->SampleRate = SampleRate20; + MouseDev->Resolution = MouseResolution4; + MouseDev->Scaling = Scaling1; MouseDev->DataPackageSize = 3; MouseDev->IsaIo = IsaIo; MouseDev->DevicePath = ParentDevicePath; diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h index aadfd6aae9..e1595b887b 100644 --- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h +++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h @@ -41,33 +41,33 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gPs2MouseComponentName2; // PS/2 mouse sample rate // typedef enum { - SSR_10, - SSR_20, - SSR_40, - SSR_60, - SSR_80, - SSR_100, - SSR_200, - MAX_SR + SampleRate10, + SampleRate20, + SampleRate40, + SampleRate60, + SampleRate80, + SampleRate100, + SampleRate200, + MaxSampleRate } MOUSE_SR; // // PS/2 mouse resolution // typedef enum { - CMR1, - CMR2, - CMR4, - CMR8, - MAX_CMR + MouseResolution1, + MouseResolution2, + MouseResolution4, + MouseResolution8, + MaxResolution } MOUSE_RE; // // PS/2 mouse scaling // typedef enum { - SF1, - SF2 + Scaling1, + Scaling2 } MOUSE_SF; // -- cgit v1.2.3