Changeset 0773396 in mainline for uspace/drv/audio/sb16/dsp.c
- Timestamp:
- 2013-12-25T13:05:25Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- bc54126c
- Parents:
- f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/audio/sb16/dsp.c
rf4a47e52 r0773396 173 173 { 174 174 assert(dsp); 175 if (size > MAX_BUFFER_SIZE || size == 0 || (size % 2) == 1) 175 176 if ((size > MAX_BUFFER_SIZE) || (size == 0) || ((size % 2) == 1)) 176 177 size = MAX_BUFFER_SIZE; 177 void *buffer = NULL, *pa = NULL; 178 int ret = dmamem_map_anonymous(size, AS_AREA_WRITE | AS_AREA_READ, 179 0, &pa, &buffer); 178 179 uintptr_t pa = 0; 180 void *buffer = NULL; 181 182 int ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff, 183 AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer); 180 184 if (ret != EOK) { 181 185 ddf_log_error("Failed to allocate DMA buffer."); 182 186 return ENOMEM; 183 187 } 184 185 ddf_log_verbose("Setup dma buffer at %p(%p) %zu.", buffer, pa, size);186 assert( (uintptr_t)pa < (1 << 25));187 188 189 ddf_log_verbose("Setup DMA buffer at %p (%zu) %zu.", buffer, pa, size); 190 assert(pa < (1 << 24)); 191 188 192 /* Setup 16 bit channel */ 189 ret = setup_dma(dsp, (uintptr_t)pa, size);193 ret = setup_dma(dsp, pa, size); 190 194 if (ret == EOK) { 191 195 dsp->buffer.data = buffer; … … 196 200 dmamem_unmap_anonymous(buffer); 197 201 } 202 198 203 return ret; 199 204 }
Note:
See TracChangeset
for help on using the changeset viewer.