X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=src%2Fftdi.c;h=c9492f56124a78ad0a7bdb24df9269bfbdb959e5;hp=409e2940bf06853d08866219be6cd8181c4c3321;hb=d45d6648ad017652e18aefc65c1300c5392b2f8e;hpb=74e8e79d4e311001d0f890cdf0219d84b58bb70a diff --git a/src/ftdi.c b/src/ftdi.c index 409e294..c9492f5 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -105,6 +105,7 @@ int ftdi_init(struct ftdi_context *ftdi) if (eeprom == 0) ftdi_error_return(-2, "Can't malloc struct ftdi_eeprom"); + memset(eeprom, 0, sizeof(struct ftdi_eeprom); ftdi->eeprom = eeprom; /* All fine. Now allocate the readbuffer */ @@ -2180,18 +2181,25 @@ int ftdi_set_error_char(struct ftdi_context *ftdi, /** Init eeprom with default values. \param ftdi pointer to ftdi_context - + \param manufacturer String to use as Manufacturer + \param product String to use as Product description + \param serial String to use as Serial number description + + \retval 0: all fine + \retval -1: No struct ftdi_context + \retval -2: No struct ftdi_eeprom */ -void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, char * manufacturer, +int ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, char * manufacturer, char * product, char * serial) { struct ftdi_eeprom *eeprom; if (ftdi == NULL) - return; + ftdi_error_return(-1, "No struct ftdi_context"); + if (ftdi->eeprom == NULL) - return; + ftdi_error_return(-2,"No struct ftdi_eeprom"); eeprom = ftdi->eeprom; memset(eeprom, 0, sizeof(struct ftdi_eeprom)); @@ -2207,7 +2215,7 @@ void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, char * manufacturer, eeprom->usb_version = 0x0101; else eeprom->usb_version = 0x0200; - eeprom->max_power = 50; + eeprom->max_power = 100; if (eeprom->manufacturer) free (eeprom->manufacturer); @@ -2241,7 +2249,7 @@ void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, char * manufacturer, if(ftdi->type == TYPE_R) { - eeprom->max_power = 45; + eeprom->max_power = 90; eeprom->size = 0x80; eeprom->cbus_function[0] = CBUS_TXLED; eeprom->cbus_function[1] = CBUS_RXLED; @@ -2251,6 +2259,7 @@ void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi, char * manufacturer, } else eeprom->size = -1; + return 0; } /** @@ -2319,7 +2328,7 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) size_check -= serial_size*2; /* Space for the string type and pointer bytes */ - size_check -= -6; + size_check -= -9; // eeprom size exceeded? if (size_check < 0) @@ -2376,7 +2385,7 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) output[0x08] = j; // Addr 09: Max power consumption: max power = value * 2 mA - output[0x09] = eeprom->max_power; + output[0x09] = eeprom->max_power>>1; if(ftdi->type != TYPE_AM) { @@ -2453,8 +2462,22 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) output[i & k] = eeprom->serial[j], i++; output[i & k] = 0x00, i++; } + output[i & k] = 0x02; /* as seen when written with FTD2XX */ + i++; + output[i & k] = 0x03; /* as seen when written with FTD2XX */ + i++; + output[i & k] = eeprom->is_not_pnp; /* as seen when written with FTD2XX */ + i++; + output[0x13] = serial_size*2 + 2; + if(ftdi->type > TYPE_AM) /*use_serial not used in AM devices*/ + { + if (eeprom->use_serial == USE_SERIAL_NUM ) + output[0x0A] |= USE_SERIAL_NUM; + else + output[0x0A] &= ~USE_SERIAL_NUM; + } /* Fixme: ftd2xx seems to append 0x02, 0x03 and 0x01 for PnP = 0 or 0x00 else */ // calculate checksum @@ -2467,10 +2490,6 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) case TYPE_BM: output[0x0C] = eeprom->usb_version & 0xff; output[0x0D] = (eeprom->usb_version>>8) & 0xff; - if (eeprom->use_serial == 1) - output[0x0A] |= 0x8; - else - output[0x0A] &= ~0x8; output[0x14] = eeprom->chip; break; case TYPE_2232C: @@ -2509,10 +2528,6 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) output[0x0A] |= 0x4; else output[0x0A] &= ~0x4; - if (eeprom->use_serial == USE_SERIAL_NUM ) - output[0x0A] |= USE_SERIAL_NUM; - else - output[0x0A] &= ~0x8; output[0x0C] = eeprom->usb_version & 0xff; output[0x0D] = (eeprom->usb_version>>8) & 0xff; output[0x14] = eeprom->chip; @@ -2526,10 +2541,6 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) output[0x0A] |= 0x4; else output[0x0A] &= ~0x4; - if (eeprom->use_serial == USE_SERIAL_NUM) - output[0x0A] |= USE_SERIAL_NUM; - else - output[0x0A] &= ~0x8; output[0x0B] = eeprom->invert; output[0x0C] = eeprom->usb_version & 0xff; output[0x0D] = (eeprom->usb_version>>8) & 0xff; @@ -2576,6 +2587,11 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi) else output[0x01] &= ~SUSPEND_DBUS7; + if (eeprom->suspend_pull_downs == 1) + output[0x0A] |= 0x4; + else + output[0x0A] &= ~0x4; + if(eeprom->group0_drive > DRIVE_16MA) output[0x0c] |= DRIVE_16MA; else @@ -2834,7 +2850,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose) } else if ((ftdi->type == TYPE_2232H) ||(ftdi->type == TYPE_4232H)) { - eeprom->high_current = buf[0x00] & HIGH_CURRENT_DRIVE_R; + eeprom->channel_a_type = buf[0x00] & 0x7; eeprom->channel_a_driver = buf[0x00] & DRIVER_VCP; eeprom->channel_b_type = buf[0x01] & 0x7; eeprom->channel_b_driver = buf[0x01] & DRIVER_VCP; @@ -2886,6 +2902,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose) fprintf(stdout, "Pull IO pins low during suspend\n"); if(eeprom->remote_wakeup) fprintf(stdout, "Enable Remote Wake Up\n"); + fprintf(stdout, "PNP: %d\n",(eeprom->is_not_pnp)?0:1); if (ftdi->type >= TYPE_2232C) fprintf(stdout,"Channel A has Mode %s%s%s\n", channel_mode[eeprom->channel_a_type], @@ -3072,14 +3089,47 @@ int ftdi_read_chipid(struct ftdi_context *ftdi, unsigned int *chipid) \param eeprom_val Value to be written \retval 0: all fine - \retval -1: read failed + \retval -1: write failed \retval -2: USB device unavailable + \retval -3: Invalid access to checksum protected area below 0x80 + \retval -4: Device can't access unprotected area + \retval -5: Reading chip type failed */ -int ftdi_write_eeprom_location(struct ftdi_context *ftdi, int eeprom_addr, unsigned short eeprom_val) +int ftdi_write_eeprom_location(struct ftdi_context *ftdi, int eeprom_addr, + unsigned short eeprom_val) { + int chip_type_location; + unsigned short chip_type; + if (ftdi == NULL || ftdi->usb_dev == NULL) ftdi_error_return(-2, "USB device unavailable"); + if(eeprom_addr <0x80) + ftdi_error_return(-2, "Invalid access to checksum protected area below 0x80"); + + + switch (ftdi->type) + { + case TYPE_BM: + case TYPE_2232C: + chip_type_location = 0x14; + break; + case TYPE_2232H: + case TYPE_4232H: + chip_type_location = 0x18; + break; + default: + ftdi_error_return(-4, "Device can't access unprotected area"); + } + + if (ftdi_read_eeprom_location( ftdi, chip_type_location>>1, &chip_type)) + ftdi_error_return(-5, "Reading failed failed"); + fprintf(stderr," loc 0x%04x val 0x%04x\n", chip_type_location,chip_type); + if((chip_type & 0xff) != 0x66) + { + ftdi_error_return(-6, "EEPROM is not of 93x66"); + } + if (libusb_control_transfer(ftdi->usb_dev, FTDI_DEVICE_OUT_REQTYPE, SIO_WRITE_EEPROM_REQUEST, eeprom_val, eeprom_addr, NULL, 0, ftdi->usb_write_timeout) != 0)