23 Jun
2013
23 Jun
'13
12:11 a.m.
Author: aandrejevic
Date: Sun Jun 23 00:11:45 2013
New Revision: 59296
URL: http://svn.reactos.org/svn/reactos?rev=59296&view=rev
Log:
[NTVDM]
Remove whitespace from empty lines.
Modified:
branches/ntvdm/subsystems/ntvdm/bios.c
branches/ntvdm/subsystems/ntvdm/dos.c
branches/ntvdm/subsystems/ntvdm/emulator.c
branches/ntvdm/subsystems/ntvdm/hardware.c
Modified: branches/ntvdm/subsystems/ntvdm/bios.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Jun 23 00:11:45 2013
@@ -55,27 +55,27 @@
CursorRow = ConsoleInfo.dwCursorPosition.Y;
ConsoleWidth = ConsoleInfo.dwSize.X;
ConsoleHeight = ConsoleInfo.dwSize.Y;
-
+
/* Initialize the PIC */
PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4);
PicWriteCommand(PIC_SLAVE_CMD, PIC_ICW1 | PIC_ICW1_ICW4);
-
+
/* Set the interrupt offsets */
PicWriteData(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT);
PicWriteData(PIC_SLAVE_DATA, BIOS_PIC_SLAVE_INT);
-
+
/* Tell the master PIC there is a slave at IRQ 2 */
PicWriteData(PIC_MASTER_DATA, 1 << 2);
PicWriteData(PIC_SLAVE_DATA, 2);
-
+
/* Make sure the PIC is in 8086 mode */
PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086);
PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086);
-
+
/* Clear the masks for both PICs */
PicWriteData(PIC_MASTER_DATA, 0x00);
PicWriteData(PIC_SLAVE_DATA, 0x00);
-
+
PitWriteCommand(0x34);
PitWriteData(0, 0x00);
PitWriteData(0, 0x00);
@@ -230,7 +230,7 @@
Position.X = Rect.Left;
if (HIBYTE(Eax) == 0x06) Position.Y = Rect.Top - LOBYTE(Eax);
else Position.Y = Rect.Top + LOBYTE(Eax);
-
+
ScrollConsoleScreenBuffer(ConsoleOutput,
&Rect,
&Rect,
Modified: branches/ntvdm/subsystems/ntvdm/dos.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Jun 23 00:11:45 2013
@@ -581,7 +581,7 @@
(Eax & 0xFFFFFF00) | SystemTime.wDayOfWeek);
break;
}
-
+
/* Set system date */
case 0x2B:
{
@@ -589,7 +589,7 @@
SystemTime.wYear = LOWORD(Ecx);
SystemTime.wMonth = HIBYTE(Edx);
SystemTime.wDay = LOBYTE(Edx);
-
+
if (SetLocalTime(&SystemTime))
{
/* Return success */
@@ -600,7 +600,7 @@
/* Return failure */
EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF);
}
-
+
break;
}
@@ -618,7 +618,7 @@
| (SystemTime.wMilliseconds / 10));
break;
}
-
+
/* Set system time */
case 0x2D:
{
@@ -627,7 +627,7 @@
SystemTime.wMinute = LOBYTE(Ecx);
SystemTime.wSecond = HIBYTE(Edx);
SystemTime.wMilliseconds = LOBYTE(Edx) * 10;
-
+
if (SetLocalTime(&SystemTime))
{
/* Return success */
@@ -638,7 +638,7 @@
/* Return failure */
EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF);
}
-
+
break;
}
Modified: branches/ntvdm/subsystems/ntvdm/emulator.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Jun 23 00:11:45 2013
@@ -64,7 +64,7 @@
*Buffer = PicReadCommand(Address);
break;
}
-
+
case PIC_MASTER_DATA:
case PIC_SLAVE_DATA:
{
@@ -77,7 +77,7 @@
static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size)
{
BYTE Byte = *Buffer;
-
+
switch (Address)
{
case PIT_COMMAND_PORT:
@@ -85,7 +85,7 @@
PitWriteCommand(Byte);
break;
}
-
+
case PIT_DATA_PORT(0):
case PIT_DATA_PORT(1):
case PIT_DATA_PORT(2):
@@ -93,14 +93,14 @@
PitWriteData(Address - PIT_DATA_PORT(0), Byte);
break;
}
-
+
case PIC_MASTER_CMD:
case PIC_SLAVE_CMD:
{
PicWriteCommand(Address, Byte);
break;
}
-
+
case PIC_MASTER_DATA:
case PIC_SLAVE_DATA:
{
@@ -147,7 +147,7 @@
VdmRunning = FALSE;
return;
}
-
+
/* Check if this was an PIC IRQ */
if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT +
8)
{
Modified: branches/ntvdm/subsystems/ntvdm/hardware.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware…
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Sun Jun 23 00:11:45 2013
@@ -61,15 +61,15 @@
{
return FALSE;
}
-
+
/* Insert the value in the queue */
KeyboardQueue[KeyboardQueueEnd] = ScanCode;
KeyboardQueueEnd++;
KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE;
-
+
/* Since we inserted a value, it's not empty anymore */
KeyboardQueueEmpty = FALSE;
-
+
return TRUE;
}
@@ -78,20 +78,20 @@
{
/* Make sure the keyboard queue is not empty */
if (KeyboardQueueEmpty) return FALSE;
-
+
/* Get the scan code */
*ScanCode = KeyboardQueue[KeyboardQueueStart];
-
+
/* Remove the value from the queue */
KeyboardQueueStart++;
KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE;
-
+
/* Check if the queue is now empty */
if (KeyboardQueueStart == KeyboardQueueEnd)
{
KeyboardQueueEmpty = TRUE;
}
-
+
return TRUE;
}
#endif
@@ -101,11 +101,11 @@
BYTE PicReadCommand(BYTE Port)
{
PPIC Pic;
-
+
/* Which PIC are we accessing? */
if (Port == PIC_MASTER_CMD) Pic = &MasterPic;
else Pic = &SlavePic;
-
+
if (Pic->ReadIsr)
{
/* Read the in-service register */
@@ -122,11 +122,11 @@
VOID PicWriteCommand(BYTE Port, BYTE Value)
{
PPIC Pic;
-
+
/* Which PIC are we accessing? */
if (Port == PIC_MASTER_CMD) Pic = &MasterPic;
else Pic = &SlavePic;
-
+
if (Value & PIC_ICW1)
{
/* Start initialization */
@@ -136,7 +136,7 @@
Pic->ConfigRegister = Value;
return;
}
-
+
if (Value & PIC_OCW3)
{
/* This is an OCR3 */
@@ -145,10 +145,10 @@
/* Return the ISR on next read from command port */
Pic->ReadIsr = TRUE;
}
-
+
return;
}
-
+
/* This is an OCW2 */
if (Value & PIC_OCW2_EOI)
{
@@ -175,11 +175,11 @@
VOID PicWriteData(BYTE Port, BYTE Value)
{
PPIC Pic;
-
+
/* Which PIC are we accessing? */
if (Port == PIC_MASTER_DATA) Pic = &MasterPic;
else Pic = &SlavePic;
-
+
/* Is the PIC ready? */
if (!Pic->Initialization)
{
@@ -187,13 +187,13 @@
Pic->MaskRegister = Value;
return;
}
-
+
/* Has the interrupt offset been set? */
if (Pic->IntOffset == 0xFF)
{
/* This is an ICW2, set the offset (last three bits always zero) */
Pic->IntOffset = Value & 0xF8;
-
+
/* Check if we are in single mode and don't need an ICW4 */
if ((Pic->ConfigRegister & PIC_ICW1_SINGLE)
&& !(Pic->ConfigRegister & PIC_ICW1_ICW4))
@@ -203,14 +203,14 @@
}
return;
}
-
+
/* Check if we are in cascade mode and the cascade register was not set */
if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) &&
!Pic->CascadeRegisterSet)
{
/* This is an ICW3 */
Pic->CascadeRegister = Value;
Pic->CascadeRegisterSet = TRUE;
-
+
/* Check if we need an ICW4 */
if (!(Pic->ConfigRegister & PIC_ICW1_ICW4))
{
@@ -219,22 +219,22 @@
}
return;
}
-
+
/* This must be an ICW4, we will ignore the 8086 bit (assume always set) */
if (Value & PIC_ICW4_AEOI)
{
/* Use automatic end-of-interrupt */
Pic->AutoEoi = TRUE;
}
-
+
/* Done initializing */
Pic->Initialization = FALSE;
}
VOID PicInterruptRequest(BYTE Number)
-{
+{
BYTE i;
-
+
if (Number >= 0 && Number < 8)
{
/* Check if any of the higher-priorirty interrupts are busy */
@@ -242,10 +242,10 @@
{
if (MasterPic.InServiceRegister & (1 << Number)) return;
}
-
+
/* Check if the interrupt is masked */
if (MasterPic.MaskRegister & (1 << Number)) return;
-
+
/* Set the appropriate bit in the ISR and interrupt the CPU */
if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number;
EmulatorInterrupt(MasterPic.IntOffset + Number);
@@ -253,7 +253,7 @@
else if (Number >= 8 && Number < 16)
{
Number -= 8;
-
+
/*
* The slave PIC is connected to IRQ 2, always! If the master PIC
* was misconfigured, don't do anything.
@@ -263,20 +263,20 @@
{
return;
}
-
+
/* Check if any of the higher-priorirty interrupts are busy */
if (MasterPic.InServiceRegister != 0) return;
for (i = 0; i <= Number ; i++)
{
if (SlavePic.InServiceRegister & (1 << Number)) return;
}
-
+
/* Check if the interrupt is masked */
if (SlavePic.MaskRegister & (1 << Number)) return;
/* Set the IRQ 2 bit in the master ISR */
if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2;
-
+
/* Set the appropriate bit in the ISR and interrupt the CPU */
if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number;
EmulatorInterrupt(SlavePic.IntOffset + Number);
@@ -287,7 +287,7 @@
{
BYTE Channel = Value >> 6;
BYTE Mode = (Value >> 1) & 0x07;
-
+
/* Check if this is a counter latch command */
if (((Value >> 4) & 3) == 0)
{
@@ -295,14 +295,14 @@
PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue;
return;
}
-
+
/* Set the access mode and reset flip-flops */
PitChannels[Channel].AccessMode = (Value >> 4) & 3;
PitChannels[Channel].Pulsed = FALSE;
PitChannels[Channel].LatchSet = FALSE;
PitChannels[Channel].InputFlipFlop = FALSE;
PitChannels[Channel].OutputFlipFlop = FALSE;
-
+
switch (Mode)
{
case 0:
@@ -315,13 +315,13 @@
PitChannels[Channel].Mode = Mode;
break;
}
-
+
case 6:
{
PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR;
break;
}
-
+
case 7:
{
PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE;
@@ -339,20 +339,20 @@
if (PitChannels[Channel].LatchSet)
{
CurrentValue = PitChannels[Channel].LatchedValue;
-
+
if (AccessMode == 1 || AccessMode == 2)
{
/* The latched value was read as one byte */
PitChannels[Channel].LatchSet = FALSE;
}
}
-
+
/* Use the flip-flop for access mode 3 */
if (AccessMode == 3)
{
AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2;
PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop;
-
+
/* Check if this was the last read for the latched value */
if (!PitChannels[Channel].InputFlipFlop)
{
@@ -360,7 +360,7 @@
PitChannels[Channel].LatchSet = FALSE;
}
}
-
+
switch (AccessMode)
{
case 1:
@@ -368,14 +368,14 @@
/* Low byte */
return CurrentValue & 0x00FF;
}
-
+
case 2:
{
/* High byte */
return CurrentValue >> 8;
}
}
-
+
/* Shouldn't get here */
return 0;
}
@@ -383,14 +383,14 @@
VOID PitWriteData(BYTE Channel, BYTE Value)
{
BYTE AccessMode = PitChannels[Channel].AccessMode;
-
+
/* Use the flip-flop for access mode 3 */
if (PitChannels[Channel].AccessMode == 3)
{
AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2;
PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop;
}
-
+
switch (AccessMode)
{
case 1:
@@ -400,7 +400,7 @@
PitChannels[Channel].ReloadValue |= Value;
break;
}
-
+
case 2:
{
/* High byte */
@@ -413,7 +413,7 @@
VOID PitDecrementCount()
{
INT i;
-
+
for (i = 0; i < PIT_CHANNELS; i++)
{
switch (PitChannels[i].Mode)
@@ -422,7 +422,7 @@
{
/* Decrement the value */
PitChannels[i].CurrentValue--;
-
+
/* Did it fall to the terminal count? */
if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed)
{
@@ -432,40 +432,40 @@
}
break;
}
-
+
case PIT_MODE_RATE_GENERATOR:
{
/* Decrement the value */
PitChannels[i].CurrentValue--;
-
+
/* Did it fall to zero? */
if (PitChannels[i].CurrentValue != 0) break;
/* Yes, raise the output line and reload */
if (i == 0) PicInterruptRequest(0);
PitChannels[i].CurrentValue = PitChannels[i].ReloadValue;
-
+
break;
}
-
+
case PIT_MODE_SQUARE_WAVE:
{
/* Decrement the value by 2 */
PitChannels[i].CurrentValue -= 2;
-
+
/* Did it fall to zero? */
if (PitChannels[i].CurrentValue != 0) break;
-
+
/* Yes, toggle the flip-flop */
PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop;
-
+
/* Did this create a rising edge in the signal? */
if (PitChannels[i].OutputFlipFlop)
{
/* Yes, IRQ 0 if this is channel 0 */
if (i == 0) PicInterruptRequest(0);
}
-
+
/* Reload the value, but make sure it's even */
if (PitChannels[i].ReloadValue % 2)
{
@@ -477,16 +477,16 @@
/* It was even */
PitChannels[i].CurrentValue = PitChannels[i].ReloadValue;
}
-
+
break;
}
-
+
case PIT_MODE_SOFTWARE_STROBE:
{
// TODO: NOT IMPLEMENTED
break;
}
-
+
case PIT_MODE_HARDWARE_ONE_SHOT:
case PIT_MODE_HARDWARE_STROBE:
{
@@ -503,42 +503,42 @@
HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE);
DWORD i, j, Count, TotalEvents;
BYTE ScanCode;
-
+
/* Get the number of input events */
if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return;
if (Count == 0) return;
-
+
/* Allocate the buffer */
Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count *
sizeof(INPUT_RECORD));
if (Buffer == NULL) return;
-
+
/* Peek the input events */
if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup;
-
+
for (i = 0; i < TotalEvents; i++)
{
/* Check if this is a key event */
if (Buffer[i].EventType != KEY_EVENT) continue;
-
+
/* Get the scan code */
ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode;
-
+
/* If this is a key release, set the highest bit in the scan code */
if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80;
-
+
/* Push the scan code onto the keyboard queue */
for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++)
{
KeyboardQueuePush(ScanCode);
}
-
+
/* Yes, IRQ 1 */
PicInterruptRequest(1);
-
+
/* Stop the loop */
break;
}
-
+
Cleanup:
HeapFree(GetProcessHeap(), 0, Buffer);
}
4163
days inactive
4163
days old
0 comments
1 participants
participants (1)
-
aandrejevic＠svn.reactos.org