Changeset 1360
- Timestamp:
- 10/19/08 02:56:16 (15 years ago)
- Files:
-
- branches/libffado-2.0/src/libutil/ringbuffer.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/src/libutil/ringbuffer.c
r864 r1360 188 188 189 189 memcpy (dest, &(rb->buf[rb->read_ptr]), n1); 190 rb->read_ptr += n1; 191 rb->read_ptr &= rb->size_mask; 190 rb->read_ptr = (rb->read_ptr + n1) & rb->size_mask; 192 191 193 192 if (n2) { 194 193 memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2); 195 rb->read_ptr += n2; 196 rb->read_ptr &= rb->size_mask; 194 rb->read_ptr = (rb->read_ptr + n2) & rb->size_mask; 197 195 } 198 196 … … 237 235 if (n2) { 238 236 memcpy (dest + n1, &(rb->buf[tmp_read_ptr]), n2); 237 // FIXME: tmp_read_ptr is not used anymore 239 238 tmp_read_ptr += n2; 240 239 tmp_read_ptr &= rb->size_mask; … … 273 272 274 273 memcpy (&(rb->buf[rb->write_ptr]), src, n1); 275 rb->write_ptr += n1; 276 rb->write_ptr &= rb->size_mask; 274 rb->write_ptr = (rb->write_ptr + n1) & rb->size_mask; 277 275 278 276 if (n2) { 279 277 memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2); 280 rb->write_ptr += n2; 281 rb->write_ptr &= rb->size_mask; 278 rb->write_ptr = (rb->write_ptr + n2) & rb->size_mask; 282 279 } 283 280 … … 290 287 ffado_ringbuffer_read_advance (ffado_ringbuffer_t * rb, size_t cnt) 291 288 { 292 rb->read_ptr += cnt; 293 rb->read_ptr &= rb->size_mask; 289 rb->read_ptr = (rb->read_ptr + cnt) & rb->size_mask; 294 290 } 295 291 … … 299 295 ffado_ringbuffer_write_advance (ffado_ringbuffer_t * rb, size_t cnt) 300 296 { 301 rb->write_ptr += cnt; 302 rb->write_ptr &= rb->size_mask; 297 rb->write_ptr = (rb->write_ptr + cnt) & rb->size_mask; 303 298 } 304 299