X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fvirtex2.c;h=b4593cc54b35a98d29478c583910954246518f05;hp=4c1fc53d21e323bbe805aa3af86bc57ce430521b;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=db2086897a581111bb86a0fb49d72b776a9801a9

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 4c1fc53d21..b4593cc54b 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;
 
@@ -49,10 +49,10 @@ static int virtex2_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 	return ERROR_OK;
 }
 
-static int virtex2_send_32(struct pld_device_s *pld_device,
+static int virtex2_send_32(struct pld_device *pld_device,
 		int num_words, uint32_t *words)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
 	struct scan_field scan_field;
 	uint8_t *values;
 	int i;
@@ -82,10 +82,10 @@ static __inline__ void virtexflip32(jtag_callback_data_t arg)
 	*((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
-static int virtex2_receive_32(struct pld_device_s *pld_device,
+static int virtex2_receive_32(struct pld_device *pld_device,
 		int num_words, uint32_t *words)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
 	struct scan_field scan_field;
 
 	scan_field.tap = virtex2_info->tap;
@@ -109,7 +109,7 @@ static int virtex2_receive_32(struct pld_device_s *pld_device,
 	return ERROR_OK;
 }
 
-static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
+static int virtex2_read_stat(struct pld_device *pld_device, uint32_t *status)
 {
 	uint32_t data[5];
 
@@ -131,10 +131,10 @@ static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 	return ERROR_OK;
 }
 
-static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
+static int virtex2_load(struct pld_device *pld_device, const char *filename)
 {
-	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
-	xilinx_bit_file_t bit_file;
+	struct virtex2_pld_device *virtex2_info = pld_device->driver_priv;
+	struct xilinx_bit_file bit_file;
 	int retval;
 	unsigned int i;
 	struct scan_field field;
@@ -179,22 +179,22 @@ static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
 
 COMMAND_HANDLER(virtex2_handle_read_stat_command)
 {
-	pld_device_t *device;
-	virtex2_pld_device_t *virtex2_info;
+	struct pld_device *device;
+	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>");
 		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;
 	}
 
@@ -211,21 +211,21 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 {
 	struct jtag_tap *tap;
 
-	virtex2_pld_device_t *virtex2_info;
+	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;
 	}
 
-	virtex2_info = malloc(sizeof(virtex2_pld_device_t));
+	virtex2_info = malloc(sizeof(struct virtex2_pld_device));
 	virtex2_info->tap = tap;
 
 	pld->driver_priv = virtex2_info;
@@ -233,9 +233,9 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command)
 	return ERROR_OK;
 }
 
-static int virtex2_register_commands(struct command_context_s *cmd_ctx)
+static int virtex2_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
+	struct command *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2",
 			NULL, COMMAND_ANY, "virtex2 specific commands");
 
 	register_command(cmd_ctx, virtex2_cmd, "read_stat",