From ef133e3c83c637efb335874b09838d15ecce6f77 Mon Sep 17 00:00:00 2001 From: schlaepfer Date: Mon, 21 Nov 2005 15:21:40 +0000 Subject: [PATCH] - RegisterDictioniary updated - TestClasses added - Some unnecessary imports removed git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@58 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c --- mcdp/src/ch/ntb/mcdp/dict/Register.java | 6 +++- .../ch/ntb/mcdp/dict/test/Test332Dict.java | 32 +++++++++++++++++++ .../ch/ntb/mcdp/dict/test/Test555Dict.java | 29 +++++++++++++++++ .../ntb/mcdp/mc68332/MC68332RegisterDict.java | 2 +- .../ch/ntb/mcdp/mpc555/MPC555Register.java | 8 +++-- .../ntb/mcdp/mpc555/MPC555RegisterDict.java | 27 ++-------------- mcdp/src/ch/ntb/mcdp/uart/Uart0.java | 4 --- 7 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 mcdp/src/ch/ntb/mcdp/dict/test/Test332Dict.java create mode 100644 mcdp/src/ch/ntb/mcdp/dict/test/Test555Dict.java diff --git a/mcdp/src/ch/ntb/mcdp/dict/Register.java b/mcdp/src/ch/ntb/mcdp/dict/Register.java index b1852f7..3ad0a44 100644 --- a/mcdp/src/ch/ntb/mcdp/dict/Register.java +++ b/mcdp/src/ch/ntb/mcdp/dict/Register.java @@ -3,7 +3,7 @@ package ch.ntb.mcdp.dict; public class Register { // Register Types - public static String[] types = null; + protected static String[] types = null; public Register(String name, int type, int value, int size, String description) { @@ -29,4 +29,8 @@ public class Register { return new String(name + "\t" + types[type] + "\t0x" + Integer.toHexString(value) + "\t" + size + "\t" + description); } + + public String[] getTypes(){ + return types; + } } diff --git a/mcdp/src/ch/ntb/mcdp/dict/test/Test332Dict.java b/mcdp/src/ch/ntb/mcdp/dict/test/Test332Dict.java new file mode 100644 index 0000000..29d6e5e --- /dev/null +++ b/mcdp/src/ch/ntb/mcdp/dict/test/Test332Dict.java @@ -0,0 +1,32 @@ +package ch.ntb.mcdp.dict.test; + +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.SAXException; + +import ch.ntb.mcdp.mc68332.MC68332RegisterDict; + +public class Test332Dict { + + private static final String PATH_TO_REGISTER_FILE = "resources/targets/mc68332/registerDictionary.xml"; + + public static void main(String[] args) { + MC68332RegisterDict regdict = new MC68332RegisterDict(); + + try { + regdict.addRegistersFromFile(PATH_TO_REGISTER_FILE); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ParserConfigurationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + regdict.printRegisters(); +} +} diff --git a/mcdp/src/ch/ntb/mcdp/dict/test/Test555Dict.java b/mcdp/src/ch/ntb/mcdp/dict/test/Test555Dict.java new file mode 100644 index 0000000..1ad6761 --- /dev/null +++ b/mcdp/src/ch/ntb/mcdp/dict/test/Test555Dict.java @@ -0,0 +1,29 @@ +package ch.ntb.mcdp.dict.test; + +import java.io.IOException; + +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.SAXException; + +import ch.ntb.mcdp.mpc555.MPC555RegisterDict; + +public class Test555Dict { + + private static final String PATH_TO_REGISTER_FILE = "resources/targets/mpc555/registerDictionary.xml"; + + public static void main(String[] args) { + MPC555RegisterDict regdict = new MPC555RegisterDict(); + + try { + regdict.addRegistersFromFile(PATH_TO_REGISTER_FILE); + } catch (IOException e) { + e.printStackTrace(); + } catch (ParserConfigurationException e) { + e.printStackTrace(); + } catch (SAXException e) { + e.printStackTrace(); + } + regdict.printRegisters(); + } +} diff --git a/mcdp/src/ch/ntb/mcdp/mc68332/MC68332RegisterDict.java b/mcdp/src/ch/ntb/mcdp/mc68332/MC68332RegisterDict.java index 3ac8381..15e03f0 100644 --- a/mcdp/src/ch/ntb/mcdp/mc68332/MC68332RegisterDict.java +++ b/mcdp/src/ch/ntb/mcdp/mc68332/MC68332RegisterDict.java @@ -14,7 +14,7 @@ public class MC68332RegisterDict extends RegisterDict { private static final String PATH_TO_REGISTER_FILE = "resources/targets/mc68332/registerDictionary.xml"; - MC68332RegisterDict() { + public MC68332RegisterDict() { super(REGISTER_CLASS); // TODO: remove diff --git a/mcdp/src/ch/ntb/mcdp/mpc555/MPC555Register.java b/mcdp/src/ch/ntb/mcdp/mpc555/MPC555Register.java index 21f75da..2c6432b 100644 --- a/mcdp/src/ch/ntb/mcdp/mpc555/MPC555Register.java +++ b/mcdp/src/ch/ntb/mcdp/mpc555/MPC555Register.java @@ -5,8 +5,10 @@ import ch.ntb.mcdp.dict.Register; public class MPC555Register extends Register { // Register Types - static final String[] types = new String[] { "GPR", "FPR", "SPR", "MSR", - "CR", "FPSCR", "CtrlReg" }; + static { + types = new String[] { "GPR", "FPR", "SPR", "MSR", "CR", "FPSCR", + "CtrlReg" }; + } static final int GPR = 0; @@ -22,7 +24,7 @@ public class MPC555Register extends Register { static final int CtrlReg = 6; - protected MPC555Register(String name, int type, int value, int size, + public MPC555Register(String name, int type, int value, int size, String description) { super(name, type, value, size, description); } diff --git a/mcdp/src/ch/ntb/mcdp/mpc555/MPC555RegisterDict.java b/mcdp/src/ch/ntb/mcdp/mpc555/MPC555RegisterDict.java index 4a989a9..9a1d236 100644 --- a/mcdp/src/ch/ntb/mcdp/mpc555/MPC555RegisterDict.java +++ b/mcdp/src/ch/ntb/mcdp/mpc555/MPC555RegisterDict.java @@ -1,35 +1,12 @@ package ch.ntb.mcdp.mpc555; -import java.io.IOException; - -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; - import ch.ntb.mcdp.dict.RegisterDict; public class MPC555RegisterDict extends RegisterDict { - private static final String REGISTER_CLASS = "ch.ntb.mcdp.mpc555.MPC555RegisterDict"; + private static final String REGISTER_CLASS = "ch.ntb.mcdp.mpc555.MPC555Register"; - private static final String PATH_TO_REGISTER_FILE = "resources/targets/mpc555/registerDictionary.xml"; - - MPC555RegisterDict() { + public MPC555RegisterDict() { super(REGISTER_CLASS); - - // TODO: remove - try { - addRegistersFromFile(PATH_TO_REGISTER_FILE); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SAXException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - printRegisters(); } } diff --git a/mcdp/src/ch/ntb/mcdp/uart/Uart0.java b/mcdp/src/ch/ntb/mcdp/uart/Uart0.java index 0522da2..38cc7cf 100644 --- a/mcdp/src/ch/ntb/mcdp/uart/Uart0.java +++ b/mcdp/src/ch/ntb/mcdp/uart/Uart0.java @@ -1,11 +1,7 @@ package ch.ntb.mcdp.uart; -import java.nio.ByteBuffer; -import java.util.Arrays; import java.util.LinkedList; -import ch.ntb.mcdp.usb.DataPacket; - public class Uart0 extends Uart { Uart0(LinkedList list) {