forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix errors in the hid_bootloader_cli.c program code.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 7d823d926f
commit 57b382558d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File

33
Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
Unescape View File

@ -249,9 +249,8 @@ int teensy_open(void)
teensy_close(); teensy_close();
libusb_teensy_handle = open_usb_device(0x16C0, 0x0478); libusb_teensy_handle = open_usb_device(0x16C0, 0x0478);
if (!libusb_teensy_handle) { if (!libusb_teensy_handle)
libusb_teensy_handle = open_usb_device(0x03eb, 0x2067); libusb_teensy_handle = open_usb_device(0x03eb, 0x2067);
}
if (!libusb_teensy_handle) return 0; if (!libusb_teensy_handle) return 0;
return 1; return 1;
@ -283,9 +282,8 @@ int hard_reboot(void)
rebootor = open_usb_device(0x16C0, 0x0477); rebootor = open_usb_device(0x16C0, 0x0477);
if (!rebootor) { if (!rebootor)
rebootor = open_usb_device(0x03eb, 0x2067); rebootor = open_usb_device(0x03eb, 0x2067);
}
if (!rebootor) return 0; if (!rebootor) return 0;
r = usb_control_msg(rebootor, 0x21, 9, 0x0200, 0, "reboot", 6, 100); r = usb_control_msg(rebootor, 0x21, 9, 0x0200, 0, "reboot", 6, 100);
@ -414,12 +412,11 @@ int teensy_open(void)
teensy_close(); teensy_close();
win32_teensy_handle = open_usb_device(0x16C0, 0x0478); win32_teensy_handle = open_usb_device(0x16C0, 0x0478);
if (win32_teensy_handle) { if (!win32_teensy_handle)
win32_teensy_handle = open_usb_device(0x03eb, 0x2067); win32_teensy_handle = open_usb_device(0x03eb, 0x2067);
}
if (win32_teensy_handle) return 1; if (!win32_teensy_handle) return 0;
return 0; return 1;
} }
int teensy_write(void *buf, int len, double timeout) int teensy_write(void *buf, int len, double timeout)
@ -444,9 +441,8 @@ int hard_reboot(void)
rebootor = open_usb_device(0x16C0, 0x0477); rebootor = open_usb_device(0x16C0, 0x0477);
if (!rebootor) { if (!rebootor)
rebootor = open_usb_device(0x03eb, 0x2067); rebootor = open_usb_device(0x03eb, 0x2067);
}
if (!rebootor) return 0; if (!rebootor) return 0;
r = write_usb_device(rebootor, "reboot", 6, 100); r = write_usb_device(rebootor, "reboot", 6, 100);
@ -601,12 +597,11 @@ int teensy_open(void)
teensy_close(); teensy_close();
iokit_teensy_reference = open_usb_device(0x16C0, 0x0478); iokit_teensy_reference = open_usb_device(0x16C0, 0x0478);
if (!iokit_teensy_reference) { if (!iokit_teensy_reference)
iokit_teensy_reference = open_usb_device(0x03eb, 0x2067); iokit_teensy_reference = open_usb_device(0x03eb, 0x2067);
}
if (iokit_teensy_reference) return 1; if (!iokit_teensy_reference) return 0;
return 0; return 1;
} }
int teensy_write(void *buf, int len, double timeout) int teensy_write(void *buf, int len, double timeout)
@ -638,9 +633,8 @@ int hard_reboot(void)
rebootor = open_usb_device(0x16C0, 0x0477); rebootor = open_usb_device(0x16C0, 0x0477);
if (!rebootor) { if (!rebootor)
rebootor = open_usb_device(0x03eb, 0x2067); rebootor = open_usb_device(0x03eb, 0x2067);
}
if (!rebootor) return 0; if (!rebootor) return 0;
ret = IOHIDDeviceSetReport(rebootor, ret = IOHIDDeviceSetReport(rebootor,
@ -716,6 +710,10 @@ int teensy_open(void)
{ {
teensy_close(); teensy_close();
uhid_teensy_fd = open_usb_device(0x16C0, 0x0478); uhid_teensy_fd = open_usb_device(0x16C0, 0x0478);
if (uhid_teensy_fd < 0)
uhid_teensy_fd = open_usb_device(0x03eb, 0x2067);
if (uhid_teensy_fd < 0) return 0; if (uhid_teensy_fd < 0) return 0;
return 1; return 1;
} }
@ -744,9 +742,8 @@ int hard_reboot(void)
rebootor_fd = open_usb_device(0x16C0, 0x0477); rebootor_fd = open_usb_device(0x16C0, 0x0477);
if (rebootor_fd < 0) { if (rebootor_fd < 0)
rebootor_fd = open_usb_device(0x03eb, 0x2067); rebootor_fd = open_usb_device(0x03eb, 0x2067);
}
if (rebootor_fd < 0) return 0; if (rebootor_fd < 0) return 0;
r = write(rebootor_fd, "reboot", 6); r = write(rebootor_fd, "reboot", 6);

Write Preview
Loading…
Cancel
Save