Was reporting geometry backwards, and needed to add a raw output mode

svn path=/trunk/; revision=1127
This commit is contained in:
Phillip Susi 2000-04-23 17:42:57 +00:00
parent 6ac6c50282
commit 4f6c860da3

View file

@ -1,4 +1,4 @@
/* $Id: blue.c,v 1.20 2000/02/24 13:16:40 ekohl Exp $ /* $Id: blue.c,v 1.21 2000/04/23 17:42:57 phreak Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -157,15 +157,15 @@ NTSTATUS
ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp) ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
{ {
PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp);
PDEVICE_EXTENSION DeviceExtension; PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension;
NTSTATUS Status; NTSTATUS Status;
char *pch = Irp->UserBuffer; char *pch = Irp->UserBuffer;
char *vidmem; char *vidmem;
int i, j, offset; int i, j, offset;
int cursorx, cursory; int cursorx, cursory;
int rows, columns; int rows, columns;
int processed = DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT;
DeviceExtension = DeviceObject->DeviceExtension;
vidmem = DeviceExtension->VideoMemory; vidmem = DeviceExtension->VideoMemory;
rows = DeviceExtension->Rows; rows = DeviceExtension->Rows;
columns = DeviceExtension->Columns; columns = DeviceExtension->Columns;
@ -178,6 +178,13 @@ ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
cursory = offset / columns; cursory = offset / columns;
cursorx = offset % columns; cursorx = offset % columns;
if( processed == 0 )
{
/* raw output mode */
memcpy( &vidmem[(cursorx * 2) + (cursory * columns * 2)], pch, stk->Parameters.Write.Length );
offset += (stk->Parameters.Write.Length / 2);
}
else {
for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) for (i = 0; i < stk->Parameters.Write.Length; i++, pch++)
{ {
switch (*pch) switch (*pch)
@ -254,7 +261,7 @@ ScrWrite (PDEVICE_OBJECT DeviceObject, PIRP Irp)
/* Set the cursor position */ /* Set the cursor position */
offset = (cursory * columns) + cursorx; offset = (cursory * columns) + cursorx;
}
WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO);
WRITE_PORT_UCHAR (CRTC_DATA, offset); WRITE_PORT_UCHAR (CRTC_DATA, offset);
WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI);
@ -296,8 +303,8 @@ ScrIoControl (PDEVICE_OBJECT DeviceObject, PIRP Irp)
offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); offset += (READ_PORT_UCHAR (CRTC_DATA) << 8);
__asm__("sti\n\t"); __asm__("sti\n\t");
pcsbi->dwSize.X = rows; pcsbi->dwSize.X = columns;
pcsbi->dwSize.Y = columns; pcsbi->dwSize.Y = rows;
pcsbi->dwCursorPosition.X = (SHORT)(offset % columns); pcsbi->dwCursorPosition.X = (SHORT)(offset % columns);
pcsbi->dwCursorPosition.Y = (SHORT)(offset / columns); pcsbi->dwCursorPosition.Y = (SHORT)(offset / columns);