Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KBDHID]

Browse source 
- Implement IOCTL_KEYBOARD_QUERY_TYPEMATIC, IOCTL_KEYBOARD_SET_TYPEMATIC
- Fix bug in the dispatch routine
- Keyboard presses are no longer reported twice

svn path=/branches/usb-bringup-trunk/; revision=55369
This commit is contained in:
Johannes Anderwald 2012-02-01 14:28:02 +00:00
parent 704bae2492
commit 55cb471b4f
2 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/hid/kbdhid/kbdhid.c
View file

@ -53,15 +53,13 @@ KbdHid_InsertScanCodes(
{ {
DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF);
// /* init input data */
// set up input data
//
RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA));
/* use keyboard unit id */ /* use keyboard unit id */
InputData.UnitId = DeviceExtension->KeyboardIndicator.UnitId; InputData.UnitId = DeviceExtension->KeyboardTypematic.UnitId;
if (NewScanCodes[Index] > 0x7F) if (((UCHAR)(NewScanCodes[Index] & 0xFF))> 0x7F)
{ {
/* scan codes greater than 0x7F are a key break */ /* scan codes greater than 0x7F are a key break */
InputData.Flags |= KEY_BREAK; InputData.Flags |= KEY_BREAK;
@ -74,9 +72,7 @@ KbdHid_InsertScanCodes(
KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData);
} }
// /* done */
// done
//
return TRUE; return TRUE;
} }
@ -430,11 +426,22 @@ KbdHid_InternalDeviceControl(
} }
else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_TYPEMATIC) else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_TYPEMATIC)
{ {
/* not implemented */ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS))
DPRINT1("IOCTL_KEYBOARD_QUERY_TYPEMATIC not implemented\n"); {
Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; /* invalid parameter */
Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_INVALID_PARAMETER;
}
/* copy indicators */
RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DeviceExtension->KeyboardTypematic, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));
/* done */
Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS);
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_NOT_IMPLEMENTED; return STATUS_SUCCESS;
} }
else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS) else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS)
{ {
@ -457,11 +464,22 @@ KbdHid_InternalDeviceControl(
} }
else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC) else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC)
{ {
/* not implemented */ if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS))
DPRINT1("IOCTL_KEYBOARD_SET_TYPEMATIC not implemented\n"); {
Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; /* invalid parameter */
Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_INVALID_PARAMETER;
}
/* copy indicators */
RtlCopyMemory(&DeviceExtension->KeyboardTypematic, Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS));
/* done */
Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = 0;
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return STATUS_NOT_IMPLEMENTED; return STATUS_SUCCESS;
} }
else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION) else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION)
{ {

6
drivers/hid/kbdhid/kbdhid.h
View file

@ -114,6 +114,12 @@ typedef struct
// //
KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicator; KEYBOARD_INDICATOR_PARAMETERS KeyboardIndicator;
//
// keyboard type matic
//
KEYBOARD_TYPEMATIC_PARAMETERS KeyboardTypematic;
}KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION;