valentineus/0xFFFF
1
Fork 0
Code Releases Activity

all: Fix usb endpoints after conversion to libusb 1.0

Browse Source 
Endpoint in nolo.c for libusb_bulk_transfer must be 0x02, not 0x01.
This commit is contained in:
Pali Rohár committed 2016-02-21 20:52:21 +01:00
1 parent abcf256268
commit bc7894b99d
4 files changed
+18 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/cold-flash.c
+11 -13
View File
@@ -30,8 +30,6 @@
#include "usb-device.h"
#include "printf-utils.h"
#define READ_DEV 0x81
#define WRITE_DEV 0x01
#define READ_TIMEOUT 500
#define WRITE_TIMEOUT 3000
@@ -176,7 +174,7 @@ static int read_asic(libusb_device_handle * udev, uint8_t * asic_buffer, int siz
int ret, transferred;
printf("Waiting for ASIC ID...\n");
ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)asic_buffer, size, &transferred, READ_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_READ_EP, (unsigned char *)asic_buffer, size, &transferred, READ_TIMEOUT);
if ( ret < 0 )
ERROR_RETURN("Cannot read ASIC ID", -1);
if ( transferred != asic_size )
@@ -193,14 +191,14 @@ static int send_2nd(libusb_device_handle * udev, struct image * image) {
int ret, transferred;
printf("Sending OMAP peripheral boot message...\n");
ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)&omap_peripheral_msg, sizeof(omap_peripheral_msg), &transferred, WRITE_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)&omap_peripheral_msg, sizeof(omap_peripheral_msg), &transferred, WRITE_TIMEOUT);
if ( ret < 0 || transferred != sizeof(omap_peripheral_msg) )
ERROR_RETURN("Sending OMAP peripheral boot message failed", -1);
SLEEP(5000);
printf("Sending 2nd X-Loader image size...\n");
ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)&image->size, 4, &transferred, WRITE_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)&image->size, 4, &transferred, WRITE_TIMEOUT);
if ( ret < 0 || transferred != 4 )
ERROR_RETURN("Sending 2nd X-Loader image size failed", -1);
@@ -217,7 +215,7 @@ static int send_2nd(libusb_device_handle * udev, struct image * image) {
ret = image_read(image, buffer, need);
if ( ret == 0 )
break;
if ( libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)buffer, ret, &transferred, WRITE_TIMEOUT) < 0 )
if ( libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)buffer, ret, &transferred, WRITE_TIMEOUT) < 0 )
PRINTF_ERROR_RETURN("Sending 2nd X-Loader image failed", -1);
if ( ret != transferred )
PRINTF_ERROR_RETURN("Sending 2nd X-Loader image failed (incomplete bulk transfer)", -1);
@@ -240,13 +238,13 @@ static int send_secondary(libusb_device_handle * udev, struct image * image) {
init_msg = xloader_msg_create(XLOADER_MSG_TYPE_SEND, image);
printf("Sending X-Loader init message...\n");
ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)&init_msg, sizeof(init_msg), &transferred, WRITE_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)&init_msg, sizeof(init_msg), &transferred, WRITE_TIMEOUT);
if ( ret < 0 || transferred != sizeof(init_msg) )
ERROR_RETURN("Sending X-Loader init message failed", -1);
printf("Waiting for X-Loader response...\n");
SLEEP(5000);
ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)&buffer, 4, &transferred, READ_TIMEOUT); /* 4 bytes - dummy value */
ret = libusb_bulk_transfer(udev, USB_READ_EP, (unsigned char *)&buffer, 4, &transferred, READ_TIMEOUT); /* 4 bytes - dummy value */
if ( ret < 0 || transferred != 4 )
ERROR_RETURN("No response", -1);
@@ -261,7 +259,7 @@ static int send_secondary(libusb_device_handle * udev, struct image * image) {
ret = image_read(image, buffer, need);
if ( ret == 0 )
break;
if ( libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)buffer, ret, &transferred, WRITE_TIMEOUT) < 0 )
if ( libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)buffer, ret, &transferred, WRITE_TIMEOUT) < 0 )
PRINTF_ERROR_RETURN("Sending Secondary image failed", -1);
if ( ret != transferred )
PRINTF_ERROR_RETURN("Sending Secondary image failed (incomplete bulk transfer)", -1);
@@ -271,7 +269,7 @@ static int send_secondary(libusb_device_handle * udev, struct image * image) {
printf("Waiting for X-Loader response...\n");
SLEEP(5000);
ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)&buffer, 4, &transferred, READ_TIMEOUT); /* 4 bytes - dummy value */
ret = libusb_bulk_transfer(udev, USB_READ_EP, (unsigned char *)&buffer, 4, &transferred, READ_TIMEOUT); /* 4 bytes - dummy value */
if ( ret < 0 || transferred != 4 )
ERROR_RETURN("No response", -1);
@@ -291,7 +289,7 @@ static int ping_timeout(libusb_device_handle * udev) {
int try_read = 4;
printf("Sending X-Loader ping message\n");
ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)&ping_msg, sizeof(ping_msg), &transferred, WRITE_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)&ping_msg, sizeof(ping_msg), &transferred, WRITE_TIMEOUT);
if ( ret < 0 || transferred != sizeof(ping_msg) )
ERROR_RETURN("Sending X-Loader ping message failed", -1);
@@ -299,7 +297,7 @@ static int ping_timeout(libusb_device_handle * udev) {
while ( try_read > 0 ) {
uint32_t ping_read;
ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)&ping_read, sizeof(ping_read), &transferred, READ_TIMEOUT);
ret = libusb_bulk_transfer(udev, USB_READ_EP, (unsigned char *)&ping_read, sizeof(ping_read), &transferred, READ_TIMEOUT);
if ( ret == 0 && transferred == sizeof(ping_read) ) {
printf("Got it\n");
pong = 1;
@@ -415,7 +413,7 @@ int leave_cold_flash(struct usb_device_info * dev) {
int ret, transferred;
printf("Sending OMAP memory boot message...\n");
ret = libusb_bulk_transfer(dev->udev, WRITE_DEV, (unsigned char *)&omap_memory_msg, sizeof(omap_memory_msg), &transferred, WRITE_TIMEOUT);
ret = libusb_bulk_transfer(dev->udev, USB_WRITE_EP, (unsigned char *)&omap_memory_msg, sizeof(omap_memory_msg), &transferred, WRITE_TIMEOUT);
if ( ret < 0 || transferred != sizeof(omap_memory_msg) )
ERROR_RETURN("Sending OMAP memory boot message failed", -1);
src/mkii.c
+2 -5
View File
@@ -29,9 +29,6 @@
#include "device.h"
#include "usb-device.h"
#define READ_DEV 0x81
#define WRITE_DEV 0x01
#define MKII_OUT 0x8810001B
#define MKII_IN 0x8800101B
@@ -62,13 +59,13 @@ static int mkii_send_receive(libusb_device_handle * udev, uint8_t type, struct m
in_msg->num = number++;
in_msg->type = type;
ret = libusb_bulk_transfer(udev, WRITE_DEV, (unsigned char *)in_msg, data_size + sizeof(*in_msg), &transferred, 5000);
ret = libusb_bulk_transfer(udev, USB_WRITE_EP, (unsigned char *)in_msg, data_size + sizeof(*in_msg), &transferred, 5000);
if ( ret < 0 )
return ret;
if ( (size_t)transferred != data_size + sizeof(*in_msg) )
return -1;
ret = libusb_bulk_transfer(udev, READ_DEV, (unsigned char *)out_msg, out_size, &transferred, 5000);
ret = libusb_bulk_transfer(udev, USB_READ_EP, (unsigned char *)out_msg, out_size, &transferred, 5000);
if ( ret < 0 )
return ret;
if ( (size_t)transferred < sizeof(*out_msg) )
src/nolo.c
+1 -4
View File
@@ -29,9 +29,6 @@
#include "global.h"
#include "printf-utils.h"
#define READ_DEV 0x81
#define WRITE_DEV 0x01
/* Request type */
#define NOLO_WRITE 64
#define NOLO_QUERY 192
@@ -393,7 +390,7 @@ static int nolo_send_image(struct usb_device_info * dev, struct image * image, i
if ( ret == 0 )
break;
if ( ! simulate ) {
if ( libusb_bulk_transfer(dev->udev, WRITE_DEV, (unsigned char*)buf, ret, &transferred, 5000) < 0 ) {
if ( libusb_bulk_transfer(dev->udev, USB_WRITE_DATA_EP, (unsigned char*)buf, ret, &transferred, 5000) < 0 ) {
PRINTF_END();
NOLO_ERROR_RETURN("Sending image failed", -1);
}
src/usb-device.h
+4
View File
@@ -22,6 +22,10 @@
#include <libusb-1.0/libusb.h>
#define USB_READ_EP (LIBUSB_ENDPOINT_IN | 0x1)
#define USB_WRITE_EP (LIBUSB_ENDPOINT_OUT | 0x1)
#define USB_WRITE_DATA_EP (LIBUSB_ENDPOINT_OUT | 0x2)
#include "device.h"
enum usb_flash_protocol {