diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-04-01 13:02:24 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2011-04-01 13:02:24 +0200 |
| commit | 3b7c9585db2dd49b48123d50e9e8af7bc527be52 (patch) | |
| tree | 543433d697a4131e362ff6cf158324479dd89af8 /src/flash/nor | |
| parent | a0b83e82f7fa1833f7ac137d052335c55d1a4223 (diff) | |
| parent | 977df18f50f0f4d2310787787c03d83c2498da1a (diff) | |
| download | openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.gz openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.bz2 openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.tar.xz openocd+libswd-3b7c9585db2dd49b48123d50e9e8af7bc527be52.zip | |
Merge remote branch 'origin/master' into HEAD
Diffstat (limited to 'src/flash/nor')
| -rw-r--r-- | src/flash/nor/pic32mx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c index 89fe9b05..b3c6da3e 100644 --- a/src/flash/nor/pic32mx.c +++ b/src/flash/nor/pic32mx.c @@ -774,11 +774,9 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command) } /* unlock/erase device */ - mchip_cmd = MCHP_ASERT_RST; - mips_ejtag_drscan_8(ejtag_info, &mchip_cmd); + mips_ejtag_drscan_8_out(ejtag_info, MCHP_ASERT_RST); - mchip_cmd = MCHP_ERASE; - mips_ejtag_drscan_8(ejtag_info, &mchip_cmd); + mips_ejtag_drscan_8_out(ejtag_info, MCHP_ERASE); do { mchip_cmd = MCHP_STATUS; @@ -791,8 +789,7 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command) alive_sleep(1); } while ((mchip_cmd & (1 << 2)) || (!(mchip_cmd & (1 << 3)))); - mchip_cmd = MCHP_DE_ASSERT_RST; - mips_ejtag_drscan_8(ejtag_info, &mchip_cmd); + mips_ejtag_drscan_8_out(ejtag_info, MCHP_DE_ASSERT_RST); /* select ejtag tap */ mips_ejtag_set_instr(ejtag_info, MTAP_SW_ETAP); |