[NTVDM]: Addendum to revision 64917: remove unnecessary casts.

svn path=/trunk/; revision=64923
This commit is contained in:
Hermès Bélusca-Maïto 2014-10-23 12:21:46 +00:00
parent 8cbba79468
commit 19b3162442
2 changed files with 26 additions and 26 deletions

View file

@ -70,7 +70,7 @@ IOReadB(USHORT Port)
{ {
UCHAR Data; UCHAR Data;
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
IoPortProc[Port].VddIoHandlers.inb_handler((WORD)Port, &Data); IoPortProc[Port].VddIoHandlers.inb_handler(Port, &Data);
return Data; return Data;
} }
else else
@ -82,7 +82,7 @@ IOReadB(USHORT Port)
} }
VOID VOID
IOReadStrB(USHORT Port, IOReadStrB(USHORT Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count) ULONG Count)
{ {
@ -96,7 +96,7 @@ IOReadStrB(USHORT Port,
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
ASSERT(Count <= MAXWORD); ASSERT(Count <= MAXWORD);
IoPortProc[Port].VddIoHandlers.insb_handler((WORD)Port, Buffer, (WORD)Count); IoPortProc[Port].VddIoHandlers.insb_handler(Port, Buffer, (WORD)Count);
} }
else else
{ {
@ -106,7 +106,7 @@ IOReadStrB(USHORT Port,
VOID VOID
IOWriteB(USHORT Port, IOWriteB(USHORT Port,
UCHAR Buffer) UCHAR Buffer)
{ {
if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE &&
IoPortProc[Port].IoHandlers.OutB) IoPortProc[Port].IoHandlers.OutB)
@ -117,7 +117,7 @@ IOWriteB(USHORT Port,
IoPortProc[Port].VddIoHandlers.outb_handler) IoPortProc[Port].VddIoHandlers.outb_handler)
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
IoPortProc[Port].VddIoHandlers.outb_handler((WORD)Port, Buffer); IoPortProc[Port].VddIoHandlers.outb_handler(Port, Buffer);
} }
else else
{ {
@ -127,7 +127,7 @@ IOWriteB(USHORT Port,
} }
VOID VOID
IOWriteStrB(USHORT Port, IOWriteStrB(USHORT Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count) ULONG Count)
{ {
@ -141,7 +141,7 @@ IOWriteStrB(USHORT Port,
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
ASSERT(Count <= MAXWORD); ASSERT(Count <= MAXWORD);
IoPortProc[Port].VddIoHandlers.outsb_handler((WORD)Port, Buffer, (WORD)Count); IoPortProc[Port].VddIoHandlers.outsb_handler(Port, Buffer, (WORD)Count);
} }
else else
{ {
@ -162,7 +162,7 @@ IOReadW(USHORT Port)
{ {
USHORT Data; USHORT Data;
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
IoPortProc[Port].VddIoHandlers.inw_handler((WORD)Port, &Data); IoPortProc[Port].VddIoHandlers.inw_handler(Port, &Data);
return Data; return Data;
} }
else else
@ -177,7 +177,7 @@ IOReadW(USHORT Port)
} }
VOID VOID
IOReadStrW(USHORT Port, IOReadStrW(USHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count) ULONG Count)
{ {
@ -191,7 +191,7 @@ IOReadStrW(USHORT Port,
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
ASSERT(Count <= MAXWORD); ASSERT(Count <= MAXWORD);
IoPortProc[Port].VddIoHandlers.insw_handler((WORD)Port, Buffer, (WORD)Count); IoPortProc[Port].VddIoHandlers.insw_handler(Port, Buffer, (WORD)Count);
} }
else else
{ {
@ -200,7 +200,7 @@ IOReadStrW(USHORT Port,
} }
VOID VOID
IOWriteW(USHORT Port, IOWriteW(USHORT Port,
USHORT Buffer) USHORT Buffer)
{ {
if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE &&
@ -212,7 +212,7 @@ IOWriteW(USHORT Port,
IoPortProc[Port].VddIoHandlers.outw_handler) IoPortProc[Port].VddIoHandlers.outw_handler)
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
IoPortProc[Port].VddIoHandlers.outw_handler((WORD)Port, Buffer); IoPortProc[Port].VddIoHandlers.outw_handler(Port, Buffer);
} }
else else
{ {
@ -223,7 +223,7 @@ IOWriteW(USHORT Port,
} }
VOID VOID
IOWriteStrW(USHORT Port, IOWriteStrW(USHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count) ULONG Count)
{ {
@ -237,7 +237,7 @@ IOWriteStrW(USHORT Port,
{ {
ASSERT(Port <= MAXWORD); ASSERT(Port <= MAXWORD);
ASSERT(Count <= MAXWORD); ASSERT(Count <= MAXWORD);
IoPortProc[Port].VddIoHandlers.outsw_handler((WORD)Port, Buffer, (WORD)Count); IoPortProc[Port].VddIoHandlers.outsw_handler(Port, Buffer, (WORD)Count);
} }
else else
{ {
@ -265,7 +265,7 @@ IOReadD(USHORT Port)
} }
VOID VOID
IOReadStrD(USHORT Port, IOReadStrD(USHORT Port,
PULONG Buffer, PULONG Buffer,
ULONG Count) ULONG Count)
{ {
@ -282,7 +282,7 @@ IOReadStrD(USHORT Port,
VOID VOID
IOWriteD(USHORT Port, IOWriteD(USHORT Port,
ULONG Buffer) ULONG Buffer)
{ {
if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE &&
IoPortProc[Port].IoHandlers.OutD) IoPortProc[Port].IoHandlers.OutD)
@ -298,7 +298,7 @@ IOWriteD(USHORT Port,
} }
VOID VOID
IOWriteStrD(USHORT Port, IOWriteStrD(USHORT Port,
PULONG Buffer, PULONG Buffer,
ULONG Count) ULONG Count)
{ {

View file

@ -36,45 +36,45 @@ typedef VOID (WINAPI *EMULATOR_OUTSD_PROC)(USHORT Port, PULONG Buffer, ULONG Co
UCHAR UCHAR
IOReadB(USHORT Port); IOReadB(USHORT Port);
VOID VOID
IOReadStrB(USHORT Port, IOReadStrB(USHORT Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count); ULONG Count);
VOID VOID
IOWriteB(USHORT Port, IOWriteB(USHORT Port,
UCHAR Buffer); UCHAR Buffer);
VOID VOID
IOWriteStrB(USHORT Port, IOWriteStrB(USHORT Port,
PUCHAR Buffer, PUCHAR Buffer,
ULONG Count); ULONG Count);
USHORT USHORT
IOReadW(USHORT Port); IOReadW(USHORT Port);
VOID VOID
IOReadStrW(USHORT Port, IOReadStrW(USHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count); ULONG Count);
VOID VOID
IOWriteW(USHORT Port, IOWriteW(USHORT Port,
USHORT Buffer); USHORT Buffer);
VOID VOID
IOWriteStrW(USHORT Port, IOWriteStrW(USHORT Port,
PUSHORT Buffer, PUSHORT Buffer,
ULONG Count); ULONG Count);
ULONG ULONG
IOReadD(USHORT Port); IOReadD(USHORT Port);
VOID VOID
IOReadStrD(USHORT Port, IOReadStrD(USHORT Port,
PULONG Buffer, PULONG Buffer,
ULONG Count); ULONG Count);
VOID VOID
IOWriteD(USHORT Port, IOWriteD(USHORT Port,
ULONG Buffer); ULONG Buffer);
VOID VOID
IOWriteStrD(USHORT Port, IOWriteStrD(USHORT Port,
PULONG Buffer, PULONG Buffer,
ULONG Count); ULONG Count);