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

Improved error reporting. PRGetEvents() now returns -1 if an error occurred.

Browse Source
This commit is contained in:
preble
2010-03-28 14:23:07 -04:00
parent d140153f97
commit ed7f0153f0
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/pinproc.h
View File

@@ -280,7 +280,9 @@ typedef struct PREvent {
uint32_t time; /**< Time (in milliseconds) that this event occurred. */ uint32_t time; /**< Time (in milliseconds) that this event occurred. */
} PREvent; } PREvent;
/** Get all of the available events that have been received. */ /** Get all of the available events that have been received.
* \return Number of events returned; -1 if an error occurred.
*/
PR_EXPORT int PRGetEvents(PRHandle handle, PREvent *eventsOut, int maxEvents); PR_EXPORT int PRGetEvents(PRHandle handle, PREvent *eventsOut, int maxEvents);

21
src/PRDevice.cpp
View File

@@ -145,7 +145,8 @@ PRResult PRDevice::Reset(uint32_t resetFlags)
int PRDevice::GetEvents(PREvent *events, int maxEvents) int PRDevice::GetEvents(PREvent *events, int maxEvents)
{ {
SortReturningData(); if (SortReturningData() != kPRSuccess)
return -1;
// The unrequestedDataQueue only has unrequested switch event data. Pop // The unrequestedDataQueue only has unrequested switch event data. Pop
// events out 1 at a time, interpret them, and populate the outgoing list with them. // events out 1 at a time, interpret them, and populate the outgoing list with them.
@@ -657,7 +658,8 @@ PRResult PRDevice::SwitchGetStates( PREventType * switchStates, uint16_t numSwit
while (requestedDataQueue.size() < numWords && i++ < 10) while (requestedDataQueue.size() < numWords && i++ < 10)
{ {
PRSleep (10); // 10 milliseconds should be plenty of time. PRSleep (10); // 10 milliseconds should be plenty of time.
SortReturningData(); if (SortReturningData() != kPRSuccess)
return kPRFailure;
} }
// Make sure all of the requested words are available before processing them. // Make sure all of the requested words are available before processing them.
@@ -916,7 +918,8 @@ PRResult PRDevice::VerifyChipID()
while (requestedDataQueue.size() < 5 && max_count++ < 10) while (requestedDataQueue.size() < 5 && max_count++ < 10)
{ {
PRSleep (10); // 10 milliseconds should be plenty of time. PRSleep (10); // 10 milliseconds should be plenty of time.
SortReturningData(); if (SortReturningData() != kPRSuccess)
return kPRFailure;
} }
if (max_count != 11) { if (max_count != 11) {
@@ -1061,7 +1064,8 @@ PRResult PRDevice::ReadDataRaw(uint32_t moduleSelect, uint32_t startingAddr, int
while (requestedDataQueue.size() < (numReadWords + 1) && i++ < 10) while (requestedDataQueue.size() < (numReadWords + 1) && i++ < 10)
{ {
PRSleep (10); // 10 milliseconds should be plenty of time. PRSleep (10); // 10 milliseconds should be plenty of time.
SortReturningData(); if (SortReturningData() != kPRSuccess)
return kPRFailure;
} }
// Make sure all of the requested words are available before processing them. // Make sure all of the requested words are available before processing them.
@@ -1134,6 +1138,8 @@ int32_t PRDevice::CollectReadData()
{ {
int32_t rc,i; int32_t rc,i;
rc = PRHardwareRead(collect_buffer, FTDI_BUFFER_SIZE-num_collected_bytes); rc = PRHardwareRead(collect_buffer, FTDI_BUFFER_SIZE-num_collected_bytes);
if (rc < 0)
return rc;
for (i=0; i<rc; i++) { for (i=0; i<rc; i++) {
collected_bytes_fifo[collected_bytes_wr_addr] = collect_buffer[i]; collected_bytes_fifo[collected_bytes_wr_addr] = collect_buffer[i];
if (collected_bytes_wr_addr == (FTDI_BUFFER_SIZE-1)) if (collected_bytes_wr_addr == (FTDI_BUFFER_SIZE-1))
@@ -1151,10 +1157,15 @@ int32_t PRDevice::CollectReadData()
PRResult PRDevice::SortReturningData() PRResult PRDevice::SortReturningData()
{ {
uint32_t num_bytes, num_words, rc; int32_t num_bytes, num_words, rc;
uint32_t rd_buffer[512]; uint32_t rd_buffer[512];
num_bytes = CollectReadData(); num_bytes = CollectReadData();
if (num_bytes < 0)
{
PRSetLastErrorText("Error in CollectReadData: %d", num_bytes);
return kPRFailure;
}
num_words = num_collected_bytes/4; num_words = num_collected_bytes/4;
while (num_words >= 2) { while (num_words >= 2) {