vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

correctly pass interfno and don't use GetReport

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-21 13:56:55 +02:00
parent 12cbb3ccd0
commit bcfa613bc4
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
term/usb_keyboard.c
View file

@ -167,11 +167,11 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
/* Place the device in boot mode. */ /* Place the device in boot mode. */
grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT, grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
USB_HID_SET_PROTOCOL, 0, 0, 0, 0); USB_HID_SET_PROTOCOL, 0, interfno, 0, 0);
/* Reports every time an event occurs and not more often than that. */ /* Reports every time an event occurs and not more often than that. */
grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT, grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
USB_HID_SET_IDLE, 0<<8, 0, 0, 0); USB_HID_SET_IDLE, 0<<8, interfno, 0, 0);
grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term, grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term,
sizeof (grub_usb_keyboards[curnum])); sizeof (grub_usb_keyboards[curnum]));
@ -185,12 +185,18 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
return 0; return 0;
} }
/* Test showed that getting report may make the keyboard go nuts.
Moreover since we're reattaching keyboard it usually sends
an initial message on interrupt pipe and so we retrieve
the same keystatus.
*/
#if 0
{ {
grub_uint8_t report[8]; grub_uint8_t report[8];
grub_usb_err_t err; grub_usb_err_t err;
grub_memset (report, 0, sizeof (report)); grub_memset (report, 0, sizeof (report));
err = grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN, err = grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
USB_HID_GET_REPORT, 0x0000, interfno, USB_HID_GET_REPORT, 0x0100, interfno,
sizeof (report), (char *) report); sizeof (report), (char *) report);
if (err) if (err)
{ {
@ -203,6 +209,10 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
data->key = report[2] ? : -1; data->key = report[2] ? : -1;
} }
} }
#else
data->status = 0;
data->key = -1;
#endif
grub_term_register_input_active ("usb_keyboard", &grub_usb_keyboards[curnum]); grub_term_register_input_active ("usb_keyboard", &grub_usb_keyboards[curnum]);
@ -279,6 +289,8 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
struct grub_usb_keyboard_data *termdata = term->data; struct grub_usb_keyboard_data *termdata = term->data;
int mods = 0; int mods = 0;
grub_usb_keyboard_checkkey (term);
/* Check Shift, Control, and Alt status. */ /* Check Shift, Control, and Alt status. */
if (termdata->status & 0x02 || termdata->status & 0x20) if (termdata->status & 0x02 || termdata->status & 0x20)
mods |= GRUB_TERM_STATUS_SHIFT; mods |= GRUB_TERM_STATUS_SHIFT;