From 20c352526a2fb2bf495caa04419b7edfcda3e4c7 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sun, 16 Jun 2019 06:54:28 +0900 Subject: [PATCH] drivers/audio/emuxki: Fix -Wformat= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2ab8be10ed9f020b139f81d8826dc20d83fa1e4e Reviewed-on: https://review.haiku-os.org/c/1542 Reviewed-by: Jérôme Duval --- .../kernel/drivers/audio/emuxki/emuxki.c | 32 ++++++++++++------- .../kernel/drivers/audio/emuxki/multi.c | 11 ++++--- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c index 713554615d..16b769941f 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c +++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c @@ -269,7 +269,8 @@ emuxki_pmem_alloc(emuxki_dev *card, size_t size) != silentpage) break; if (j == numblocks) { - PRINT(("emuxki_pmem_alloc : j == numblocks %ld\n", j)); + PRINT(("emuxki_pmem_alloc : j == numblocks %" B_PRIu32 "\n", + j)); if ((mem = emuxki_mem_new(card, i, size)) == NULL) { //splx(s); return (NULL); @@ -286,7 +287,8 @@ emuxki_pmem_alloc(emuxki_dev *card, size_t size) //splx(s); return mem->log_base; } else { - PRINT(("emuxki_pmem_alloc : j != numblocks %ld\n", j)); + PRINT(("emuxki_pmem_alloc : j != numblocks %" B_PRIu32 "\n", + j)); i += j; } //splx(s); @@ -1310,7 +1312,8 @@ emuxki_voice_adc_rate(emuxki_voice *voice) if (IS_AUDIGY(&voice->stream->card->config)) return EMU_A_ADCCR_SAMPLERATE_12; else - PRINT(("recording sample_rate not supported : %lu\n", voice->sample_rate)); + PRINT(("recording sample_rate not supported : %" B_PRIu32 "\n", + voice->sample_rate)); break; case 11000: if (IS_AUDIGY(&voice->stream->card->config)) @@ -1325,7 +1328,8 @@ emuxki_voice_adc_rate(emuxki_voice *voice) return EMU_ADCCR_SAMPLERATE_8; break; default: - PRINT(("recording sample_rate not supported : %lu\n", voice->sample_rate)); + PRINT(("recording sample_rate not supported : %" B_PRIu32 "\n", + voice->sample_rate)); } return 0; } @@ -2147,8 +2151,10 @@ emuxki_setup(emuxki_dev * card) } else if (card->info.device_id == CREATIVELABS_AUDIGY2_VALUE_DEVICE_ID) card->config.type |= TYPE_AUDIGY | TYPE_AUDIGY2 | TYPE_AUDIGY2_VALUE; - PRINT(("%s deviceid = %#04x chiprev = %x model = %x enhanced at %lx\n", card->name, card->info.device_id, - card->info.revision, card->info.u.h0.subsystem_id, card->config.nabmbar)); + PRINT(("%s deviceid = %#04x chiprev = %x model = %x " + "enhanced at %" B_PRIx32 "\n", + card->name, card->info.device_id, card->info.revision, + card->info.u.h0.subsystem_id, card->config.nabmbar)); cmd = (*pci->read_pci_config)(card->info.bus, card->info.device, card->info.function, PCI_command, 2); PRINT(("PCI command before: %x\n", cmd)); @@ -2191,9 +2197,12 @@ emuxki_setup(emuxki_dev * card) ac97_init(&card->config); ac97_amp_enable(&card->config, true); - PRINT(("codec vendor id = %#08lx\n",ac97_get_vendor_id(&card->config))); - PRINT(("codec description = %s\n",ac97_get_vendor_id_description(&card->config))); - PRINT(("codec 3d enhancement = %s\n",ac97_get_3d_stereo_enhancement(&card->config))); + PRINT(("codec vendor id = %#08" B_PRIx32 "\n", + ac97_get_vendor_id(&card->config))); + PRINT(("codec description = %s\n", + ac97_get_vendor_id_description(&card->config))); + PRINT(("codec 3d enhancement = %s\n", + ac97_get_3d_stereo_enhancement(&card->config))); if (IS_AUDIGY2(&card->config)) { emuxki_reg_write_32(&card->config, EMU_A_IOCFG, @@ -2272,7 +2281,7 @@ emuxki_setup(emuxki_dev * card) } } - PRINT(("installing interrupt : %lx\n", card->config.irq)); + PRINT(("installing interrupt : %" B_PRIx32 "\n", card->config.irq)); err = install_io_interrupt_handler(card->config.irq, emuxki_int, card, 0); if (err != B_OK) { PRINT(("failed to install interrupt\n")); @@ -2945,7 +2954,8 @@ init_driver(void) } #endif if (emuxki_setup(&cards[num_cards])) { - PRINT(("Setup of emuxki %ld failed\n", num_cards+1)); + PRINT(("Setup of emuxki %" B_PRId32 " failed\n", + num_cards + 1)); #ifdef __HAIKU__ (*pci->unreserve_device)(info.bus, info.device, info.function, DRIVER_NAME, &cards[num_cards]); diff --git a/src/add-ons/kernel/drivers/audio/emuxki/multi.c b/src/add-ons/kernel/drivers/audio/emuxki/multi.c index 387c58e268..dd4f8b7d17 100644 --- a/src/add-ons/kernel/drivers/audio/emuxki/multi.c +++ b/src/add-ons/kernel/drivers/audio/emuxki/multi.c @@ -515,7 +515,7 @@ emuxki_create_controls_list(multi_dev *multi) } multi->control_count = index; - PRINT(("multi->control_count %lu\n", multi->control_count)); + PRINT(("multi->control_count %" B_PRIu32 "\n", multi->control_count)); return B_OK; } @@ -528,7 +528,8 @@ emuxki_get_mix(emuxki_dev *card, multi_mix_value_info * mmvi) for (i = 0; i < mmvi->item_count; i++) { id = mmvi->values[i].id - EMU_MULTI_CONTROL_FIRSTID; if (id < 0 || id >= card->multi.control_count) { - PRINT(("emuxki_get_mix : invalid control id requested : %li\n", id)); + PRINT(("emuxki_get_mix : " + "invalid control id requested : %" B_PRIi32 "\n", id)); continue; } control = &card->multi.controls[id]; @@ -568,7 +569,8 @@ emuxki_set_mix(emuxki_dev *card, multi_mix_value_info * mmvi) for (i = 0; i < mmvi->item_count; i++) { id = mmvi->values[i].id - EMU_MULTI_CONTROL_FIRSTID; if (id < 0 || id >= card->multi.control_count) { - PRINT(("emuxki_set_mix : invalid control id requested : %li\n", id)); + PRINT(("emuxki_set_mix : " + "invalid control id requested : %" B_PRIi32 "\n", id)); continue; } control = &card->multi.controls[id]; @@ -578,7 +580,8 @@ emuxki_set_mix(emuxki_dev *card, multi_mix_value_info * mmvi) if (i+1item_count) { id = mmvi->values[i + 1].id - EMU_MULTI_CONTROL_FIRSTID; if (id < 0 || id >= card->multi.control_count) { - PRINT(("emuxki_set_mix : invalid control id requested : %li\n", id)); + PRINT(("emuxki_set_mix : " + "invalid control id requested : %" B_PRIi32 "\n", id)); } else { control2 = &card->multi.controls[id]; if (control2->mix_control.master != control->mix_control.id)