mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] scripts: imx: const function arguments
@ 2016-07-15 17:23 Alexander Kurz
  2016-07-18  6:03 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Alexander Kurz @ 2016-07-15 17:23 UTC (permalink / raw)
  To: barebox; +Cc: Alexander Kurz

Signed-off-by: Alexander Kurz <akurz@blala.de>
---
 scripts/imx/imx-image.c      | 9 +++++----
 scripts/imx/imx-usb-loader.c | 4 ++--
 scripts/imx/imx.h            | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 3f62228..c0bf9c0 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -278,7 +278,7 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, in
  * ============================================================================
  */
 
-static int add_header_v2(struct config_data *data, void *buf)
+static int add_header_v2(const struct config_data *data, void *buf)
 {
 	struct imx_flash_header_v2 *hdr;
 	int dcdsize = curdcd * sizeof(uint32_t);
@@ -447,7 +447,8 @@ static int write_dcd(const char *outfile)
 	return 0;
 }
 
-static int check(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask)
+static int check(const struct config_data *data, uint32_t cmd, uint32_t addr,
+		 uint32_t mask)
 {
 	if (curdcd > MAX_DCD - 3) {
 		fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD);
@@ -463,8 +464,8 @@ static int check(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t
 	return 0;
 }
 
-static int write_mem(struct config_data *data, uint32_t addr, uint32_t val, int width,
-		     int set_bits, int clear_bits)
+static int write_mem(const struct config_data *data, uint32_t addr,
+		     uint32_t val, int width, int set_bits, int clear_bits)
 {
 	switch (data->header_version) {
 	case 1:
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index cf9d610..97ed044 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -1239,8 +1239,8 @@ cleanup:
 	return ret;
 }
 
-static int write_mem(struct config_data *data, uint32_t addr, uint32_t val, int width,
-		     int set_bits, int clear_bits)
+static int write_mem(const struct config_data *data, uint32_t addr,
+		     uint32_t val, int width, int set_bits, int clear_bits)
 {
 	return modify_memory(addr, val, width, set_bits, clear_bits);
 }
diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h
index a136958..8db7e7b 100644
--- a/scripts/imx/imx.h
+++ b/scripts/imx/imx.h
@@ -65,9 +65,10 @@ struct config_data {
 	char *srkfile;
 	int header_version;
 	int cpu_type;
-	int (*check)(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask);
-	int (*write_mem)(struct config_data *data, uint32_t addr, uint32_t val, int width,
-			 int set_bits, int clear_bits);
+	int (*check)(const struct config_data *data, uint32_t cmd,
+		     uint32_t addr, uint32_t mask);
+	int (*write_mem)(const struct config_data *data, uint32_t addr,
+			 uint32_t val, int width, int set_bits, int clear_bits);
 	int csf_space;
 	char *csf;
 };
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread
* Re: [PATCH] scripts: imx: const function arguments
  2016-07-15 17:23 [PATCH] scripts: imx: const function arguments Alexander Kurz
@ 2016-07-18  6:03 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2016-07-18  6:03 UTC (permalink / raw)
  To: Alexander Kurz; +Cc: barebox

On Fri, Jul 15, 2016 at 07:23:16PM +0200, Alexander Kurz wrote:
> Signed-off-by: Alexander Kurz <akurz@blala.de>
> ---
>  scripts/imx/imx-image.c      | 9 +++++----
>  scripts/imx/imx-usb-loader.c | 4 ++--
>  scripts/imx/imx.h            | 7 ++++---
>  3 files changed, 11 insertions(+), 9 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
> index 3f62228..c0bf9c0 100644
> --- a/scripts/imx/imx-image.c
> +++ b/scripts/imx/imx-image.c
> @@ -278,7 +278,7 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, in
>   * ============================================================================
>   */
>  
> -static int add_header_v2(struct config_data *data, void *buf)
> +static int add_header_v2(const struct config_data *data, void *buf)
>  {
>  	struct imx_flash_header_v2 *hdr;
>  	int dcdsize = curdcd * sizeof(uint32_t);
> @@ -447,7 +447,8 @@ static int write_dcd(const char *outfile)
>  	return 0;
>  }
>  
> -static int check(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask)
> +static int check(const struct config_data *data, uint32_t cmd, uint32_t addr,
> +		 uint32_t mask)
>  {
>  	if (curdcd > MAX_DCD - 3) {
>  		fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD);
> @@ -463,8 +464,8 @@ static int check(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t
>  	return 0;
>  }
>  
> -static int write_mem(struct config_data *data, uint32_t addr, uint32_t val, int width,
> -		     int set_bits, int clear_bits)
> +static int write_mem(const struct config_data *data, uint32_t addr,
> +		     uint32_t val, int width, int set_bits, int clear_bits)
>  {
>  	switch (data->header_version) {
>  	case 1:
> diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
> index cf9d610..97ed044 100644
> --- a/scripts/imx/imx-usb-loader.c
> +++ b/scripts/imx/imx-usb-loader.c
> @@ -1239,8 +1239,8 @@ cleanup:
>  	return ret;
>  }
>  
> -static int write_mem(struct config_data *data, uint32_t addr, uint32_t val, int width,
> -		     int set_bits, int clear_bits)
> +static int write_mem(const struct config_data *data, uint32_t addr,
> +		     uint32_t val, int width, int set_bits, int clear_bits)
>  {
>  	return modify_memory(addr, val, width, set_bits, clear_bits);
>  }
> diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h
> index a136958..8db7e7b 100644
> --- a/scripts/imx/imx.h
> +++ b/scripts/imx/imx.h
> @@ -65,9 +65,10 @@ struct config_data {
>  	char *srkfile;
>  	int header_version;
>  	int cpu_type;
> -	int (*check)(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask);
> -	int (*write_mem)(struct config_data *data, uint32_t addr, uint32_t val, int width,
> -			 int set_bits, int clear_bits);
> +	int (*check)(const struct config_data *data, uint32_t cmd,
> +		     uint32_t addr, uint32_t mask);
> +	int (*write_mem)(const struct config_data *data, uint32_t addr,
> +			 uint32_t val, int width, int set_bits, int clear_bits);
>  	int csf_space;
>  	char *csf;
>  };
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-18  6:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-15 17:23 [PATCH] scripts: imx: const function arguments Alexander Kurz
2016-07-18  6:03 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox