summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--commandline/Makefile2
-rw-r--r--commandline/builds/Windows/libusb-1.0.dllbin252580 -> 0 bytes
-rw-r--r--commandline/builds/Windows/micronucleus.exebin105712 -> 27662 bytes
-rw-r--r--commandline/library/micronucleus_lib.c251
-rw-r--r--commandline/library/micronucleus_lib.h14
-rw-r--r--commandline/micronucleus.c8
6 files changed, 133 insertions, 142 deletions
diff --git a/commandline/Makefile b/commandline/Makefile
index 9a4b501..e8aadfd 100644
--- a/commandline/Makefile
+++ b/commandline/Makefile
@@ -27,7 +27,7 @@ else ifeq ($(shell uname), OpenBSD)
OSFLAG = -D OPENBSD
else
USBFLAGS = -I C:\MinGW\include
- USBLIBS = -L C:\MinGW\lib -lusb-1.0
+ USBLIBS = -L C:\MinGW\lib -lusb
EXE_SUFFIX = .exe
OSFLAG = -D WIN
endif
diff --git a/commandline/builds/Windows/libusb-1.0.dll b/commandline/builds/Windows/libusb-1.0.dll
deleted file mode 100644
index a2e99dd..0000000
--- a/commandline/builds/Windows/libusb-1.0.dll
+++ /dev/null
Binary files differ
diff --git a/commandline/builds/Windows/micronucleus.exe b/commandline/builds/Windows/micronucleus.exe
index b4cb629..aa4752f 100644
--- a/commandline/builds/Windows/micronucleus.exe
+++ b/commandline/builds/Windows/micronucleus.exe
Binary files differ
diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c
index 6cddb7c..0569dbe 100644
--- a/commandline/library/micronucleus_lib.c
+++ b/commandline/library/micronucleus_lib.c
@@ -4,7 +4,7 @@
(c) 2012 by ihsan Kehribar <ihsan@kehribar.me>
Changes for Micronucleus protocol version V2.x
(c) 2014 T. Bo"scke
-
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
@@ -32,105 +32,104 @@
micronucleus* micronucleus_connect(int fast_mode) {
micronucleus *nucleus = NULL;
- libusb_device **devs, **dev;
+ struct usb_bus *busses;
// intialise usb and find micronucleus device
- if (libusb_init(NULL) < 0 || libusb_get_device_list(NULL, &devs) < 0) return NULL;
-
- for (dev = devs; *dev; dev++) {
- struct libusb_device_descriptor desc;
-
- // skip device if we cannot get its descriptor
- if (libusb_get_device_descriptor(*dev, &desc) < 0) continue;
-
- if (desc.idVendor == MICRONUCLEUS_VENDOR_ID && desc.idProduct == MICRONUCLEUS_PRODUCT_ID) {
- nucleus = malloc(sizeof(micronucleus));
- nucleus->version.major = (desc.bcdDevice >> 8) & 0xFF;
- nucleus->version.minor = desc.bcdDevice & 0xFF;
-
- if (nucleus->version.major > MICRONUCLEUS_MAX_MAJOR_VERSION) {
- fprintf(stderr,
- "Warning: device with unknown new version of Micronucleus detected.\n"
- "This tool doesn't know how to upload to this new device. Updates may be available.\n"
- "Device reports version as: %d.%d\n",
- nucleus->version.major, nucleus->version.minor);
- return NULL;
- }
-
- if (libusb_open(*dev, &nucleus->device) < 0) return NULL;
-
- if (nucleus->version.major>=2) { // Version 2.x
- // get nucleus info
- unsigned char buffer[6];
- int res = libusb_control_transfer(nucleus->device, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_VENDOR|LIBUSB_RECIPIENT_DEVICE, 0, 0, 0, buffer, 6, MICRONUCLEUS_USB_TIMEOUT);
-
- // Device descriptor was found, but talking to it was not succesful. This can happen when the device is being reset.
- if (res<0) return NULL;
-
- assert(res >= 6);
-
- nucleus->flash_size = (buffer[0]<<8) + buffer[1];
- nucleus->page_size = buffer[2];
- nucleus->pages = (nucleus->flash_size / nucleus->page_size);
- if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
-
- nucleus->bootloader_start = nucleus->pages*nucleus->page_size;
-
- if ((nucleus->version.major>=2)&&(!fast_mode)) {
- // firmware v2 reports more aggressive write times. Add 2ms if fast mode is not used.
- nucleus->write_sleep = (buffer[3] & 127) + 2;
- } else {
- nucleus->write_sleep = (buffer[3] & 127);
+ usb_init();
+ usb_find_busses();
+ usb_find_devices();
+
+ busses = usb_get_busses();
+ struct usb_bus *bus;
+ for (bus = busses; bus; bus = bus->next) {
+ struct usb_device *dev;
+
+ for (dev = bus->devices; dev; dev = dev->next) {
+ /* Check if this device is a micronucleus */
+ if (dev->descriptor.idVendor == MICRONUCLEUS_VENDOR_ID && dev->descriptor.idProduct == MICRONUCLEUS_PRODUCT_ID) {
+ nucleus = malloc(sizeof(micronucleus));
+ nucleus->version.major = (dev->descriptor.bcdDevice >> 8) & 0xFF;
+ nucleus->version.minor = dev->descriptor.bcdDevice & 0xFF;
+
+ if (nucleus->version.major > MICRONUCLEUS_MAX_MAJOR_VERSION) {
+ fprintf(stderr,
+ "Warning: device with unknown new version of Micronucleus detected.\n"
+ "This tool doesn't know how to upload to this new device. Updates may be available.\n"
+ "Device reports version as: %d.%d\n",
+ nucleus->version.major, nucleus->version.minor);
+ return NULL;
}
- // if bit 7 of write sleep time is set, divide the erase time by four to
- // accomodate to the 4*page erase of the ATtiny841/441
- if (buffer[3]&128) {
- nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages / 4;
- } else {
- nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
+ nucleus->device = usb_open(dev);
+
+ if (nucleus->version.major>=2) { // Version 2.x
+ // get nucleus info
+ unsigned char buffer[6];
+ int res = usb_control_msg(nucleus->device, USB_ENDPOINT_IN| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0, 0, 0, (char *)buffer, 6, MICRONUCLEUS_USB_TIMEOUT);
+
+ // Device descriptor was found, but talking to it was not succesful. This can happen when the device is being reset.
+ if (res<0) return NULL;
+
+ assert(res >= 6);
+
+ nucleus->flash_size = (buffer[0]<<8) + buffer[1];
+ nucleus->page_size = buffer[2];
+ nucleus->pages = (nucleus->flash_size / nucleus->page_size);
+ if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
+
+ nucleus->bootloader_start = nucleus->pages*nucleus->page_size;
+
+ if ((nucleus->version.major>=2)&&(!fast_mode)) {
+ // firmware v2 reports more aggressive write times. Add 2ms if fast mode is not used.
+ nucleus->write_sleep = (buffer[3] & 127) + 2;
+ } else {
+ nucleus->write_sleep = (buffer[3] & 127);
+ }
+
+ // if bit 7 of write sleep time is set, divide the erase time by four to
+ // accomodate to the 4*page erase of the ATtiny841/441
+ if (buffer[3]&128) {
+ nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages / 4;
+ } else {
+ nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
+ }
+
+ nucleus->signature1 = buffer[4];
+ nucleus->signature2 = buffer[5];
+
+ } else { // Version 1.x
+ // get nucleus info
+ unsigned char buffer[4];
+ int res = usb_control_msg(nucleus->device, USB_ENDPOINT_IN| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0, 0, 0, (char *)buffer, 4, MICRONUCLEUS_USB_TIMEOUT);
+
+ // Device descriptor was found, but talking to it was not succesful. This can happen when the device is being reset.
+ if (res<0) return NULL;
+
+ assert(res >= 4);
+
+ nucleus->flash_size = (buffer[0]<<8) + buffer[1];
+ nucleus->page_size = buffer[2];
+ nucleus->pages = (nucleus->flash_size / nucleus->page_size);
+ if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
+
+ nucleus->bootloader_start = nucleus->pages*nucleus->page_size;
+
+ nucleus->write_sleep = (buffer[3] & 127);
+ nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
+
+ nucleus->signature1 = 0;
+ nucleus->signature2 = 0;
}
-
- nucleus->signature1 = buffer[4];
- nucleus->signature2 = buffer[5];
-
- } else { // Version 1.x
- // get nucleus info
- unsigned char buffer[4];
- int res = libusb_control_transfer(nucleus->device, LIBUSB_ENDPOINT_IN|LIBUSB_REQUEST_TYPE_VENDOR |LIBUSB_RECIPIENT_DEVICE, 0, 0, 0, buffer, 4, MICRONUCLEUS_USB_TIMEOUT);
-
- // Device descriptor was found, but talking to it was not succesful. This can happen when the device is being reset.
- if (res<0) return NULL;
-
- assert(res >= 4);
-
- nucleus->flash_size = (buffer[0]<<8) + buffer[1];
- nucleus->page_size = buffer[2];
- nucleus->pages = (nucleus->flash_size / nucleus->page_size);
- if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
-
- nucleus->bootloader_start = nucleus->pages*nucleus->page_size;
-
- nucleus->write_sleep = (buffer[3] & 127);
- nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
-
- nucleus->signature1 = 0;
- nucleus->signature2 = 0;
}
-
- // we've found the device; there's no sense in checking everything else
- break;
}
}
- libusb_free_device_list(devs, 1);
-
return nucleus;
}
int micronucleus_eraseFlash(micronucleus* deviceHandle, micronucleus_callback progress) {
int res;
- res = libusb_control_transfer(deviceHandle->device, LIBUSB_ENDPOINT_OUT|LIBUSB_REQUEST_TYPE_VENDOR|LIBUSB_RECIPIENT_DEVICE, 2, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+ res = usb_control_msg(deviceHandle->device, USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 2, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
// give microcontroller enough time to erase all writable pages and come back online
float i = 0;
@@ -148,12 +147,17 @@ int micronucleus_eraseFlash(micronucleus* deviceHandle, micronucleus_callback pr
is disconnecting and reconnecting. Under Windows, micronucleus can see this
and automatically reconnects prior to uploading the program. To get the
the same functionality, we must flag this state (the "-84" error result) by
- converting the return to 1 for the upper layer.
+ converting the return to -2 for the upper layer.
On Mac OS a common error is -34 = epipe, but adding it to this list causes:
Assertion failed: (res >= 4), function micronucleus_connect, file library/micronucleus_lib.c, line 63.
*/
if (res == -5 || res == -34 || res == -84) {
+ if (res == -34) {
+ usb_close(deviceHandle->device);
+ deviceHandle->device = NULL;
+ }
+
return 1; // recoverable errors
} else {
return res;
@@ -168,15 +172,15 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
unsigned int res;
unsigned int pagecontainsdata;
unsigned int userReset;
-
+
for (address = 0; address < deviceHandle->flash_size; address += deviceHandle->page_size) {
// work around a bug in older bootloader versions
if (deviceHandle->version.major == 1 && deviceHandle->version.minor <= 2
&& address / deviceHandle->page_size == deviceHandle->pages - 1) {
page_length = deviceHandle->flash_size % deviceHandle->page_size;
}
-
- pagecontainsdata=0;
+
+ pagecontainsdata=0;
// copy in bytes from user program
for (page_address = 0; page_address < page_length; page_address += 1) {
@@ -188,7 +192,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
}
}
- // Reset vector patching is done in the host tool in micronucleus >=2
+ // Reset vector patching is done in the host tool in micronucleus >=2
if (deviceHandle->version.major >=2)
{
if ( address == 0 ) {
@@ -196,90 +200,90 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
unsigned int word0,word1;
word0 = page_buffer [1] * 0x100 + page_buffer [0];
word1 = page_buffer [3] * 0x100 + page_buffer [2];
-
+
if (word0==0x940c) { // long jump
- userReset = word1;
+ userReset = word1;
} else if ((word0&0xf000)==0xc000) { // rjmp
- userReset = (word0 & 0x0fff) - 0 + 1;
+ userReset = (word0 & 0x0fff) - 0 + 1;
} else {
fprintf(stderr,
"The reset vector of the user program does not contain a branch instruction,\n"
"therefore the bootloader can not be inserted. Please rearrage your code.\n"
);
- return -1;
- }
-
- // Patch in jmp to bootloader.
+ return -1;
+ }
+
+ // Patch in jmp to bootloader.
if (deviceHandle->bootloader_start > 0x2000) {
// jmp
unsigned data = 0x940c;
page_buffer [ 0 ] = data >> 0 & 0xff;
page_buffer [ 1 ] = data >> 8 & 0xff;
page_buffer [ 2 ] = deviceHandle->bootloader_start >> 0 & 0xff;
- page_buffer [ 3 ] = deviceHandle->bootloader_start >> 8 & 0xff;
+ page_buffer [ 3 ] = deviceHandle->bootloader_start >> 8 & 0xff;
} else {
// rjmp
- unsigned data = 0xc000 | ((deviceHandle->bootloader_start/2 - 1) & 0x0fff);
+ unsigned data = 0xc000 | ((deviceHandle->bootloader_start/2 - 1) & 0x0fff);
page_buffer [ 0 ] = data >> 0 & 0xff;
page_buffer [ 1 ] = data >> 8 & 0xff;
}
-
+
}
-
+
if ( address >= deviceHandle->bootloader_start - deviceHandle->page_size ) {
// move user reset vector to end of last page
// The reset vector is always the last vector in the tinyvectortable
unsigned int user_reset_addr = (deviceHandle->pages*deviceHandle->page_size) - 4;
-
+
if (user_reset_addr > 0x2000) {
// jmp
unsigned data = 0x940c;
page_buffer [user_reset_addr - address + 0] = data >> 0 & 0xff;
page_buffer [user_reset_addr - address + 1] = data >> 8 & 0xff;
page_buffer [user_reset_addr - address + 2] = userReset >> 0 & 0xff;
- page_buffer [user_reset_addr - address + 3] = userReset >> 8 & 0xff;
+ page_buffer [user_reset_addr - address + 3] = userReset >> 8 & 0xff;
} else {
// rjmp
- unsigned data = 0xc000 | ((userReset - user_reset_addr/2 - 1) & 0x0fff);
+ unsigned data = 0xc000 | ((userReset - user_reset_addr/2 - 1) & 0x0fff);
page_buffer [user_reset_addr - address + 0] = data >> 0 & 0xff;
page_buffer [user_reset_addr - address + 1] = data >> 8 & 0xff;
}
}
- }
-
-
+ }
+
+
// always write last page so bootloader can insert the tiny vector table
if ( address >= deviceHandle->bootloader_start - deviceHandle->page_size )
pagecontainsdata = 1;
-
+
// ask microcontroller to write this page's data
if (pagecontainsdata) {
if (deviceHandle->version.major == 1) {
// Firmware rev.1 transfers a page as a single block
// ask microcontroller to write this page's data
- res = libusb_control_transfer(deviceHandle->device,
- LIBUSB_ENDPOINT_OUT| LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,
+ res = usb_control_msg(deviceHandle->device,
+ USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
1,
page_length, address,
page_buffer, page_length,
MICRONUCLEUS_USB_TIMEOUT);
} else if (deviceHandle->version.major >= 2) {
// Firmware rev.2 uses individual set up packets to transfer data
- res = libusb_control_transfer(deviceHandle->device, LIBUSB_ENDPOINT_OUT|LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, 1, page_length, address, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+ res = usb_control_msg(deviceHandle->device, USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 1, page_length, address, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
if (res) return -1;
int i;
-
+
for (i=0; i< page_length; i+=4)
{
int w1,w2;
w1=(page_buffer[i+1]<<8)+(page_buffer[i+0]<<0);
w2=(page_buffer[i+3]<<8)+(page_buffer[i+2]<<0);
-
- res = libusb_control_transfer(deviceHandle->device, LIBUSB_ENDPOINT_OUT|LIBUSB_REQUEST_TYPE_VENDOR|LIBUSB_RECIPIENT_DEVICE, 3, w1, w2, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+
+ res = usb_control_msg(deviceHandle->device, USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 3, w1, w2, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
if (res) return -1;
- }
- }
+ }
+ }
/*
res = usb_control_msg(deviceHandle->device,
USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -287,13 +291,13 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
page_length, address,
(char*)page_buffer, page_length,
MICRONUCLEUS_USB_TIMEOUT);
-
+
if (res != page_length) return -1;
*/
// give microcontroller enough time to write this page and come back online
delay(deviceHandle->write_sleep);
}
-
+
// call progress update callback if that's a thing
if (prog) prog(((float) address) / ((float) deviceHandle->flash_size));
@@ -307,7 +311,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
int micronucleus_startApp(micronucleus* deviceHandle) {
int res;
- res = libusb_control_transfer(deviceHandle->device, LIBUSB_ENDPOINT_OUT|LIBUSB_REQUEST_TYPE_VENDOR|LIBUSB_RECIPIENT_DEVICE, 4, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+ res = usb_control_msg(deviceHandle->device, USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE, 4, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
if(res!=0)
return -1;
@@ -315,8 +319,5 @@ int micronucleus_startApp(micronucleus* deviceHandle) {
return 0;
}
-void micronucleus_disconnect(micronucleus* deviceHandle) {
- libusb_close(deviceHandle->device);
- libusb_exit(NULL);
- free(deviceHandle);
-}
+
+
diff --git a/commandline/library/micronucleus_lib.h b/commandline/library/micronucleus_lib.h
index ce31f97..b691fa4 100644
--- a/commandline/library/micronucleus_lib.h
+++ b/commandline/library/micronucleus_lib.h
@@ -6,7 +6,7 @@
(c) 2012 by ihsan Kehribar <ihsan@kehribar.me>
Changes for Micronucleus protocol version V2.x
(c) 2014 T. Bo"scke
-
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
@@ -23,14 +23,14 @@
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
+ SOFTWARE.
*/
/********************************************************************************
* Header files
********************************************************************************/
#if defined WIN
- #include <libusb.h> // this is libusb, see http://libusb.sourceforge.net/
+ #include <lusb0_usb.h> // this is libusb, see http://libusb.sourceforge.net/
#else
#include <usb.h> // this is libusb, see http://libusb.sourceforge.net/
#endif
@@ -64,7 +64,7 @@ typedef struct _micronucleus_version {
// handle representing one micronucleus device
typedef struct _micronucleus {
- libusb_device_handle *device;
+ usb_dev_handle *device;
// general information about device
micronucleus_version version;
unsigned int flash_size; // programmable size (in bytes) of progmem
@@ -107,10 +107,4 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_len
int micronucleus_startApp(micronucleus* deviceHandle);
/*******************************************************************************/
-/********************************************************************************
-* Disconnects from the device and deinitializes libusb
-********************************************************************************/
-void micronucleus_disconnect(micronucleus* deviceHandle);
-/*******************************************************************************/
-
#endif
diff --git a/commandline/micronucleus.c b/commandline/micronucleus.c
index 91dbac4..14c1761 100644
--- a/commandline/micronucleus.c
+++ b/commandline/micronucleus.c
@@ -3,7 +3,7 @@ Created: September 2012
(c) 2012 by ihsan Kehribar <ihsan@kehribar.me>
Changes for Micronucleus protocol version V2.x
(c) 2014 T. Bo"scke
-
+
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
char* usage = "usage: micronucleus [--help] [--run] [--dump-progress] [--fast-mode] [--type intel-hex|raw] [--timeout integer] [--erase-only] filename";
#else
char* usage = "usage: micronucleus [--help] [--run] [--dump-progress] [--fast-mode] [--type intel-hex|raw] [--timeout integer] [--erase-only] filename [--no-ansi]";
- #endif
+ #endif
progress_step = 0;
progress_total_steps = 5; // steps: waiting, connecting, parsing, erasing, writing, (running)?
dump_progress = 0;
@@ -238,8 +238,6 @@ int main(int argc, char **argv) {
if (res == 1) { // erase disconnection bug workaround
printf(">> Eep! Connection to device lost during erase! Not to worry\n");
printf(">> This happens on some computers - reconnecting...\n");
-
- micronucleus_disconnect(my_device);
my_device = NULL;
delay(CONNECT_WAIT);
@@ -292,8 +290,6 @@ int main(int argc, char **argv) {
printProgress(1.0);
}
- micronucleus_disconnect(my_device);
-
printf(">> Micronucleus done. Thank you!\n");
return EXIT_SUCCESS;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 18:08:05 +0000