V4L/DVB (7963): ivtv: trivial annotations (b0510f8d) · Commits · 戴 / test

drivers/media/video/ivtv/ivtv-driver.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -259,6 +259,12 @@ struct ivtv_mailbox_data {

		/* Scatter-Gather array element, used in DMA transfers */
		struct ivtv_sg_element {
		__le32 src;
		__le32 dst;
		__le32 size;
		};

		struct ivtv_sg_host_element {
		u32 src;
		u32 dst;
		u32 size;
		@@ -349,8 +355,8 @@ struct ivtv_stream {
		u16 dma_xfer_cnt;

		/* Base Dev SG Array for cx23415/6 */
		struct ivtv_sg_element *sg_pending;
		struct ivtv_sg_element *sg_processing;
		struct ivtv_sg_host_element *sg_pending;
		struct ivtv_sg_host_element *sg_processing;
		struct ivtv_sg_element *sg_dma;
		dma_addr_t sg_handle;
		int sg_pending_size;

+1 −1

Original line number	Diff line number	Diff line
		@@ -587,7 +587,7 @@ retry:
		since we may get here before the stream has been fully set-up */
		if (mode == OUT_YUV && s->q_full.length == 0 && itv->dma_data_req_size) {
		while (count >= itv->dma_data_req_size) {
		if (!ivtv_yuv_udma_stream_frame (itv, (void *)user_buf)) {
		if (!ivtv_yuv_udma_stream_frame (itv, (void __user *)user_buf)) {
		bytes_written += itv->dma_data_req_size;
		user_buf += itv->dma_data_req_size;
		count -= itv->dma_data_req_size;

+4 −4

Original line number	Diff line number	Diff line
		@@ -231,14 +231,14 @@ static void dma_post(struct ivtv_stream *s)
		struct ivtv_buffer *buf = NULL;
		struct list_head *p;
		u32 offset;
		u32 *u32buf;
		__le32 *u32buf;
		int x = 0;

		IVTV_DEBUG_HI_DMA("%s %s completed (%x)\n", ivtv_use_pio(s) ? "PIO" : "DMA",
		s->name, s->dma_offset);
		list_for_each(p, &s->q_dma.list) {
		buf = list_entry(p, struct ivtv_buffer, list);
		u32buf = (u32 *)buf->buf;
		u32buf = (__le32 *)buf->buf;

		/* Sync Buffer */
		ivtv_buf_sync_for_cpu(s, buf);
		@@ -444,7 +444,7 @@ static void ivtv_dma_enc_start(struct ivtv_stream *s)
		}

		s->dma_xfer_cnt++;
		memcpy(s->sg_processing, s->sg_pending, sizeof(struct ivtv_sg_element) * s->sg_pending_size);
		memcpy(s->sg_processing, s->sg_pending, sizeof(struct ivtv_sg_host_element) * s->sg_pending_size);
		s->sg_processing_size = s->sg_pending_size;
		s->sg_pending_size = 0;
		s->sg_processed = 0;
		@@ -473,7 +473,7 @@ static void ivtv_dma_dec_start(struct ivtv_stream *s)
		if (s->q_predma.bytesused)
		ivtv_queue_move(s, &s->q_predma, NULL, &s->q_dma, s->q_predma.bytesused);
		s->dma_xfer_cnt++;
		memcpy(s->sg_processing, s->sg_pending, sizeof(struct ivtv_sg_element) * s->sg_pending_size);
		memcpy(s->sg_processing, s->sg_pending, sizeof(struct ivtv_sg_host_element) * s->sg_pending_size);
		s->sg_processing_size = s->sg_pending_size;
		s->sg_pending_size = 0;
		s->sg_processed = 0;

+1 −1

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ void ivtv_flush_queues(struct ivtv_stream *s)
		int ivtv_stream_alloc(struct ivtv_stream *s)
		{
		struct ivtv *itv = s->itv;
		int SGsize = sizeof(struct ivtv_sg_element) * s->buffers;
		int SGsize = sizeof(struct ivtv_sg_host_element) * s->buffers;
		int i;

		if (s->buffers == 0)

+1 −1

Original line number	Diff line number	Diff line
		@@ -1116,7 +1116,7 @@ void ivtv_yuv_setup_stream_frame(struct ivtv *itv)
		}

		/* Attempt to dma a frame from a user buffer */
		int ivtv_yuv_udma_stream_frame(struct ivtv itv, void src)
		int ivtv_yuv_udma_stream_frame(struct ivtv itv, void __user src)
		{
		struct yuv_playback_info *yi = &itv->yuv_info;
		struct ivtv_dma_frame dma_args;