diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h index 31bbeed..18d251c 100644 --- a/firmware/export/as3525.h +++ b/firmware/export/as3525.h @@ -497,4 +497,15 @@ interface */ /* PCM addresses for obtaining buffers will be what DMA is using (physical) */ #define HAVE_PCM_DMA_ADDRESS +/* I2SIN registers */ + +#define I2SIN_CONTROL (*(volatile unsigned char*)(I2SIN_BASE+0x00)) +#define I2SIN_MASK (*(volatile unsigned char*)(I2SIN_BASE+0x04)) +#define I2SIN_RAW_STATUS (*(volatile unsigned char*)(I2SIN_BASE+0x08)) +#define I2SIN_STATUS (*(volatile unsigned char*)(I2SIN_BASE+0x0C)) +#define I2SIN_CLEAR (*(volatile unsigned char*)(I2SIN_BASE+0x10)) +#define I2SIN_DATA (volatile unsigned long*)(I2SIN_BASE+0x14) +#define I2SIN_SPDIF_STATUS (*(volatile unsigned long*)(I2SIN_BASE+0x18)) + + #endif /*__AS3525_H__*/ diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h index ae2cd04..d3076a7 100644 --- a/firmware/export/config-c200v2.h +++ b/firmware/export/config-c200v2.h @@ -9,8 +9,6 @@ #define FIRMWARE_OFFSET_FILE_DATA 8 #define FIRMWARE_OFFSET_FILE_CRC 0 -#if 0 - #define HW_SAMPR_CAPS (SAMPR_CAP_44) /* define this if you have recording possibility */ @@ -20,8 +18,6 @@ #define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ #define REC_SAMPR_DEFAULT SAMPR_22 -#endif - /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 37b1a31..c2b106b 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h @@ -9,8 +9,6 @@ #define FIRMWARE_OFFSET_FILE_DATA 8 #define FIRMWARE_OFFSET_FILE_CRC 0 -#if 0 /* disabled since there is no driver (yet) */ - #define HW_SAMPR_CAPS (SAMPR_CAP_44) /* define this if you have recording possibility */ @@ -20,8 +18,6 @@ #define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ #define REC_SAMPR_DEFAULT SAMPR_22 -#endif - /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index c8fae9a..a850687 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h @@ -9,7 +9,6 @@ #define HW_SAMPR_CAPS (SAMPR_CAP_44) -#if 0 /* define this if you have recording possibility */ #define HAVE_RECORDING @@ -24,7 +23,6 @@ /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ -#endif #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) /* define this if you have a bitmap LCD display */ diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 0556cc0..5c8ba30 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c @@ -751,6 +751,11 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start, start += transfer; count -= transfer; } + else + { + mci_delay(); + mci_delay(); + } last_disk_activity = current_tick; diff --git a/firmware/target/arm/as3525/audio-as3525.c b/firmware/target/arm/as3525/audio-as3525.c index 410fdfa..f575f74 100644 --- a/firmware/target/arm/as3525/audio-as3525.c +++ b/firmware/target/arm/as3525/audio-as3525.c @@ -25,41 +25,65 @@ #include "audiohw.h" #include "sound.h" -int audio_channels = 2; -int audio_output_source = AUDIO_SRC_PLAYBACK; +//int audio_channels = 2; void audio_set_output_source(int source) { +#if 0 if ((unsigned)source >= AUDIO_NUM_SOURCES) source = AUDIO_SRC_PLAYBACK; +#else + (void)source; +#endif - audio_output_source = source; } /* audio_set_output_source */ void audio_input_mux(int source, unsigned flags) { static int last_source = AUDIO_SRC_PLAYBACK; - - (void)flags; + static bool last_recording = false; + const bool recording = flags & SRCF_RECORDING; switch (source) { default: /* playback - no recording */ source = AUDIO_SRC_PLAYBACK; case AUDIO_SRC_PLAYBACK: - audio_channels = 2; + //audio_channels = 2; + if (source != last_source) + { + audiohw_set_monitor(false); + audiohw_disable_recording(); + } + break; + + case AUDIO_SRC_MIC: /* recording only */ + //audio_channels = 1; if (source != last_source) { audiohw_set_monitor(false); + audiohw_enable_recording(true); /* source mic */ } break; case AUDIO_SRC_FMRADIO: /* recording and playback */ - audio_channels = 2; - if (source == last_source) + //audio_channels = 2; + + if (source == last_source && recording == last_recording) break; - audiohw_set_monitor(true); + last_recording = recording; + + if (recording) + { + audiohw_set_monitor(false); + audiohw_enable_recording(false); + } + else + { + audiohw_disable_recording(); + audiohw_set_monitor(true); /* line 2 analog audio path */ + } break; } /* end switch */ diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c index 4f9e185..4ad931e 100644 --- a/firmware/target/arm/as3525/pcm-as3525.c +++ b/firmware/target/arm/as3525/pcm-as3525.c @@ -151,7 +151,7 @@ void pcm_dma_apply_settings(void) panicf("unsupported frequency %ld", frequency); CGU_AUDIO &= ~(((511 ^ divider) << 2) /* I2SOUT */ - /*| ((511 ^ divider) << 14) */ /* I2SIN */ + | ((511 ^ divider) << 14) /* I2SIN */ ); } @@ -180,43 +180,134 @@ void * pcm_dma_addr(void *addr) ** Recording DMA transfer **/ #ifdef HAVE_RECORDING + +static int rec_locked = 0; +static unsigned char *dma_rec_start_addr; +static size_t dma_rec_size; /* in 4*32 bits */ +static void dma_rec_callback(void); + +#define show_fn() lcd_puts(0,13,__func__);lcd_update(); + void pcm_rec_lock(void) { + if(++rec_locked == 1) + VIC_INT_EN_CLEAR = INTERRUPT_DMAC; } void pcm_rec_unlock(void) { + if(--rec_locked == 0) + VIC_INT_ENABLE |= INTERRUPT_DMAC; } void pcm_record_more(void *start, size_t size) { - (void)start; - (void)size; + dma_rec_start_addr = start; + dma_rec_size = size; } void pcm_rec_dma_stop(void) { + dma_disable_channel(1); + dma_rec_size = 0; + + //dma_release(); + + CGU_PERI &= ~CGU_I2SIN_APB_CLOCK_ENABLE; + CGU_AUDIO &= ~(1<<23); +} + +static void start_recording(void) +{ + size_t size = dma_rec_size; + void* addr = dma_rec_start_addr; + + if(size > MAX_TRANSFER) + size = MAX_TRANSFER; + + dma_rec_size -= size; + dma_rec_start_addr += size; + + //dump_dcache_range((void*)dma_rec_start_addr, size); + //we might want to use a buffer aligned on cache line size (32 bytes) + dma_enable_channel(1, (void*)I2SIN_DATA, addr, DMA_PERI_I2SIN, + DMAC_FLOWCTRL_DMAC_PERI_TO_MEM, false, true, size >> 2, DMA_S1, + dma_rec_callback); +} + +void INT_I2SIN(void) +{ + panicf("i2sin : %x", I2SIN_STATUS); } void pcm_rec_dma_start(void *addr, size_t size) { - (void)addr; - (void)size; + dma_rec_start_addr = addr; + dma_rec_size = size; + + if((unsigned int)addr & 3) + panicf("unaligned pointer!"); + + CGU_PERI |= CGU_I2SIN_APB_CLOCK_ENABLE; + CGU_AUDIO |= (1<<23); + + I2SIN_CONTROL = (1<<11) /* dma request enable */ + | (1<<5) /* 14 bits samples */ + #if 0 + | (2<<8) /* i2c clk src = spdif */ + | (2<<6) /* sdata src = spdif */ + #endif + ; + + I2SIN_MASK = (1<<6) | (1<<0) /*errors*/ | (1<<3) /*pop half full*/; + VIC_INT_ENABLE |= INTERRUPT_I2SIN; + + dma_retain(); + + start_recording(); +} + +static void dma_rec_callback(void) +{ + panicf("rec callback"); + + register pcm_more_callback_type2 more_ready = pcm_callback_more_ready; + + if(dma_rec_size || (more_ready && more_ready(0) >= 0)) + { + start_recording(); + return; + } + + pcm_rec_dma_stop(); + pcm_rec_dma_stopped_callback(); } void pcm_rec_dma_close(void) { + pcm_rec_dma_stop(); } void pcm_rec_dma_init(void) { + /* clock source PLLA, minimal frequency */ + CGU_AUDIO |= (511<<14) | (1<<12); + + audiohw_preinit(); } const void * pcm_rec_dma_get_peak_buffer(int *count) { - (void)count; + const void *peak_buffer; + + pcm_rec_lock(); + *count = dma_rec_size >> 2; + peak_buffer = (const void*)dma_rec_start_addr; + pcm_rec_unlock(); + + return peak_buffer; } #endif /* HAVE_RECORDING */ diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index ecb9736..e039001 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c @@ -107,6 +107,7 @@ struct vec_int_src vec_int_srcs[] = { INT_SRC_MCI0, INT_MCI0 }, { INT_SRC_GPIOA, INT_GPIOA, }, { INT_SRC_GPIOB, INT_GPIOB, }, + { INT_SRC_I2SIN, INT_I2SIN, }, }; static void setup_vic(void)