Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow serial mouse driver and COM debug output to coexist peacefully.

Browse source 
Patch by Filip Navara

svn path=/trunk/; revision=5995
This commit is contained in:
Gé van Geldorp 2003-09-05 15:55:47 +00:00
parent 31b2a95597
commit 0320c0fcc2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/drivers/input/sermouse/sermouse.c
View file

@ -20,7 +20,7 @@
/* Check for mouse on COM1? */ /* Check for mouse on COM1? */
#define SERMOUSE_COM1_SUPPORT #define SERMOUSE_COM1_SUPPORT
/* Check for mouse on COM2? */ /* Check for mouse on COM2? */
#define SERMOUSE_COM2_SUPPORT //#define SERMOUSE_COM2_SUPPORT
/* Create \??\Mouse* symlink for device? */ /* Create \??\Mouse* symlink for device? */
#define SERMOUSE_MOUSESYMLINK_SUPPORT #define SERMOUSE_MOUSESYMLINK_SUPPORT
@ -271,10 +271,6 @@ SerialMouseInternalDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
switch (Stack->Parameters.DeviceIoControl.IoControlCode) switch (Stack->Parameters.DeviceIoControl.IoControlCode)
{ {
case IOCTL_INTERNAL_MOUSE_CONNECT: case IOCTL_INTERNAL_MOUSE_CONNECT:
/* Enable interrupts */
WRITE_PORT_UCHAR((PUCHAR)(DeviceExtension->MousePort) + 1, 1);
ClearMouse(DeviceExtension->MousePort);
DeviceExtension->ClassInformation = DeviceExtension->ClassInformation =
*((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer); *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer);
@ -529,9 +525,13 @@ InitializeMouse(ULONG Port, ULONG Irq, PDRIVER_OBJECT DriverObject)
InitializeSerialPort(Port, 2); InitializeSerialPort(Port, 2);
MouseType = DetectMicrosoftMouse(Port); MouseType = DetectMicrosoftMouse(Port);
/* Enable interrupts */
WRITE_PORT_UCHAR((PUCHAR)(Port) + 1, 1);
ClearMouse(Port);
/* No mouse, no need to continue */ /* No mouse, no need to continue */
if (MouseType == MOUSE_TYPE_NONE) if (MouseType == MOUSE_TYPE_NONE)
return FALSE; return FALSE;
/* Allocate new device */ /* Allocate new device */
DeviceObject = AllocatePointerDevice(DriverObject); DeviceObject = AllocatePointerDevice(DriverObject);