Navigation

Changeset 4003

Timestamp:

08/18/07 20:15:56 (1 year ago)

Author:

hverkuil

Message:

- Fix round-robin implementation.
- Invalid VBI packets should result in an empty VBI frame, not

in an zero-sized frame that causes the reader to incorrectly
return a 0 (EOF) value.

- PIO completion should not reset the sg_pending_size field.
- The DMA offset detection code should be ignored for PIO transfers:

it somehow messes up the data on the card and is not needed anyway
for PIO.

Files:

r3988	r4003
172	172
173	173	/* if this is the start of the DMA then fill in the magic cookie */
174		if (s->sg_pending_size == 0) {
	174	if (s->sg_pending_size == 0 && ivtv_use_dma(s)) {
175	175	if (itv->has_cx23415 && (s->type == IVTV_ENC_STREAM_TYPE_PCM \|\|
176	176	s->type == IVTV_DEC_STREAM_TYPE_VBI)) {
…	…
259	259	ivtv_buf_sync_for_cpu(s, buf);
260	260
261		if (x == 0) {
	261	if (x == 0 && ivtv_use_dma(s)) {
262	262	offset = s->dma_last_offset;
263	263	if (u32buf[offset / 4] != DMA_MAGIC_COOKIE)
…	…
598	598	s = &itv->streams[itv->cur_pio_stream];
599	599	IVTV_DEBUG_IRQ("ENC PIO COMPLETE %s\n", s->name);
600		~~s->sg_pending_size = 0;~~
601	600	clear_bit(IVTV_F_I_PIO, &itv->i_flags);
602	601	itv->cur_pio_stream = -1;
…	…
906	905
907	906	if ((combo & IVTV_IRQ_DMA) && !test_bit(IVTV_F_I_DMA, &itv->i_flags)) {
	907	itv->irq_rr_idx++;
908	908	for (i = 0; i < IVTV_MAX_STREAMS; i++) {
909		int idx = (i + itv->irq_rr_idx++) % IVTV_MAX_STREAMS;
	909	int idx = (i + itv->irq_rr_idx) % IVTV_MAX_STREAMS;
910	910	struct ivtv_stream *s = &itv->streams[idx];
911	911
…	…
924	924
925	925	if ((combo & IVTV_IRQ_DMA) && !test_bit(IVTV_F_I_PIO, &itv->i_flags)) {
	926	itv->irq_rr_idx++;
926	927	for (i = 0; i < IVTV_MAX_STREAMS; i++) {
927		int idx = (i + itv->irq_rr_idx++) % IVTV_MAX_STREAMS;
	928	int idx = (i + itv->irq_rr_idx) % IVTV_MAX_STREAMS;
928	929	struct ivtv_stream *s = &itv->streams[idx];
929	930