X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=ftdi%2Fftdi.c;h=e7aaae7c87cb48daaac5a8c573edb226805f9a01;hp=afd91f9f0dd384c3171cc7fd8f66f067ef1e3b92;hb=948f9adab13f60df70132e658e5facf8e0e654a2;hpb=8ed611210cf9b99329aa0ef664a82523768594dd diff --git a/ftdi/ftdi.c b/ftdi/ftdi.c index afd91f9..e7aaae7 100644 --- a/ftdi/ftdi.c +++ b/ftdi/ftdi.c @@ -3,7 +3,7 @@ ------------------- begin : Fri Apr 4 2003 copyright : (C) 2003 by Intra2net AG - email : info@intra2net.com + email : opensource@intra2net.com ***************************************************************************/ /*************************************************************************** @@ -18,6 +18,10 @@ #include "ftdi.h" +/* ftdi_init return codes: + 0: all fine + -1: couldn't allocate (64 byte) read buffer +*/ int ftdi_init(struct ftdi_context *ftdi) { ftdi->usb_dev = NULL; ftdi->usb_timeout = 5000; @@ -25,9 +29,23 @@ int ftdi_init(struct ftdi_context *ftdi) { ftdi->baudrate = -1; ftdi->bitbang_enabled = 0; + ftdi->readbuffer = NULL; + ftdi->readbuffer_offset = 0; + ftdi->readbuffer_remaining = 0; + ftdi->writebuffer_chunksize = 4096; + ftdi->error_str = NULL; - return 0; + // all fine. Now allocate the readbuffer + return ftdi_read_data_set_chunksize(ftdi, 4096); +} + + +void ftdi_deinit(struct ftdi_context *ftdi) { + if (ftdi->readbuffer != NULL) { + free(ftdi->readbuffer); + ftdi->readbuffer = NULL; + } } @@ -102,6 +120,19 @@ int ftdi_usb_reset(struct ftdi_context *ftdi) { return 0; } +int ftdi_usb_purge_buffers(struct ftdi_context *ftdi) { + if (usb_control_msg(ftdi->usb_dev, 0x40, 0, 1, 0, NULL, 0, ftdi->usb_timeout) != 0) { + ftdi->error_str = "FTDI purge of RX buffer failed"; + return -1; + } + + if (usb_control_msg(ftdi->usb_dev, 0x40, 0, 2, 0, NULL, 0, ftdi->usb_timeout) != 0) { + ftdi->error_str = "FTDI purge of TX buffer failed"; + return -1; + } + + return 0; +} /* ftdi_usb_close return codes 0: all fine @@ -189,18 +220,20 @@ int ftdi_set_baudrate(struct ftdi_context *ftdi, int baudrate) { } -int ftdi_write_data(struct ftdi_context *ftdi, char *buf, int size) { +int ftdi_write_data(struct ftdi_context *ftdi, unsigned char *buf, int size) { int ret; int offset = 0; while (offset < size) { - int write_size = 64; + int write_size = ftdi->writebuffer_chunksize; if (offset+write_size > size) write_size = size-offset; ret=usb_bulk_write(ftdi->usb_dev, 2, buf+offset, write_size, ftdi->usb_timeout); - if (ret == -1) + if (ret == -1) { + ftdi->error_str = "bulk write failed"; return -1; + } offset += write_size; } @@ -209,18 +242,120 @@ int ftdi_write_data(struct ftdi_context *ftdi, char *buf, int size) { } -int ftdi_read_data(struct ftdi_context *ftdi, char *buf, int size) { - /* - unsigned char buf[64]; - int read_bytes; +int ftdi_write_data_set_chunksize(struct ftdi_context *ftdi, unsigned int chunksize) { + ftdi->writebuffer_chunksize = chunksize; + return 0; +} + + +int ftdi_write_data_get_chunksize(struct ftdi_context *ftdi, unsigned int *chunksize) { + *chunksize = ftdi->writebuffer_chunksize; + return 0; +} + + +int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size) { + int offset = 0, ret = 1; + + // everything we want is still in the readbuffer? + if (size <= ftdi->readbuffer_remaining) { + memcpy (buf, ftdi->readbuffer+ftdi->readbuffer_offset, size); + + // Fix offsets + ftdi->readbuffer_remaining -= size; + ftdi->readbuffer_offset += size; + + // printf("Returning bytes from buffer: %d - remaining: %d\n", size, ftdi->readbuffer_remaining); + + return size; + } + + // something still in the readbuffer, but not enough to satisfy 'size'? + if (ftdi->readbuffer_remaining != 0) { + memcpy (buf, ftdi->readbuffer+ftdi->readbuffer_offset, ftdi->readbuffer_remaining); + + // printf("Got bytes from buffer: %d\n", ftdi->readbuffer_remaining); + + // Fix offsets + offset += ftdi->readbuffer_remaining; + ftdi->readbuffer_remaining = 0; + ftdi->readbuffer_offset = 0; + } + + // do the actual USB read + while (offset < size && ret > 0) { + ftdi->readbuffer_remaining = 0; + ftdi->readbuffer_offset = 0; + ret = usb_bulk_read (ftdi->usb_dev, 0x81, ftdi->readbuffer, ftdi->readbuffer_chunksize, ftdi->usb_timeout); + + if (ret == -1) { + ftdi->error_str = "bulk read failed"; + return -1; + } + + if (ret > 2) { + // skip FTDI status bytes. + // Maybe stored in the future to enable modem use + ftdi->readbuffer_offset += 2; + ret -= 2; + } else if (ret <= 2) { + // no more data to read? + return offset; + } + + if (ret > 0) { + // data still fits in buf? + if (offset+ret <= size) { + memcpy (buf+offset, ftdi->readbuffer+ftdi->readbuffer_offset, ret); + offset += ret; + + if (offset == size) + return offset; + } else { + // only copy part of the data or size <= readbuffer_chunksize + int part_size = size-offset; + memcpy (buf+offset, ftdi->readbuffer+ftdi->readbuffer_offset, part_size); + + ftdi->readbuffer_offset += part_size; + ftdi->readbuffer_remaining = ret-part_size; + + // printf("Returning part: %d - size: %d - offset: %d - ret: %d - remaining: %d\n", part_size, size, offset, ret, ftdi->readbuffer_remaining); + + return part_size; + } + } + } - read_bytes = usb_bulk_read (udev, 0x81, (char *)&buf, 64, USB_TIMEOUT); - */ - ftdi->error_str = "Not implemented yet"; - return -1; + // never reached + return -2; } +int ftdi_read_data_set_chunksize(struct ftdi_context *ftdi, unsigned int chunksize) { + // Invalidate all remaining data + ftdi->readbuffer_offset = 0; + ftdi->readbuffer_remaining = 0; + + unsigned char *new_buf; + if ((new_buf = (unsigned char *)realloc(ftdi->readbuffer, chunksize)) == NULL) { + ftdi->error_str = "out of memory for readbuffer"; + return -1; + } + + ftdi->readbuffer = new_buf; + ftdi->readbuffer_chunksize = chunksize; + + return 0; +} + + +int ftdi_readt_data_get_chunksize(struct ftdi_context *ftdi, unsigned int *chunksize) { + *chunksize = ftdi->readbuffer_chunksize; + return 0; +} + + + int ftdi_enable_bitbang(struct ftdi_context *ftdi, unsigned char bitmask) { unsigned short usb_val; @@ -267,6 +402,7 @@ int ftdi_set_latency_timer(struct ftdi_context *ftdi, unsigned char latency) { return -1; } + usb_val = latency; if (usb_control_msg(ftdi->usb_dev, 0x40, 0x09, usb_val, 0, NULL, 0, ftdi->usb_timeout) != 0) { ftdi->error_str = "Unable to set latency timer"; return -2; @@ -277,7 +413,7 @@ int ftdi_set_latency_timer(struct ftdi_context *ftdi, unsigned char latency) { int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency) { unsigned short usb_val; - if (usb_control_msg(ftdi->usb_dev, 0xC0, 0x09, 0, 0, (char *)&usb_val, 1, ftdi->usb_timeout) != 1) { + if (usb_control_msg(ftdi->usb_dev, 0xC0, 0x0A, 0, 0, (char *)&usb_val, 1, ftdi->usb_timeout) != 1) { ftdi->error_str = "Reading latency timer failed"; return -1; } @@ -421,7 +557,7 @@ int ftdi_eeprom_build(struct ftdi_eeprom *eeprom, unsigned char *output) { output[0x13] = serial_size*2 + 2; // Dynamic content - output[0x14] = manufacturer_size; + output[0x14] = manufacturer_size*2 + 2; output[0x15] = 0x03; // type: string i = 0x16, j = 0; @@ -468,7 +604,7 @@ int ftdi_eeprom_build(struct ftdi_eeprom *eeprom, unsigned char *output) { } -int ftdi_read_eeprom(struct ftdi_context *ftdi, char *eeprom) { +int ftdi_read_eeprom(struct ftdi_context *ftdi, unsigned char *eeprom) { int i; for (i = 0; i < 64; i++) { @@ -482,7 +618,7 @@ int ftdi_read_eeprom(struct ftdi_context *ftdi, char *eeprom) { } -int ftdi_write_eeprom(struct ftdi_context *ftdi, char *eeprom) { +int ftdi_write_eeprom(struct ftdi_context *ftdi, unsigned char *eeprom) { unsigned short usb_val; int i;