diff options
| author | cpldcpu <cpldcpu@gmail.com> | 2014-01-15 19:25:30 +0100 |
|---|---|---|
| committer | cpldcpu <cpldcpu@gmail.com> | 2014-01-15 19:25:30 +0100 |
| commit | b9040331bb91660b02f37ec1952ceef20c8f1957 (patch) | |
| tree | aceeb20bd300c89c22e8a30acf30d814ee2ed11d /commandline/library | |
| parent | f66fdcdbe80fdfa92dd9356a205d923c5c655d13 (diff) | |
| parent | 993bed77e563054f12ac61b5d8f93e2cb548525e (diff) | |
| download | micronucleus-b9040331bb91660b02f37ec1952ceef20c8f1957.tar.gz micronucleus-b9040331bb91660b02f37ec1952ceef20c8f1957.tar.bz2 micronucleus-b9040331bb91660b02f37ec1952ceef20c8f1957.zip | |
Merge remote-tracking branch 'origin/master' into testing-V2-New
Conflicts:
commandline/builds/Windows/micronucleus.exe
Diffstat (limited to 'commandline/library')
| -rw-r--r-- | commandline/library/micronucleus_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c index dd10d25..76594d8 100644 --- a/commandline/library/micronucleus_lib.c +++ b/commandline/library/micronucleus_lib.c @@ -207,7 +207,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 1, page_length, address, - page_buffer, page_length, + (char*)page_buffer, page_length, MICRONUCLEUS_USB_TIMEOUT); if (res != page_length) return -1; |