[hbelusca] 61364: [NTVDM]: Add support for Windows' VDD_IO_HANDLERS in our I/O ports emulation.
Author: hbelusca Date: Mon Dec 23 21:16:57 2013 New Revision: 61364
URL: http://svn.reactos.org/svn/reactos?rev=61364&view=rev Log: [NTVDM]: Add support for Windows' VDD_IO_HANDLERS in our I/O ports emulation.
Modified: branches/ntvdm/subsystems/ntvdm/io.c
Modified: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev=... ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Mon Dec 23 21:16:57 2013 @@ -24,10 +24,7 @@ // a valid VDD handle if handled externally. VDD_IO_HANDLERS VddIoHandlers;
- /* We use internally these members */ - // EMULATOR_IN_PROC In; - // EMULATOR_OUT_PROC Out; - + /* We use these members internally */
EMULATOR_INB_PROC InB; EMULATOR_INW_PROC InW; @@ -57,9 +54,16 @@ IOReadB(ULONG Port, PUCHAR Buffer) { - if (IoPortProc[Port].InB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InB) { *Buffer = IoPortProc[Port].InB(Port); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.inb_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.inb_handler((WORD)Port, Buffer); } else { @@ -74,16 +78,21 @@ PUCHAR Buffer, ULONG Count) { - if (IoPortProc[Port].InsB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsB) { IoPortProc[Port].InsB(Port, Buffer, Count); } - else - { - while (Count--) - { - IOReadB(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.insb_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.insb_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOReadB(Port, Buffer++); } }
@@ -91,9 +100,16 @@ IOWriteB(ULONG Port, PUCHAR Buffer) { - if (IoPortProc[Port].OutB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutB) { IoPortProc[Port].OutB(Port, *Buffer); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outb_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outb_handler((WORD)Port, *Buffer); } else { @@ -107,16 +123,21 @@ PUCHAR Buffer, ULONG Count) { - if (IoPortProc[Port].OutsB) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsB) { IoPortProc[Port].OutsB(Port, Buffer, Count); } - else - { - while (Count--) - { - IOWriteB(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outsb_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outsb_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOWriteB(Port, Buffer++); } }
@@ -124,9 +145,16 @@ IOReadW(ULONG Port, PUSHORT Buffer) { - if (IoPortProc[Port].InW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InW) { *Buffer = IoPortProc[Port].InW(Port); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.inw_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.inw_handler((WORD)Port, Buffer); } else { @@ -144,16 +172,21 @@ PUSHORT Buffer, ULONG Count) { - if (IoPortProc[Port].InsW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsW) { IoPortProc[Port].InsW(Port, Buffer, Count); } - else - { - while (Count--) - { - IOReadW(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.insw_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.insw_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOReadW(Port, Buffer++); } }
@@ -161,9 +194,16 @@ IOWriteW(ULONG Port, PUSHORT Buffer) { - if (IoPortProc[Port].OutW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutW) { IoPortProc[Port].OutW(Port, *Buffer); + } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outw_handler) + { + ASSERT(Port <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outw_handler((WORD)Port, *Buffer); } else { @@ -182,16 +222,21 @@ PUSHORT Buffer, ULONG Count) { - if (IoPortProc[Port].OutsW) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsW) { IoPortProc[Port].OutsW(Port, Buffer, Count); } - else - { - while (Count--) - { - IOWriteW(Port, Buffer++); - } + else if (IoPortProc[Port].hVdd > 0 && + IoPortProc[Port].VddIoHandlers.outsw_handler) + { + ASSERT(Port <= MAXWORD); + ASSERT(Count <= MAXWORD); + IoPortProc[Port].VddIoHandlers.outsw_handler((WORD)Port, Buffer, (WORD)Count); + } + else + { + while (Count--) IOWriteW(Port, Buffer++); } }
@@ -199,7 +244,8 @@ IOReadD(ULONG Port, PULONG Buffer) { - if (IoPortProc[Port].InD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InD) { *Buffer = IoPortProc[Port].InD(Port); } @@ -219,16 +265,14 @@ PULONG Buffer, ULONG Count) { - if (IoPortProc[Port].InsD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].InsD) { IoPortProc[Port].InsD(Port, Buffer, Count); } else { - while (Count--) - { - IOReadD(Port, Buffer++); - } + while (Count--) IOReadD(Port, Buffer++); } }
@@ -236,7 +280,8 @@ IOWriteD(ULONG Port, PULONG Buffer) { - if (IoPortProc[Port].OutD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutD) { IoPortProc[Port].OutD(Port, *Buffer); } @@ -257,16 +302,14 @@ PULONG Buffer, ULONG Count) { - if (IoPortProc[Port].OutsD) + if (IoPortProc[Port].hVdd == INVALID_HANDLE_VALUE && + IoPortProc[Port].OutsD) { IoPortProc[Port].OutsD(Port, Buffer, Count); } else { - while (Count--) - { - IOWriteD(Port, Buffer++); - } + while (Count--) IOWriteD(Port, Buffer++); } }
@@ -285,12 +328,19 @@ IoPortProc[Port].OutB = OutHandler; else DPRINT1("IoPortProc[0x%X].OutB already registered\n", Port); + + /* We hold the I/O port internally */ + IoPortProc[Port].hVdd = INVALID_HANDLE_VALUE; }
VOID UnregisterIoPort(ULONG Port) { - IoPortProc[Port].InB = NULL; - IoPortProc[Port].OutB = NULL; + /* + * Put automagically all the fields to zero: + * the hVdd gets unregistered as well as all the handlers. + */ + // IoPortProc[Port] = {NULL}; + ZeroMemory(&IoPortProc[Port], sizeof(IoPortProc[Port])); }
VOID WINAPI
-
hbelusca＠svn.reactos.org