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

Merge branch 'master' of git@github.com:preble/P-ROC

Browse Source
This commit is contained in:
gstellenberg
2009-10-25 13:13:03 -05:00
parent f1b5c49295 b81b80c311
commit 00724e58e3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/PRDevice.cpp
View File

@@ -766,15 +766,18 @@ PRResult PRDevice::PRJTAGShiftTDOData(uint16_t numBits, bool_t dataBlockComplete
PRResult PRDevice::PRJTAGReadTDIMemory(uint16_t tableOffset, uint16_t numWords, uint32_t * tdiData) PRResult PRDevice::PRJTAGReadTDIMemory(uint16_t tableOffset, uint16_t numWords, uint32_t * tdiData)
{ {
ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_TDI_MEMORY_BASE_ADDR + tableOffset, numWords, tdiData); return ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_TDI_MEMORY_BASE_ADDR + tableOffset, numWords, tdiData);
} }
PRResult PRDevice::PRJTAGGetStatus(PRJTAGStatus * status) PRResult PRDevice::PRJTAGGetStatus(PRJTAGStatus * status)
{ {
uint32_t rdBuffer[1]; uint32_t rdBuffer[1];
ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_STATUS_REG_BASE_ADDR, 1, rdBuffer); PRResult res = ReadDataRaw(P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_STATUS_REG_BASE_ADDR, 1, rdBuffer);
if (res == kPRFailure)
return res;
status->commandComplete = rdBuffer[0] >> P_ROC_JTAG_STATUS_DONE_SHIFT; status->commandComplete = rdBuffer[0] >> P_ROC_JTAG_STATUS_DONE_SHIFT;
status->tdi = rdBuffer[0] >> P_ROC_JTAG_STATUS_TDI_SHIFT; status->tdi = rdBuffer[0] >> P_ROC_JTAG_STATUS_TDI_SHIFT;
return res;
} }
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1060,7 +1063,7 @@ int32_t PRDevice::ReadData(uint32_t *buffer, int32_t num_words)
PRResult PRDevice::FlushReadBuffer() PRResult PRDevice::FlushReadBuffer()
{ {
int32_t numBytes,rc,k; int32_t numBytes,rc,k;
uint32_t rd_buffer[3]; //uint32_t rd_buffer[3];
numBytes = CollectReadData(); numBytes = CollectReadData();
k = 0; k = 0;
//std::cout << "Flushing rd buffer of " << num_words << "words\n"; //std::cout << "Flushing rd buffer of " << num_words << "words\n";

2
src/pinproc.cpp
View File

@@ -51,7 +51,7 @@ void PRLog(PRLogLevel level, const char *format, ...)
if (logCallback) if (logCallback)
logCallback(level, line); logCallback(level, line);
else else
fprintf(stderr, line); fprintf(stderr, "%s", line);
} }
void PRLogSetCallback(PRLogCallback callback) void PRLogSetCallback(PRLogCallback callback)