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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/CommPs2.c
index b5d16792c48ba15f04b3b49e07622c27a8edf340..1b753006dc2649ce2a939117475d8ff06a40a444 100644 (file)
--- 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"\r
 #include "CommPs2.h"\r
 \r
-UINT8 SampleRateTbl[MAX_SR]   = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 };\r
+UINT8 SampleRateTbl[MaxSampleRate]  = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 };\r
 \r
-UINT8 ResolutionTbl[MAX_CMR]  = { 0, 1, 2, 3 };\r
+UINT8 ResolutionTbl[MaxResolution]  = { 0, 1, 2, 3 };\r
 \r
 /**\r
   Issue self test command via IsaIo interface.\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
index 89f6d1d624fff1921ff05ef4165505116beba503..f9da93d0acec118f5d0df1d4fc6cd3b4ad2faa27 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.c
@@ -205,9 +205,9 @@ PS2MouseAbsolutePointerDriverStart (
   //\r
   MouseAbsolutePointerDev->Signature       = PS2_MOUSE_ABSOLUTE_POINTER_DEV_SIGNATURE;\r
   MouseAbsolutePointerDev->Handle          = Controller;\r
-  MouseAbsolutePointerDev->SampleRate      = SSR_20;\r
-  MouseAbsolutePointerDev->Resolution      = CMR4;\r
-  MouseAbsolutePointerDev->Scaling         = SF1;\r
+  MouseAbsolutePointerDev->SampleRate      = SampleRate20;\r
+  MouseAbsolutePointerDev->Resolution      = MouseResolution4;\r
+  MouseAbsolutePointerDev->Scaling         = Scaling1;\r
   MouseAbsolutePointerDev->DataPackageSize = 3;\r
   MouseAbsolutePointerDev->IsaIo           = IsaIo;\r
   MouseAbsolutePointerDev->DevicePath      = ParentDevicePath;\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
index 7a111f37f3d16290680ba3523040c37b7c5d2f85..e6ba2bc68c33f2f67ccf2d48417661a4cfb450f7 100644 (file)
--- 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\r
 //\r
 typedef enum {\r
-  SSR_10,\r
-  SSR_20,\r
-  SSR_40,\r
-  SSR_60,\r
-  SSR_80,\r
-  SSR_100,\r
-  SSR_200,\r
-  MAX_SR\r
+  SampleRate10,\r
+  SampleRate20,\r
+  SampleRate40,\r
+  SampleRate60,\r
+  SampleRate80,\r
+  SampleRate100,\r
+  SampleRate200,\r
+  MaxSampleRate\r
 } MOUSE_SR;\r
 \r
 //\r
 // PS/2 mouse resolution\r
 //\r
 typedef enum {\r
-  CMR1,\r
-  CMR2,\r
-  CMR4,\r
-  CMR8,\r
-  MAX_CMR\r
+  MouseResolution1,\r
+  MouseResolution2,\r
+  MouseResolution4,\r
+  MouseResolution8,\r
+  MaxResolution\r
 } MOUSE_RE;\r
 \r
 //\r
 // PS/2 mouse scaling\r
 //\r
 typedef enum {\r
-  SF1,\r
-  SF2\r
+  Scaling1,\r
+  Scaling2\r
 } MOUSE_SF;\r
 \r
 //\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/CommPs2.c
index c396ab581310ac0a188b6b0c45bb475d1f6349de..6ddd5ebea4ecde03cd1edcd1d64d669091b9cef7 100644 (file)
--- 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"\r
 #include "CommPs2.h"\r
 \r
-UINT8 SampleRateTbl[MAX_SR]   = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 };\r
+UINT8 SampleRateTbl[MaxSampleRate]   = { 0xa, 0x14, 0x28, 0x3c, 0x50, 0x64, 0xc8 };\r
 \r
-UINT8 ResolutionTbl[MAX_CMR]  = { 0, 1, 2, 3 };\r
+UINT8 ResolutionTbl[MaxResolution]  = { 0, 1, 2, 3 };\r
 \r
 /**\r
   Issue self test command via IsaIo interface.\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
index 600f031ec16bb685de3bd4558b418cb49add3650..2bd8231494dc4379850029cf70a41c22b65c2caf 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.c
@@ -205,9 +205,9 @@ PS2MouseDriverStart (
   //\r
   MouseDev->Signature       = PS2_MOUSE_DEV_SIGNATURE;\r
   MouseDev->Handle          = Controller;\r
-  MouseDev->SampleRate      = SSR_20;\r
-  MouseDev->Resolution      = CMR4;\r
-  MouseDev->Scaling         = SF1;\r
+  MouseDev->SampleRate      = SampleRate20;\r
+  MouseDev->Resolution      = MouseResolution4;\r
+  MouseDev->Scaling         = Scaling1;\r
   MouseDev->DataPackageSize = 3;\r
   MouseDev->IsaIo           = IsaIo;\r
   MouseDev->DevicePath      = ParentDevicePath;\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index aadfd6aae9d847abf4a247248ba5565ba002b85a..e1595b887b501fdff89a61e47a40a1a0f55e9299 100644 (file)
--- 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\r
 //\r
 typedef enum {\r
-  SSR_10,\r
-  SSR_20,\r
-  SSR_40,\r
-  SSR_60,\r
-  SSR_80,\r
-  SSR_100,\r
-  SSR_200,\r
-  MAX_SR\r
+  SampleRate10,\r
+  SampleRate20,\r
+  SampleRate40,\r
+  SampleRate60,\r
+  SampleRate80,\r
+  SampleRate100,\r
+  SampleRate200,\r
+  MaxSampleRate\r
 } MOUSE_SR;\r
 \r
 //\r
 // PS/2 mouse resolution\r
 //\r
 typedef enum {\r
-  CMR1,\r
-  CMR2,\r
-  CMR4,\r
-  CMR8,\r
-  MAX_CMR\r
+  MouseResolution1,\r
+  MouseResolution2,\r
+  MouseResolution4,\r
+  MouseResolution8,\r
+  MaxResolution\r
 } MOUSE_RE;\r
 \r
 //\r
 // PS/2 mouse scaling\r
 //\r
 typedef enum {\r
-  SF1,\r
-  SF2\r
+  Scaling1,\r
+  Scaling2\r
 } MOUSE_SF;\r
 \r
 //\r