stlink: expose ap number and csw in memory r/w

[openocd.git] / src / pld / virtex2.c

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 4e385e97b1f394f0a9385444b77ed21750f996d2..a2de8ccf55603fe3a19f5ae5a8877807649917da 100644 (file)
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -26,7 +26,7 @@
 
 static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 {
-       if (tap == NULL)
+       if (!tap)
                return ERROR_FAIL;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) {
@@ -183,13 +183,13 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
        COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
        device = get_pld_device_by_num(dev_id);
        if (!device) {
-               command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
+               command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
        virtex2_read_stat(device, &status);
 
-       command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status);
+       command_print(CMD, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
        return ERROR_OK;
 }
@@ -204,8 +204,8 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        tap = jtag_tap_by_string(CMD_ARGV[1]);
-       if (tap == NULL) {
-               command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]);
+       if (!tap) {
+               command_print(CMD, "Tap: %s does not exist", CMD_ARGV[1]);
                return ERROR_OK;
        }