projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "grep: Version.h: No such file or directory" error when including the core LUFA...
[pub/USBasp.git]
/
Bootloaders
/
HID
/
HostLoaderApp
/
hid_bootloader_cli.c
diff --git
a/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
b/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
index
c86b0da
..
058ccc6
100644
(file)
--- a/
Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
+++ b/
Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
@@
-657,6
+657,11
@@
int hard_reboot(void)
#include <dev/usb/usb_ioctl.h>
#endif
#include <dev/usb/usb_ioctl.h>
#endif
+#ifndef USB_GET_DEVICEINFO
+# define USB_GET_DEVICEINFO 0
+# error The USB_GET_DEVICEINFO ioctl() value is not defined for your system.
+#endif
+
int open_usb_device(int vid, int pid)
{
int r, fd;
int open_usb_device(int vid, int pid)
{
int r, fd;
@@
-712,7
+717,7
@@
int teensy_write(void *buf, int len, double timeout)
{
int r;
{
int r;
- // TODO: im
e
plement timeout... how??
+ // TODO: implement timeout... how??
r = write(uhid_teensy_fd, buf, len);
if (r == len) return 1;
return 0;
r = write(uhid_teensy_fd, buf, len);
if (r == len) return 1;
return 0;
@@
-807,7
+812,7
@@
int read_intel_hex(const char *filename)
/* parses a line of intel hex code, stores the data in bytes[] */
/* and the beginning address in addr, and returns a 1 if the */
/* parses a line of intel hex code, stores the data in bytes[] */
/* and the beginning address in addr, and returns a 1 if the */
-/* line was valid, or a 0 if an error occured. The variable */
+/* line was valid, or a 0 if an error occur
r
ed. The variable */
/* num gets the number of bytes that were stored into bytes[] */
/* num gets the number of bytes that were stored into bytes[] */