summaryrefslogtreecommitdiff
path: root/src/jtag/zy1000/zy1000.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2009-12-07 12:38:56 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2009-12-10 13:52:07 +0100
commit134df4b701a343acc598d111986570bc90eb675d (patch)
treec5e146c1bab9f4c09ce9d4062d75de9c7f64dab3 /src/jtag/zy1000/zy1000.c
parent29a8cdc3b066df0a6038775621154ba525389321 (diff)
downloadopenocd+libswd-134df4b701a343acc598d111986570bc90eb675d.tar.gz
openocd+libswd-134df4b701a343acc598d111986570bc90eb675d.tar.bz2
openocd+libswd-134df4b701a343acc598d111986570bc90eb675d.tar.xz
openocd+libswd-134df4b701a343acc598d111986570bc90eb675d.zip
zy1000: revc FPGA now works
remove kludge code. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/jtag/zy1000/zy1000.c')
-rw-r--r--src/jtag/zy1000/zy1000.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 5ddc7c5c..30b9a4ba 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -93,8 +93,8 @@ static bool readPowerDropout(void)
{
cyg_uint32 state;
// sample and clear power dropout
- HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x80);
- HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x80);
+ ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
bool powerDropout;
powerDropout = (state & 0x80) != 0;
return powerDropout;
@@ -105,8 +105,8 @@ static bool readSRST(void)
{
cyg_uint32 state;
// sample and clear SRST sensing
- HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x00000040);
- HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000040);
+ ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
bool srstAsserted;
srstAsserted = (state & 0x40) != 0;
return srstAsserted;
@@ -218,10 +218,10 @@ static void setPower(bool power)
savePower = power;
if (power)
{
- HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x14, 0x8);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x8);
} else
{
- HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x8);
+ ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x8);
}
}