1
0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00

Changes for p3-roc

This commit is contained in:
Gerry Stellenberg
2013-06-25 18:54:54 -05:00
parent 98d6e84d65
commit a9f35706da
8 changed files with 285 additions and 39 deletions

View File

@@ -511,6 +511,7 @@ PRResult PRHardwareOpen()
// We first enumerate all of the devices:
int numDevices = ftdi_usb_find_all(&ftdic, &devlist, FTDI_VENDOR_ID, FTDI_FT245RL_PRODUCT_ID);
if (numDevices <=0) numDevices = ftdi_usb_find_all(&ftdic, &devlist, FTDI_VENDOR_ID, FTDI_FT240X_PRODUCT_ID);
if (numDevices < 0) {
PRSetLastErrorText("ftdi_usb_find_all failed: %d: %s", numDevices, ftdi_get_error_string(&ftdic));
ftdi_deinit(&ftdic);
@@ -537,7 +538,7 @@ PRResult PRHardwareOpen()
// Don't need the device list anymore
ftdi_list_free (&devlist);
if ((rc = (int32_t)ftdi_usb_open(&ftdic, FTDI_VENDOR_ID, FTDI_FT245RL_PRODUCT_ID)) < 0)
if (((rc = (int32_t)ftdi_usb_open(&ftdic, FTDI_VENDOR_ID, FTDI_FT245RL_PRODUCT_ID)) < 0) && ((rc = (int32_t)ftdi_usb_open(&ftdic, FTDI_VENDOR_ID, FTDI_FT240X_PRODUCT_ID)) < 0))
{
PRSetLastErrorText("Unable to open ftdi device: %d: %s", rc, ftdi_get_error_string(&ftdic));
return kPRFailure;
@@ -545,7 +546,8 @@ PRResult PRHardwareOpen()
else
{
rc = kPRSuccess;
if (ftdic.type == TYPE_R) {
//if (ftdic.type == TYPE_R) {
if (1) {
uint32_t chipid;
ftdi_read_chipid(&ftdic,&chipid);
DEBUG(PRLog(kPRLogInfo, "FTDI chip_id = 0x%x\n", chipid));
@@ -572,10 +574,12 @@ void PRHardwareClose()
}
int PRHardwareRead(uint8_t *buffer, int maxBytes)
{
//return 0;
return ftdi_read_data(&ftdic, buffer, maxBytes);
}
int PRHardwareWrite(uint8_t *buffer, int bytes)
{
//return 0;
return ftdi_write_data(&ftdic, buffer, bytes);
}