From ecd0b337438c0f3312caec42ae546895e5bde8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 9 Nov 2013 15:00:19 +0000
Subject: [PATCH] [FAST486][NTVDM]: Rename the last two IO functions parameters
 in the same way as some CSR functions (ElementCount == DataCount; ElementSize
 == DataSize).

svn path=/branches/ntvdm/; revision=60896
---
 include/reactos/libs/fast486/fast486.h |  8 ++++----
 lib/fast486/fast486.c                  | 12 ++++++------
 subsystems/ntvdm/emulator.c            |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/reactos/libs/fast486/fast486.h b/include/reactos/libs/fast486/fast486.h
index 5f6f27f36b4..df03b80006e 100644
--- a/include/reactos/libs/fast486/fast486.h
+++ b/include/reactos/libs/fast486/fast486.h
@@ -185,8 +185,8 @@ VOID
     PFAST486_STATE State,
     ULONG Port,
     PVOID Buffer,
-    ULONG Size,
-    UCHAR Width
+    ULONG DataCount,
+    UCHAR DataSize
 );
 
 typedef
@@ -196,8 +196,8 @@ VOID
     PFAST486_STATE State,
     ULONG Port,
     PVOID Buffer,
-    ULONG Size,
-    UCHAR Width
+    ULONG DataCount,
+    UCHAR DataSize
 );
 
 typedef
diff --git a/lib/fast486/fast486.c b/lib/fast486/fast486.c
index e420ea1c446..dcb98b30157 100644
--- a/lib/fast486/fast486.c
+++ b/lib/fast486/fast486.c
@@ -146,24 +146,24 @@ Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG
 
 static VOID
 NTAPI
-Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width)
+Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize)
 {
     UNREFERENCED_PARAMETER(State);
     UNREFERENCED_PARAMETER(Port);
     UNREFERENCED_PARAMETER(Buffer);
-    UNREFERENCED_PARAMETER(Size);
-    UNREFERENCED_PARAMETER(Width);
+    UNREFERENCED_PARAMETER(DataCount);
+    UNREFERENCED_PARAMETER(DataSize);
 }
 
 static VOID
 NTAPI
-Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width)
+Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize)
 {
     UNREFERENCED_PARAMETER(State);
     UNREFERENCED_PARAMETER(Port);
     UNREFERENCED_PARAMETER(Buffer);
-    UNREFERENCED_PARAMETER(Size);
-    UNREFERENCED_PARAMETER(Width);
+    UNREFERENCED_PARAMETER(DataCount);
+    UNREFERENCED_PARAMETER(DataSize);
 }
 
 static VOID
diff --git a/subsystems/ntvdm/emulator.c b/subsystems/ntvdm/emulator.c
index 501026cc5e4..dbac362a8d4 100644
--- a/subsystems/ntvdm/emulator.c
+++ b/subsystems/ntvdm/emulator.c
@@ -82,14 +82,14 @@ static VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOI
     }
 }
 
-static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width)
+static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize)
 {
     INT i, j;
     LPBYTE Address = (LPBYTE)Buffer;
 
     UNREFERENCED_PARAMETER(State);
 
-    for (i = 0; i < Size; i++) for (j = 0; j < Width; j++)
+    for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++)
     {
         ULONG CurrentPort = Port + j;
 
@@ -169,14 +169,14 @@ static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer
     }
 }
 
-static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size, UCHAR Width)
+static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize)
 {
     INT i, j;
     LPBYTE Address = (LPBYTE)Buffer;
 
     UNREFERENCED_PARAMETER(State);
 
-    for (i = 0; i < Size; i++) for (j = 0; j < Width; j++)
+    for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++)
     {
         ULONG CurrentPort = Port + j;