rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update targetInDebugMode when parsing the result of a transfer

Browse Source 
- update maxNofWordsFastDownload in getMaxNofWordsFastDownload

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@121 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-04-04 07:29:48 +00:00
parent aea0fc61e7
commit c8e95bba3f
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mcdp/src/ch/ntb/mcdp/bdi/MPC555.java
View File

@@ -208,7 +208,10 @@ public class MPC555 {
throw new BDIException("ready bit is not 0: 0x" throw new BDIException("ready bit is not 0: 0x"
+ Integer.toHexString(data.data[0] & 0xFF)); + Integer.toHexString(data.data[0] & 0xFF));
} }
// status[0:1]
switch ((data.data[0] >>> 5) & 0x03) { switch ((data.data[0] >>> 5) & 0x03) {
// for status 1 to 3, the first bit (after status) indicates the freeze
// status, and the second bit if a download procedure is in progress
case 0: case 0:
// first byte // first byte
int retValue = (((data.data[0] << 3) & 0xFF) + ((data.data[1] & 0xFF) >>> 5)) << 24; int retValue = (((data.data[0] << 3) & 0xFF) + ((data.data[1] & 0xFF) >>> 5)) << 24;
@@ -221,10 +224,19 @@ public class MPC555 {
+ ((data.data[4] & 0xFF) >>> 5); + ((data.data[4] & 0xFF) >>> 5);
return retValue; return retValue;
case 1: case 1:
// update freeze status
targetInDebugMode = (data.data[0] & 0x10) > 0;
logger.finer("targetInDebugMode: " + targetInDebugMode);
throw new BDIException("Sequencing Error: " + data.toString()); throw new BDIException("Sequencing Error: " + data.toString());
case 2: case 2:
// update freeze status
targetInDebugMode = (data.data[0] & 0x10) > 0;
logger.finer("targetInDebugMode: " + targetInDebugMode);
throw new BDIException("CPU Exception: " + data.toString()); throw new BDIException("CPU Exception: " + data.toString());
case 3: case 3:
// update freeze status
targetInDebugMode = (data.data[0] & 0x10) > 0;
logger.finer("targetInDebugMode: " + targetInDebugMode);
return NULL_INDICATION; return NULL_INDICATION;
default: default:
throw new BDIException("invalid case"); throw new BDIException("invalid case");
@@ -376,9 +388,10 @@ public class MPC555 {
ecr = transferAndParse35(false, false, NOP); ecr = transferAndParse35(false, false, NOP);
// check if entry into debug mode was because of DPI // check if entry into debug mode was because of DPI
// User's Manual 21.7.11 ECR // User's Manual 21.7.11 ECR
logger.fine("ecr: " + ecr);
if (ecr != 0x01) { if (ecr != 0x01) {
throw new BDIException( throw new BDIException(
"Wrong debug enable cause (not due to DPI): Exception Cause Register = 0x" "Wrong debug enable cause (not because of DPI): Exception Cause Register = 0x"
+ Integer.toHexString(ecr)); + Integer.toHexString(ecr));
} }
targetInDebugMode = true; targetInDebugMode = true;
@@ -949,9 +962,16 @@ public class MPC555 {
/** /**
* @return number of maximal words used in the <code>fastDownload</code> * @return number of maximal words used in the <code>fastDownload</code>
* procedure * procedure<br>
* Note that this procedure only returns a valid value if the device
* is already connected (the USB bulk transfer size must be known).
*/ */
public int getMaxNofWordsFastDownload() { public int getMaxNofWordsFastDownload() {
if (maxNofWordsFastDownload <= 0) {
maxNofWordsFastDownload = ((device.getMaxPacketSize() - DataPacket.PACKET_MIN_LENGTH) / BDI_DATA35_LENGTH);
logger.finer("update maxNofWordsFastDownload: "
+ maxNofWordsFastDownload);
}
return maxNofWordsFastDownload; return maxNofWordsFastDownload;
} }
} }