X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fmx3_nand.c;h=531111660f2c9a0fae694dabea8192ed700796fd;hb=6aa82891b60dc4a332ac548c13fc8d207bf171b0;hp=f6a75ef7994719cc1b1d3cb712074450df23296b;hpb=e8e94ab2454566fb9a226693e5c1de2264634a48;p=openocd.git

diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index f6a75ef799..531111660f 100644
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -61,12 +61,10 @@ static int imx31_command (struct nand_device_s *nand, uint8_t command);
 static int imx31_address (struct nand_device_s *nand, uint8_t address);
 static int imx31_controller_ready (struct nand_device_s *nand, int tout);
 
-static int imx31_nand_device_command (struct command_context_s *cmd_ctx,
-				      char *cmd, char **args, int argc,
-				      struct nand_device_s *nand)
+NAND_DEVICE_COMMAND_HANDLER(imx31_nand_device_command)
 {
-	mx3_nf_controller_t *mx3_nf_info;
-	mx3_nf_info = malloc (sizeof (mx3_nf_controller_t));
+	struct mx3_nf_controller *mx3_nf_info;
+	mx3_nf_info = malloc (sizeof (struct mx3_nf_controller));
 	if (mx3_nf_info == NULL)
 	{
 	    LOG_ERROR ("no memory for nand controller");
@@ -125,7 +123,7 @@ static int imx31_nand_device_command (struct command_context_s *cmd_ctx,
 
 static int imx31_init (struct nand_device_s *nand)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 
 	{
@@ -268,7 +266,7 @@ static int imx31_init (struct nand_device_s *nand)
 
 static int imx31_read_data (struct nand_device_s *nand, void *data)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 	{
 	/*
@@ -339,7 +337,7 @@ static int imx31_reset (struct nand_device_s *nand)
 
 static int imx31_command (struct nand_device_s *nand, uint8_t command)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 	{
 	/*
@@ -413,7 +411,7 @@ static int imx31_command (struct nand_device_s *nand, uint8_t command)
 
 static int imx31_address (struct nand_device_s *nand, uint8_t address)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 	{
 	/*
@@ -446,7 +444,7 @@ static int imx31_address (struct nand_device_s *nand, uint8_t address)
 static int imx31_controller_ready (struct nand_device_s *nand, int tout)
 {
 	uint16_t poll_complete_status;
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 
 	{
@@ -478,7 +476,7 @@ static int imx31_write_page (struct nand_device_s *nand, uint32_t page,
 			     uint8_t * data, uint32_t data_size, uint8_t * oob,
 			     uint32_t oob_size)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 
 	if (data_size % 2)
@@ -585,7 +583,7 @@ static int imx31_read_page (struct nand_device_s *nand, uint32_t page,
 			    uint8_t * data, uint32_t data_size, uint8_t * oob,
 			    uint32_t oob_size)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 
 	if (data_size % 2)
@@ -660,7 +658,7 @@ static int test_iomux_settings (target_t * target, uint32_t address,
 
 static int initialize_nf_controller (struct nand_device_s *nand)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 	/*
 	* resets NAND flash controller in zero time ? I dont know.
@@ -788,7 +786,7 @@ static int poll_for_complete_op (target_t * target, const char *text)
 
 static int validate_target_state (struct nand_device_s *nand)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 
 	if (target->state != TARGET_HALTED)
@@ -810,7 +808,7 @@ static int validate_target_state (struct nand_device_s *nand)
 
 static int do_data_output (struct nand_device_s *nand)
 {
-	mx3_nf_controller_t *mx3_nf_info = nand->controller_priv;
+	struct mx3_nf_controller *mx3_nf_info = nand->controller_priv;
 	target_t *target = mx3_nf_info->target;
 	switch (mx3_nf_info->fin)
 	{
@@ -870,7 +868,7 @@ static int do_data_output (struct nand_device_s *nand)
 	return ERROR_OK;
 }
 
-nand_flash_controller_t imx31_nand_flash_controller = {
+struct nand_flash_controller imx31_nand_flash_controller = {
 		.name = "imx31",
 		.nand_device_command = &imx31_nand_device_command,
 		.register_commands = &imx31_register_commands,