X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Forion_nand.c;h=6b50f1fb9a421377d214781ad60c9161ef9a521c;hb=48b3b3afba52924bbb0373a4577e27058774b6f5;hp=5ec1c25cde5c41b6d9941c300cf0fae94a53841e;hpb=fbe8cf72a5e6c80fed5fba8754d790ca63ad2b65;p=fw%2Fopenocd

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index 5ec1c25cd..6b50f1fb9 100644
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -36,9 +36,9 @@ typedef struct orion_nand_controller_s
 	struct target_s	*target;
 	working_area_t *copy_area;
 
-	u32		cmd;
-	u32		addr;
-	u32		data;
+	uint32_t		cmd;
+	uint32_t		addr;
+	uint32_t		data;
 } orion_nand_controller_t;
 
 #define CHECK_HALTED \
@@ -49,7 +49,7 @@ typedef struct orion_nand_controller_s
 		} \
 	} while (0)
 
-static int orion_nand_command(struct nand_device_s *device, u8 command)
+static int orion_nand_command(struct nand_device_s *device, uint8_t command)
 {
 	orion_nand_controller_t *hw = device->controller_priv;
 	target_t *target = hw->target;
@@ -59,7 +59,7 @@ static int orion_nand_command(struct nand_device_s *device, u8 command)
 	return ERROR_OK;
 }
 
-static int orion_nand_address(struct nand_device_s *device, u8 address)
+static int orion_nand_address(struct nand_device_s *device, uint8_t address)
 {
 	orion_nand_controller_t *hw = device->controller_priv;
 	target_t *target = hw->target;
@@ -79,7 +79,7 @@ static int orion_nand_read(struct nand_device_s *device, void *data)
 	return ERROR_OK;
 }
 
-static int orion_nand_write(struct nand_device_s *device, u16 data)
+static int orion_nand_write(struct nand_device_s *device, uint16_t data)
 {
 	orion_nand_controller_t *hw = device->controller_priv;
 	target_t *target = hw->target;
@@ -89,23 +89,23 @@ static int orion_nand_write(struct nand_device_s *device, u16 data)
 	return ERROR_OK;
 }
 
-static int orion_nand_slow_block_write(struct nand_device_s *device, u8 *data, int size)
+static int orion_nand_slow_block_write(struct nand_device_s *device, uint8_t *data, int size)
 {
 	while (size--)
 		orion_nand_write(device, *data++);
 	return ERROR_OK;
 }
 
-static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, int size)
+static int orion_nand_fast_block_write(struct nand_device_s *device, uint8_t *data, int size)
 {
 	orion_nand_controller_t *hw = device->controller_priv;
 	target_t *target = hw->target;
 	armv4_5_algorithm_t algo;
 	reg_param_t reg_params[3];
-	u32 target_buf;
+	uint32_t target_buf;
 	int retval;
 
-	static const u32 code[] = {
+	static const uint32_t code[] = {
 		0xe4d13001,	/* ldrb	r3, [r1], #1	*/
 		0xe5c03000,	/* strb	r3, [r0]	*/
 		0xe2522001,	/* subs	r2, r2, #1	*/
@@ -115,7 +115,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
 	int code_size = sizeof(code);
 
 	if (!hw->copy_area) {
-		u8 code_buf[code_size];
+		uint8_t code_buf[code_size];
 		int i;
 
 		/* make sure we have a working area */
@@ -140,8 +140,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
 
 	/* copy data to target's memory */
 	target_buf = hw->copy_area->address + code_size;
-	retval = target->type->bulk_write_memory(target, target_buf,
-						 size/4, data);
+	retval = target_bulk_write_memory(target, target_buf, size/4, data);
 	if (retval == ERROR_OK && size & 3) {
 		retval = target_write_memory(target,
 					target_buf + (size & ~3),
@@ -195,8 +194,8 @@ int orion_nand_device_command(struct command_context_s *cmd_ctx, char *cmd,
 			      struct nand_device_s *device)
 {
 	orion_nand_controller_t *hw;
-	u32 base;
-	u8 ale, cle;
+	uint32_t base;
+	uint8_t ale, cle;
 
 	if (argc != 3) {
 		LOG_ERROR("arguments must be: <target_number> <NAND_address>\n");