Patch to update ymfpci in 2.4 from 2.5
Now that 2.4.18 is happily behind us, I can sync my tree. The patch below adds proper DMA API (from 2.5), and does various small cleanups in whitespace and comments.
-- Pete
drivers/sound/ymfpci.h +12 -12
@@ -227,6 +227,7 @@char use, pcm, synth, midi;// bool ymfpci_playback_bank_t *bank;struct ymf_pcm *ypcm; +dma_addr_t bank_ba; };struct ymf_capture {
@@ -239,19 +240,17 @@struct ymf_unit {u8 rev;/* PCI revision */ void *reg_area_virt; -void *work_ptr; - -unsigned int bank_size_playback; -unsigned int bank_size_capture; -unsigned int bank_size_effect; +void *dma_area_va; +dma_addr_t dma_area_ba; +unsigned int dma_area_size; + +dma_addr_t bank_base_capture; +dma_addr_t bank_base_effect; +dma_addr_t work_base;unsigned int work_size; -void *bank_base_playback; -void *bank_base_capture; -void *bank_base_effect; -void *work_base; -u32 *ctrl_playback; +dma_addr_t ctrl_playback_ba;ymfpci_playback_bank_t *bank_playback[YDSXG_PLAYBACK_VOICES ][2 ];ymfpci_capture_bank_t *bank_capture[YDSXG_CAPTURE_VOICES ][2 ];ymfpci_effect_bank_t *bank_effect[YDSXG_EFFECT_VOICES ][2 ];
@@ -286,10 +285,11 @@ };struct ymf_dmabuf { - -/* OSS buffer management stuff */ +dma_addr_t dma_addr;void *rawbuf;unsigned buforder; + +/* OSS buffer management stuff */ unsigned numfrag;unsigned fragshift;
drivers/sound/ymfpci.c +138 -87
441 lines not on this page · raw message