diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/pcm_record.c | 30 | ||||
-rw-r--r-- | firmware/target/coldfire/i2c-coldfire.c | 8 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/x5/m5636-x5.c | 11 |
3 files changed, 25 insertions, 24 deletions
diff --git a/firmware/pcm_record.c b/firmware/pcm_record.c index f467b734c8..1c7e458067 100644 --- a/firmware/pcm_record.c +++ b/firmware/pcm_record.c | |||
@@ -796,7 +796,7 @@ static inline void pcmrec_write_chunk(void) | |||
796 | } | 796 | } |
797 | else if (errors == 0) | 797 | else if (errors == 0) |
798 | { | 798 | { |
799 | logf("wr chk enc error %d %d", | 799 | logf("wr chk enc error %lu %lu", |
800 | rec_fdata.chunk->enc_size, rec_fdata.chunk->num_pcm); | 800 | rec_fdata.chunk->enc_size, rec_fdata.chunk->num_pcm); |
801 | errors |= PCMREC_E_ENCODER; | 801 | errors |= PCMREC_E_ENCODER; |
802 | } | 802 | } |
@@ -1680,7 +1680,7 @@ void enc_set_parameters(struct enc_parameters *params) | |||
1680 | } | 1680 | } |
1681 | 1681 | ||
1682 | enc_sample_rate = params->enc_sample_rate; | 1682 | enc_sample_rate = params->enc_sample_rate; |
1683 | logf("enc sampr:%d", enc_sample_rate); | 1683 | logf("enc sampr:%lu", enc_sample_rate); |
1684 | 1684 | ||
1685 | SET_PCM_POS(pcm_rd_pos, dma_wr_pos); | 1685 | SET_PCM_POS(pcm_rd_pos, dma_wr_pos); |
1686 | pcm_enc_pos = pcm_rd_pos; | 1686 | pcm_enc_pos = pcm_rd_pos; |
@@ -1691,7 +1691,7 @@ void enc_set_parameters(struct enc_parameters *params) | |||
1691 | ALIGN_UP_P2(ENC_CHUNK_HDR_SIZE + params->chunk_size, 2); | 1691 | ALIGN_UP_P2(ENC_CHUNK_HDR_SIZE + params->chunk_size, 2); |
1692 | enc_events_callback = params->events_callback; | 1692 | enc_events_callback = params->events_callback; |
1693 | 1693 | ||
1694 | logf("chunk size:%d", enc_chunk_size); | 1694 | logf("chunk size:%lu", enc_chunk_size); |
1695 | 1695 | ||
1696 | /*** Configure the buffers ***/ | 1696 | /*** Configure the buffers ***/ |
1697 | 1697 | ||
@@ -1702,7 +1702,7 @@ void enc_set_parameters(struct enc_parameters *params) | |||
1702 | * |[[s4]:Reserved Bytes]|Filename Queue->|[space]| | 1702 | * |[[s4]:Reserved Bytes]|Filename Queue->|[space]| |
1703 | */ | 1703 | */ |
1704 | resbytes = ALIGN_UP_P2(params->reserve_bytes, 2); | 1704 | resbytes = ALIGN_UP_P2(params->reserve_bytes, 2); |
1705 | logf("resbytes:%d", resbytes); | 1705 | logf("resbytes:%lu", resbytes); |
1706 | 1706 | ||
1707 | bufsize = rec_buffer_size - (enc_buffer - pcm_buffer) - | 1707 | bufsize = rec_buffer_size - (enc_buffer - pcm_buffer) - |
1708 | resbytes - FNQ_MIN_NUM_PATHS*MAX_PATH | 1708 | resbytes - FNQ_MIN_NUM_PATHS*MAX_PATH |
@@ -1716,7 +1716,7 @@ void enc_set_parameters(struct enc_parameters *params) | |||
1716 | 1716 | ||
1717 | /* get real amount used by encoder chunks */ | 1717 | /* get real amount used by encoder chunks */ |
1718 | bufsize = enc_num_chunks*enc_chunk_size; | 1718 | bufsize = enc_num_chunks*enc_chunk_size; |
1719 | logf("enc size:%d", bufsize); | 1719 | logf("enc size:%lu", bufsize); |
1720 | 1720 | ||
1721 | #ifdef PCMREC_PARANOID | 1721 | #ifdef PCMREC_PARANOID |
1722 | /* add magic at wraparound */ | 1722 | /* add magic at wraparound */ |
@@ -1747,19 +1747,19 @@ void enc_set_parameters(struct enc_parameters *params) | |||
1747 | if (fnq_size > FNQ_MAX_NUM_PATHS) | 1747 | if (fnq_size > FNQ_MAX_NUM_PATHS) |
1748 | fnq_size = FNQ_MAX_NUM_PATHS; | 1748 | fnq_size = FNQ_MAX_NUM_PATHS; |
1749 | fnq_size *= MAX_PATH; | 1749 | fnq_size *= MAX_PATH; |
1750 | logf("fnq files: %d", fnq_size / MAX_PATH); | 1750 | logf("fnq files:%ld", fnq_size / MAX_PATH); |
1751 | 1751 | ||
1752 | #if 0 | 1752 | #if 1 |
1753 | logf("ab :%08X", (unsigned long)audiobuf); | 1753 | logf("ab :%08lX", (uintptr_t)audiobuf); |
1754 | logf("pcm:%08X", (unsigned long)pcm_buffer); | 1754 | logf("pcm:%08lX", (uintptr_t)pcm_buffer); |
1755 | logf("enc:%08X", (unsigned long)enc_buffer); | 1755 | logf("enc:%08lX", (uintptr_t)enc_buffer); |
1756 | logf("res:%08X", (unsigned long)params->reserve_buffer); | 1756 | logf("res:%08lX", (uintptr_t)params->reserve_buffer); |
1757 | #ifdef PCMREC_PARANOID | 1757 | #ifdef PCMREC_PARANOID |
1758 | logf("wip:%08X", (unsigned long)wrap_id_p); | 1758 | logf("wip:%08lX", (uintptr_t)wrap_id_p); |
1759 | #endif | 1759 | #endif |
1760 | logf("fnq:%08X", (unsigned long)fn_queue); | 1760 | logf("fnq:%08lX", (uintptr_t)fn_queue); |
1761 | logf("end:%08X", (unsigned long)fn_queue + fnq_size); | 1761 | logf("end:%08lX", (uintptr_t)fn_queue + fnq_size); |
1762 | logf("abe:%08X", (unsigned long)audiobufend); | 1762 | logf("abe:%08lX", (uintptr_t)audiobufend); |
1763 | #endif | 1763 | #endif |
1764 | 1764 | ||
1765 | /* init all chunk headers and reset indexes */ | 1765 | /* init all chunk headers and reset indexes */ |
diff --git a/firmware/target/coldfire/i2c-coldfire.c b/firmware/target/coldfire/i2c-coldfire.c index b4e7968d1a..d743d046a7 100644 --- a/firmware/target/coldfire/i2c-coldfire.c +++ b/firmware/target/coldfire/i2c-coldfire.c | |||
@@ -169,7 +169,7 @@ int i2c_start(volatile unsigned char *iface) | |||
169 | ; | 169 | ; |
170 | if (!j) | 170 | if (!j) |
171 | { | 171 | { |
172 | logf("i2c: bus is busy (iface=%08x)", iface); | 172 | logf("i2c: bus is busy (iface=%08lX)", (uintptr_t)iface); |
173 | return -1; | 173 | return -1; |
174 | } | 174 | } |
175 | 175 | ||
@@ -190,7 +190,7 @@ int i2c_wait_for_slave(volatile unsigned char *iface) | |||
190 | ; | 190 | ; |
191 | if (!j) | 191 | if (!j) |
192 | { | 192 | { |
193 | logf("i2c: IFF not set (iface=%08x)", iface); | 193 | logf("i2c: IFF not set (iface=%08lX)", (uintptr_t)iface); |
194 | i2c_stop(iface); | 194 | i2c_stop(iface); |
195 | return -2; | 195 | return -2; |
196 | } | 196 | } |
@@ -218,7 +218,7 @@ int i2c_outb(volatile unsigned char *iface, unsigned char byte) | |||
218 | /* Check that transfer is complete */ | 218 | /* Check that transfer is complete */ |
219 | if ( !(iface[O_MBSR] & ICF)) | 219 | if ( !(iface[O_MBSR] & ICF)) |
220 | { | 220 | { |
221 | logf("i2c: transfer error (iface=%08x)", iface); | 221 | logf("i2c: transfer error (iface=%08lX)", (uintptr_t)iface); |
222 | i2c_stop(iface); | 222 | i2c_stop(iface); |
223 | return -3; | 223 | return -3; |
224 | } | 224 | } |
@@ -226,7 +226,7 @@ int i2c_outb(volatile unsigned char *iface, unsigned char byte) | |||
226 | /* Check that the byte has been ACKed */ | 226 | /* Check that the byte has been ACKed */ |
227 | if (iface[O_MBSR] & RXAK) | 227 | if (iface[O_MBSR] & RXAK) |
228 | { | 228 | { |
229 | logf("i2c: no ACK (iface=%08x)", iface); | 229 | logf("i2c: no ACK (iface=%08lX)", (uintptr_t)iface); |
230 | i2c_stop(iface); | 230 | i2c_stop(iface); |
231 | return -4; | 231 | return -4; |
232 | } | 232 | } |
diff --git a/firmware/target/coldfire/iaudio/x5/m5636-x5.c b/firmware/target/coldfire/iaudio/x5/m5636-x5.c index d30ff360d6..02f48cf53d 100644 --- a/firmware/target/coldfire/iaudio/x5/m5636-x5.c +++ b/firmware/target/coldfire/iaudio/x5/m5636-x5.c | |||
@@ -40,11 +40,12 @@ void m5636_dump_regs(void) | |||
40 | address < (unsigned short *)(M5636_BASE + 0x100); | 40 | address < (unsigned short *)(M5636_BASE + 0x100); |
41 | address++) | 41 | address++) |
42 | { | 42 | { |
43 | logf("m5636 A:%08x D:%04x", address, (unsigned)*address); | 43 | logf("m5636 A:%08lX D:%04lX", (uintptr_t)address, |
44 | (uintptr_t)*address); | ||
44 | } | 45 | } |
45 | 46 | ||
46 | logf("GPIO_INT_EN %08x", GPIO_INT_EN); | 47 | logf("GPIO_INT_EN %08lX", GPIO_INT_EN); |
47 | logf("GPIO1_OUT %08x", GPIO1_OUT); | 48 | logf("GPIO1_OUT %08lX", GPIO1_OUT); |
48 | logf("GPIO1_ENABLE %08x", GPIO1_ENABLE); | 49 | logf("GPIO1_ENABLE %08lX", GPIO1_ENABLE); |
49 | logf("GPIO1_FUNCTION %08x", GPIO1_FUNCTION); | 50 | logf("GPIO1_FUNCTION %08lX", GPIO1_FUNCTION); |
50 | } | 51 | } |