From 3546514791e159e94ba3baf73cc2bad65a7a0f20 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Tue, 8 Sep 2015 16:49:24 +0100 Subject: null_state_gen: add const to intel_batch_state_copy data The data is not modified by the function and is often declared const. Signed-off-by: Thomas Wood --- tools/null_state_gen/intel_batchbuffer.c | 6 +++--- tools/null_state_gen/intel_batchbuffer.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/null_state_gen/intel_batchbuffer.c b/tools/null_state_gen/intel_batchbuffer.c index 5aa980e3..2ead22e1 100644 --- a/tools/null_state_gen/intel_batchbuffer.c +++ b/tools/null_state_gen/intel_batchbuffer.c @@ -202,7 +202,7 @@ uint32_t intel_batch_state_alloc(struct intel_batchbuffer *batch, unsigned bytes } uint32_t intel_batch_state_copy(struct intel_batchbuffer *batch, - void *d, unsigned bytes, + const void *d, unsigned bytes, unsigned align, const char *str) { @@ -217,10 +217,10 @@ uint32_t intel_batch_state_copy(struct intel_batchbuffer *batch, for (i = 0; i < dwords; i++) { char offsetinside[80]; - uint32_t *s; + const uint32_t *s; sprintf(offsetinside, "%s: 0x%x", str, i * 4); - s = (uint32_t *)(uint8_t *)d + i; + s = (const uint32_t *)(const uint8_t *)d + i; bb_area_emit(batch->state, *s, STATE, offsetinside); } diff --git a/tools/null_state_gen/intel_batchbuffer.h b/tools/null_state_gen/intel_batchbuffer.h index 2919e870..771d1c80 100644 --- a/tools/null_state_gen/intel_batchbuffer.h +++ b/tools/null_state_gen/intel_batchbuffer.h @@ -80,7 +80,7 @@ struct intel_batchbuffer *intel_batchbuffer_create(void); #define OUT_STATE_OFFSET(offset) bb_area_emit(batch->state, offset, STATE_OFFSET, #offset) #define OUT_STATE_STRUCT(name, align) intel_batch_state_copy(batch, &name, sizeof(name), align, #name " " #align) -uint32_t intel_batch_state_copy(struct intel_batchbuffer *batch, void *d, unsigned bytes, unsigned align, +uint32_t intel_batch_state_copy(struct intel_batchbuffer *batch, const void *d, unsigned bytes, unsigned align, const char *name); uint32_t intel_batch_state_alloc(struct intel_batchbuffer *batch, unsigned bytes, unsigned align, const char *name); -- cgit v1.2.3