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

- addRegistersFromFile added

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@92 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-01-18 15:16:00 +00:00
parent 9ce173b2fa
commit 51e9d8c51a
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mcdp/src/ch/ntb/mcdp/mc68332/IMCBTargetBoard.java
View File

@@ -1,18 +1,29 @@
package ch.ntb.mcdp.mc68332; package ch.ntb.mcdp.mc68332;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
import ch.ntb.mcdp.bdi.BDIException; import ch.ntb.mcdp.bdi.BDIException;
import ch.ntb.mcdp.bdi.MC68332; import ch.ntb.mcdp.bdi.MC68332;
import ch.ntb.mcdp.usb.DispatchException; import ch.ntb.mcdp.usb.DispatchException;
import ch.ntb.mcdp.utils.logger.LogUtil;
import ch.ntb.mcdp.utils.logger.McdpLogger;
import ch.ntb.usb.USBException; import ch.ntb.usb.USBException;
public class IMCBTargetBoard { public class IMCBTargetBoard {
static final McdpLogger logger = LogUtil.ch_ntb_mcdp_mc68332;
final static String dictionaryPath = "resources/targets/mc68332/registerDictionary.xml";
static MC68332RegisterDict regDict = new MC68332RegisterDict(); static MC68332RegisterDict regDict = new MC68332RegisterDict();
private static void writeRegister(String name, int value) private static void writeRegister(String name, int value)
throws USBException, DispatchException, BDIException { throws USBException, DispatchException, BDIException {
System.out.println("0x" + Integer.toHexString(readRegister(name))); logger.info("writeRegister: " + name + ", value: 0x"
System.out.println("writeRegister: " + name + ", value: 0x"
+ Integer.toHexString(value)); + Integer.toHexString(value));
MC68332Register r = (MC68332Register) regDict.getRegister(name); MC68332Register r = (MC68332Register) regDict.getRegister(name);
switch (r.type) { switch (r.type) {
@@ -26,12 +37,11 @@ public class IMCBTargetBoard {
MC68332.writeUserReg(r.value, value); MC68332.writeUserReg(r.value, value);
break; break;
} }
System.out.println("0x" + Integer.toHexString(readRegister(name)));
} }
private static int readRegister(String name) throws USBException, private static int readRegister(String name) throws USBException,
DispatchException, BDIException { DispatchException, BDIException {
System.out.print("readRegister: " + name); logger.info("readRegister: " + name);
MC68332Register r = (MC68332Register) regDict.getRegister(name); MC68332Register r = (MC68332Register) regDict.getRegister(name);
switch (r.type) { switch (r.type) {
case MC68332Register.CtrlReg: case MC68332Register.CtrlReg:
@@ -45,7 +55,11 @@ public class IMCBTargetBoard {
} }
public static void init() throws USBException, DispatchException, public static void init() throws USBException, DispatchException,
BDIException { BDIException, IOException, ParserConfigurationException,
SAXException {
logger.info("reading dictionary file from " + dictionaryPath);
regDict.addRegistersFromFile(dictionaryPath);
MC68332.reset_target(); MC68332.reset_target();