(handle->rep_trans, handle->usb_handle,
handle->ep_rep, sg_buf, 13, NULL, NULL, 0);
res = submit_wait(handle, handle->rep_trans);
- /* The STLink doesn't seem to evaluate the sequence number */
+ /* The STLink doesn't seem to evaluate the sequence number */
handle->sg_transfer_idx++;
if (res ) return -1;
}
}
}
-int _stlink_usb_target_voltage(stlink_t *sl) {
+int32_t _stlink_usb_target_voltage(stlink_t *sl) {
struct stlink_libusb * const slu = sl->backend_data;
unsigned char* const rdata = sl->q_buf;
unsigned char* const cmd = sl->c_buf;
char *device = getenv("STLINK_DEVICE");
if (device) {
- char *c = strchr(device,':');
- if (c==NULL) {
- WLOG("STLINK_DEVICE must be <USB_BUS>:<USB_ADDR> format\n");
- goto on_error;
- }
- devBus=atoi(device);
- *c++=0;
- devAddr=atoi(c);
- ILOG("bus %03d dev %03d\n",devBus, devAddr);
+ char *c = strchr(device,':');
+ if (c==NULL) {
+ WLOG("STLINK_DEVICE must be <USB_BUS>:<USB_ADDR> format\n");
+ goto on_error;
+ }
+ devBus=atoi(device);
+ *c++=0;
+ devAddr=atoi(c);
+ ILOG("bus %03d dev %03d\n",devBus, devAddr);
}
while (cnt){
- cnt--;
+ cnt--;
libusb_get_device_descriptor( list[cnt], &desc );
if (desc.idVendor!=USB_ST_VID) continue;
if (devBus && devAddr)
if ((libusb_get_bus_number(list[cnt])!=devBus) || (libusb_get_device_address(list[cnt])!=devAddr)) continue;
- if (desc.idProduct == USB_STLINK_32L_PID) break;
+ if ( (desc.idProduct == USB_STLINK_32L_PID) || (desc.idProduct == USB_STLINK_NUCLEO_PID) ) break;
if (desc.idProduct == USB_STLINK_PID) {
slu->protocoll = 1;
break;
}
if (cnt < 0) {
- WLOG ("Couldn't find %s ST-Link/V2 devices\n",(devBus && devAddr)?"matched":"any");
- goto on_error;
+ WLOG ("Couldn't find %s ST-Link/V2 devices\n",(devBus && devAddr)?"matched":"any");
+ goto on_error;
} else {
- if( libusb_open(list[cnt], &slu->usb_handle) !=0){
- WLOG("Couldn't open ST-Link/V2 device %03d:%03d\n",libusb_get_bus_number(list[cnt]), libusb_get_device_address(list[cnt]));
- goto on_error;
- }
+ int error = libusb_open(list[cnt], &slu->usb_handle);
+ if( error !=0 ) {
+ WLOG("Error %d opening ST-Link/V2 device %03d:%03d\n", error, libusb_get_bus_number(list[cnt]), libusb_get_device_address(list[cnt]));
+ goto on_error;
+ }
}
libusb_free_device_list(list, 1);
WLOG("libusb_alloc_transfer failed\n");
goto on_libusb_error;
}
+
// TODO - could use the scanning techniq from stm8 code here...
slu->ep_rep = 1 /* ep rep */ | LIBUSB_ENDPOINT_IN;
- slu->ep_req = 2 /* ep req */ | LIBUSB_ENDPOINT_OUT;
+ if (desc.idProduct == USB_STLINK_NUCLEO_PID) {
+ slu->ep_req = 1 /* ep req */ | LIBUSB_ENDPOINT_OUT;
+ } else {
+ slu->ep_req = 2 /* ep req */ | LIBUSB_ENDPOINT_OUT;
+ }
slu->sg_transfer_idx = 0;
// TODO - never used at the moment, always CMD_SIZE