X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=1025e61c4f266efe5c9ad0a6bb18bcdc160f22fe;hp=24bcd3481cb2e54039e81bb412eb629ca1b7c20e;hb=76b89755c994faa8ff0f646c722373ccb876f744;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 24bcd3481c..1025e61c4f 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -37,7 +37,7 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 
 		field.tap = tap;
 		field.num_bits = tap->ir_length;
-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
+		field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		field.in_value = NULL;
 
@@ -183,18 +183,18 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
 	struct virtex2_pld_device *virtex2_info;
 	uint32_t status;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "usage: virtex2 read_stat <num>");
+		command_print(CMD_CTX, "usage: virtex2 read_stat <num>");
 		return ERROR_OK;
 	}
 
 	unsigned dev_id;
-	COMMAND_PARSE_NUMBER(uint, args[0], dev_id);
+	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", args[0]);
+		command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
@@ -202,7 +202,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command)
 
 	virtex2_read_stat(device, &status);
 
-	command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status);
+	command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status);
 
 	return ERROR_OK;
 }
@@ -213,15 +213,15 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 
 	struct virtex2_pld_device *virtex2_info;
 
-	if (argc < 2)
+	if (CMD_ARGC < 2)
 	{
 		LOG_WARNING("incomplete pld device 'virtex2' configuration");
 		return ERROR_PLD_DEVICE_INVALID;
 	}
 
-	tap = jtag_tap_by_string(args[1]);
+	tap = jtag_tap_by_string(CMD_ARGV[1]);
 	if (tap == NULL) {
-		command_print(cmd_ctx, "Tap: %s does not exist", args[1]);
+		command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]);
 		return ERROR_OK;
 	}
 
@@ -233,16 +233,29 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 	return ERROR_OK;
 }
 
+static const struct command_registration virtex2_exec_command_handlers[] = {
+	{
+		.name = "read_stat",
+		.mode = COMMAND_EXEC,
+		.handler = &virtex2_handle_read_stat_command,
+		.help = "read status register",
+		.usage = "<device_id>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration virtex2_command_handler[] = {
+	{
+		.name = "virtex2",
+		.mode = COMMAND_ANY,
+		.help = "Virtex-II specific commands",
+		.chain = virtex2_exec_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 static int virtex2_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
-			NULL, COMMAND_ANY, "virtex2 specific commands");
-
-	register_command(cmd_ctx, virtex2_cmd, "read_stat",
-			&virtex2_handle_read_stat_command, COMMAND_EXEC,
-			"read Virtex-II status register");
-
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, virtex2_command_handler);
 }
 
 struct pld_driver virtex2_pld = {