diff options
| -rw-r--r-- | lib/igt_core.c | 4 | ||||
| -rw-r--r-- | tests/gem_mmap_gtt.c | 2 | ||||
| -rw-r--r-- | tests/kms_setmode.c | 1 | ||||
| -rw-r--r-- | tools/intel_bios_reader.c | 22 |
4 files changed, 14 insertions, 15 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index f64c809a..a18a728c 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -1154,14 +1154,14 @@ xprintfmt(const char *fmt, va_list ap) unsigned long long num; while (1) { - while ((ch = *(unsigned char *) fmt++) != '%') { + while ((ch = *(const unsigned char *) fmt++) != '%') { if (ch == '\0') { return; } xputch(ch); } - ch = *(unsigned char *) fmt++; + ch = *(const unsigned char *) fmt++; switch (ch) { /* character */ case 'c': diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c index 00fe905d..8383cd4c 100644 --- a/tests/gem_mmap_gtt.c +++ b/tests/gem_mmap_gtt.c @@ -474,7 +474,7 @@ test_huge_bo(int fd, int huge, int tiling) #include <smmintrin.h> __attribute__((noinline)) -static void copy_wc_page(void *dst, const void *src) +static void copy_wc_page(void *dst, void *src) { if (igt_x86_features() & SSE4_1) { __m128i *S = (__m128i *)src; diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 4031d818..676e3d79 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -522,7 +522,6 @@ static void test_crtc_config(const struct test_config *tconf, for (i = 0; i < crtc_count; i++) { uint32_t *ids; - int j; crtc = &crtcs[i]; diff --git a/tools/intel_bios_reader.c b/tools/intel_bios_reader.c index 8aea7b02..d5297e27 100644 --- a/tools/intel_bios_reader.c +++ b/tools/intel_bios_reader.c @@ -395,7 +395,7 @@ static const char *efp_conn(uint8_t type) } static void dump_child_device(struct context *context, - struct child_device_config *child) + const struct child_device_config *child) { char child_id[11]; @@ -403,7 +403,7 @@ static void dump_child_device(struct context *context, return; if (context->bdb->version < 152) { - strncpy(child_id, (char *)child->device_id, 10); + strncpy(child_id, (const char *)child->device_id, 10); child_id[10] = 0; printf("\tChild device info:\n"); @@ -413,8 +413,8 @@ static void dump_child_device(struct context *context, printf("\t\tAIM offset: %d\n", child->addin_offset); printf("\t\tDVO port: 0x%02x\n", child->dvo_port); } else { /* 152+ have EFP blocks here */ - struct efp_child_device_config *efp = - (struct efp_child_device_config *)child; + const struct efp_child_device_config *efp = + (const struct efp_child_device_config *)child; printf("\tEFP device info:\n"); printf("\t\tDevice handle: 0x%04x (%s)\n", efp->handle, child_device_handle(efp->handle)); @@ -475,16 +475,16 @@ static void dump_child_device(struct context *context, } if (context->bdb->version >= 195) { - struct efp_child_device_config *efp = - (struct efp_child_device_config *)child; + const struct efp_child_device_config *efp = + (const struct efp_child_device_config *)child; printf("\t\tDP USB type C support: %s\n", YESNO(efp->dp_usb_type_c)); printf("\t\t2X DP GPIO index: 0x%02x\n", efp->dp_usb_type_c_2x_gpio_index); printf("\t\t2X DP GPIO pin number: 0x%02x\n", efp->dp_usb_type_c_2x_gpio_pin); } if (context->bdb->version >= 196) { - struct efp_child_device_config *efp = - (struct efp_child_device_config *)child; + const struct efp_child_device_config *efp = + (const struct efp_child_device_config *)child; printf("\t\tIBoost level for HDMI: 0x%02x\n", efp->iboost_hdmi); printf("\t\tIBoost level for DP/eDP: 0x%02x\n", efp->iboost_dp); } @@ -509,7 +509,7 @@ static void dump_general_definitions(struct context *context, child_device_num = (block->size - sizeof(*defs)) / defs->child_dev_size; for (i = 0; i < child_device_num; i++) - dump_child_device(context, (void*)&defs->devices[i * defs->child_dev_size]); + dump_child_device(context, (const void*)&defs->devices[i * defs->child_dev_size]); } static void dump_child_devices(struct context *context, @@ -1116,7 +1116,7 @@ static const uint8_t *mipi_dump_send_packet(const uint8_t *data) flags = *data++; type = *data++; - len = *((uint16_t *) data); + len = *((const uint16_t *) data); data += 2; printf("\t\tSend DCS: Port %s, VC %d, %s, Type %02x, Length %u, Data", @@ -1162,7 +1162,7 @@ static const uint8_t *mipi_dump_i2c(const uint8_t *data) flags = *data++; index = *data++; bus = *data++; - address = *((uint16_t *) data); + address = *((const uint16_t *) data); data += 2; offset = *data++; len = *data++; |