Zorchenhimer
/
INL-retro-progdump
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified: source/inlprog.c 

modified:   source/usb_operations.c
modified:   source/usb_operations.h
	-moving usb transfer operation to usb_operations
This commit is contained in:
Paul Molloy 2016-11-19 21:32:54 -06:00
parent 782ed343f7
commit 49c9876770
3 changed files with 78 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
host/source/inlprog.c
View File

@ -47,12 +47,10 @@ int main(int argc, char *argv[])
libusb_device_handle *rprog_handle = NULL; libusb_device_handle *rprog_handle = NULL;
rprog_handle = open_usb_device( context ); rprog_handle = open_usb_device( context );
check_debug(rprog_handle != NULL, "Unable to open INL retro-prog usb device handle."); check(rprog_handle != NULL, "Unable to open INL retro-prog usb device handle.");
int xfr_cnt = 0; int xfr_cnt = 0;
uint16_t wValue = 0; //setup packet wValue field
uint16_t wIndex = 0; //setup packet wIndex field
//uint8_t buffer8[8]; //8 is max payload for low speed devices' data packet //uint8_t buffer8[8]; //8 is max payload for low speed devices' data packet
//uint8_t buffer128[128]; //128 largest power of 2 for non-LONG_TRANSFERS with V-USB //uint8_t buffer128[128]; //128 largest power of 2 for non-LONG_TRANSFERS with V-USB
uint8_t buffer254[254]; //254 is max for non-LONG_TRANSFERS with V-USB uint8_t buffer254[254]; //254 is max for non-LONG_TRANSFERS with V-USB
@ -64,65 +62,24 @@ int main(int argc, char *argv[])
} }
char action = argv[1][0]; char action = argv[1][0];
//int libusb_control_transfer (libusb_device_handle *dev_handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout)
//
//SETUP PACKET FIELDS:
//bmRequestType: ORing of req type (STD/VENDOR), recipient (think we only care about DEVICE), endpoint direction IN-dev->host OUT-host->dev
//bRequest: single byte that can signify any 'command' or 'request' we setup.
//The wValue and wIndex fields allow parameters to be passed with the request. Think we can do whatever we want with these
//wLength is used the specify the number of bytes to be transferred should there be a data phase.
//wLength the length field for the setup packet. The data buffer should be at least this size.
// USB 1.1 low speed standard limits to 8 bytes
// V-USB seems to break this limit with max of 254 bytes (255 designates "USB_NO_MSG"
// V-USB allows "LONG TRANSFERS" utilizing full 16bit wLength for upto 16384 bytes = exactly 16KBytes
// although considering sram on AVR doesn't explode with long transfers and read/write functions are in 8byte chunks,
// I think it really is limited to 8bytes
// One idea to squeeze more data is have a request type defined that utilizes wValue and wIndex to gain 4bytes + 8buffer = 12bytes 50% gain
// Not sure how to gain access to wValue/wIndex with vusb drivers...
// answer: usbFunctionSetup will get called for every setup packet and pass all 8 bytes of setup packet
// Can ultimately answer this question by counting how many startup packets are recieved by usbFunciton setup for transfers >8 bytes
// If when sending >8 byte control transfers, a setup packet only comes once, then there is nothing to abuse
// however if the same setup packet gets sent for every 8 bytes, it would be better to only perform 8byte transfers and stuff
// 4 more bytes in wValue and wIndex fields to increase throughput by ~50%!!!
// Testing shows that usbFunctionSetup only gets called once for transfers of 254 bytes
// So there is only one setup packet for multiple data packets of 8bytes each
//
//Still not sure increasing transfer length doesn't simply break up into bunch of small 8byte transfers although it doesn't sound like it.
//245byte limit is kind of a pain.. but wValue/wIndex fields could be abused to send 256 bytes
//Long transfers apparently max out speed @ 24KBps with 300 bytes: https://forums.obdev.at/viewtopic.php?t=3059
//
//PAYLOAD:
//data: a suitably-sized data buffer for either input or output (depending on direction bits within bmRequestType)
//
//TIMEOUT:
//timeout: (in millseconds) that this function should wait before giving up due to no response being received.
// For an unlimited timeout, use value 0
// USB nutshell: A compliant host requires control transfer response within 5sec
//
//RETURN:
// Returns on success, the number of bytes actually transferred
// LIBUSB_ERROR_TIMEOUT if the transfer timed out
// LIBUSB_ERROR_PIPE if the control request was not supported by the device
// LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
// another LIBUSB_ERROR code on other failures
switch (action) { switch (action) {
case 'o': //ON send REQ_LED_ON case 'o': //ON send REQ_LED_ON
xfr_cnt = libusb_control_transfer(rprog_handle, //xfr_cnt = libusb_control_transfer(rprog_handle,
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN, //LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN,
REQ_LED_ON, wValue, wIndex, (unsigned char *)buffer254, sizeof(buffer254), SEC_5); //REQ_LED_ON, wValue, wIndex, (unsigned char *)buffer254, sizeof(buffer254), SEC_5);
xfr_cnt = usb_write( rprog_handle, REQ_LED_ON, (unsigned char *)buffer254, sizeof(buffer254) );
printf("total bytes xfrd: %d \n", xfr_cnt); //printf("total bytes xfrd: %d \n", xfr_cnt);
break; break;
case 'f': case 'f':
xfr_cnt = libusb_control_transfer(rprog_handle, xfr_cnt = usb_write( rprog_handle, REQ_LED_ON, (unsigned char *)buffer254, sizeof(buffer254) );
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN, //xfr_cnt = libusb_control_transfer(rprog_handle,
REQ_LED_OFF, wValue, wIndex, (unsigned char *)buffer254, sizeof(buffer254), SEC_5); //LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN,
//REQ_LED_OFF, wValue, wIndex, (unsigned char *)buffer254, sizeof(buffer254), SEC_5);
printf("total bytes xfrd: %d \n", xfr_cnt); //printf("total bytes xfrd: %d \n", xfr_cnt);
break; break;

65
host/source/usb_operations.c
View File

@ -172,3 +172,68 @@ void close_usb(libusb_context *context, libusb_device_handle *handle)
return; return;
} }
//int libusb_control_transfer (libusb_device_handle *dev_handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout)
//
//SETUP PACKET FIELDS:
//bmRequestType: ORing of req type (STD/VENDOR), recipient (think we only care about DEVICE), endpoint direction IN-dev->host OUT-host->dev
//bRequest: single byte that can signify any 'command' or 'request' we setup.
//The wValue and wIndex fields allow parameters to be passed with the request. Think we can do whatever we want with these
//wLength is used the specify the number of bytes to be transferred should there be a data phase.
//wLength the length field for the setup packet. The data buffer should be at least this size.
// USB 1.1 low speed standard limits to 8 bytes
// V-USB seems to break this limit with max of 254 bytes (255 designates "USB_NO_MSG"
// V-USB allows "LONG TRANSFERS" utilizing full 16bit wLength for upto 16384 bytes = exactly 16KBytes
// although considering sram on AVR doesn't explode with long transfers and read/write functions are in 8byte chunks,
// I think it really is limited to 8bytes
// One idea to squeeze more data is have a request type defined that utilizes wValue and wIndex to gain 4bytes + 8buffer = 12bytes 50% gain
// Not sure how to gain access to wValue/wIndex with vusb drivers...
// answer: usbFunctionSetup will get called for every setup packet and pass all 8 bytes of setup packet
// Can ultimately answer this question by counting how many startup packets are recieved by usbFunciton setup for transfers >8 bytes
// If when sending >8 byte control transfers, a setup packet only comes once, then there is nothing to abuse
// however if the same setup packet gets sent for every 8 bytes, it would be better to only perform 8byte transfers and stuff
// 4 more bytes in wValue and wIndex fields to increase throughput by ~50%!!!
// Testing shows that usbFunctionSetup only gets called once for transfers of 254 bytes
// So there is only one setup packet for multiple data packets of 8bytes each
//
//Still not sure increasing transfer length doesn't simply break up into bunch of small 8byte transfers although it doesn't sound like it.
//245byte limit is kind of a pain.. but wValue/wIndex fields could be abused to send 256 bytes
//Long transfers apparently max out speed @ 24KBps with 300 bytes: https://forums.obdev.at/viewtopic.php?t=3059
//
//PAYLOAD:
//data: a suitably-sized data buffer for either input or output (depending on direction bits within bmRequestType)
//
//TIMEOUT:
//timeout: (in millseconds) that this function should wait before giving up due to no response being received.
// For an unlimited timeout, use value 0
// USB nutshell: A compliant host requires control transfer response within 5sec
//
//RETURN:
// Returns on success, the number of bytes actually transferred
// LIBUSB_ERROR_TIMEOUT if the transfer timed out
// LIBUSB_ERROR_PIPE if the control request was not supported by the device
// LIBUSB_ERROR_NO_DEVICE if the device has been disconnected
// another LIBUSB_ERROR code on other failures
int usb_write_to_device( libusb_device_handle *handle, int command, unsigned char *data, uint16_t len )
{
//TODO translate command into request, value, index, etc
uint8_t request = command;
uint16_t wValue = 0; //setup packet wValue field
uint16_t wIndex = 0; //setup packet wIndex field
int xfr_cnt = libusb_control_transfer( handle,
//Request type: vendor (as we define), recip: device, in: device->host
//TODO the endpoint direction seems to be backwards...?
LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN,
request, wValue, wIndex, data, len, SEC_5);
printf("total bytes xfrd: %d \n", xfr_cnt);
check( xfr_cnt >=0, "Write xfr failed with libusb error: %s", libusb_strerror(xfr_cnt));
check( xfr_cnt == len, "Write transfer failed only %dB sent when expecting %dB", xfr_cnt, len);
return xfr_cnt;
error:
return -1;
}

2
host/source/usb_operations.h
View File

@ -35,4 +35,6 @@ libusb_device_handle * open_usb_device( libusb_context *context );
void close_usb(libusb_context *context, libusb_device_handle *handle); void close_usb(libusb_context *context, libusb_device_handle *handle);
int usb_write_to_device( libusb_device_handle *handle, int command, unsigned char *data, uint16_t len );
#endif #endif