aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-11-04 20:33:33 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:50 -0500
commitf0076e60b5a61072b671b597ed2cc210f1b3cbf1 (patch)
tree307f8fbfb38a983931560a6465fd5b5b1eb9e066 /drivers/media
parentc76e6f11662f49dd31a49a07f4c06ee9bea6572b (diff)
V4L/DVB (13426): cx18: Rename struct cx18_mdl to struct cx18_mdl_ent
Rename type in anticipation of implementing a struct cx18_mdl type that actually keeps track of a memory descriptor list. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx18/cx18-queue.c2
-rw-r--r--drivers/media/video/cx18/cx18-scb.h4
-rw-r--r--drivers/media/video/cx18/cx23418.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index fa1ed7897d97..9061ff3eac6f 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -201,7 +201,7 @@ int cx18_stream_alloc(struct cx18_stream *s)
201 201
202 CX18_ERR("Too many buffers, cannot fit in SCB area\n"); 202 CX18_ERR("Too many buffers, cannot fit in SCB area\n");
203 CX18_ERR("Max buffers = %zd\n", 203 CX18_ERR("Max buffers = %zd\n",
204 bufsz / sizeof(struct cx18_mdl)); 204 bufsz / sizeof(struct cx18_mdl_ent));
205 return -ENOMEM; 205 return -ENOMEM;
206 } 206 }
207 207
diff --git a/drivers/media/video/cx18/cx18-scb.h b/drivers/media/video/cx18/cx18-scb.h
index 1dc1c431f5a1..368f23d08709 100644
--- a/drivers/media/video/cx18/cx18-scb.h
+++ b/drivers/media/video/cx18/cx18-scb.h
@@ -81,7 +81,7 @@
81 81
82 82
83/* This structure is used by EPU to provide memory descriptors in its memory */ 83/* This structure is used by EPU to provide memory descriptors in its memory */
84struct cx18_mdl { 84struct cx18_mdl_ent {
85 u32 paddr; /* Physical address of a buffer segment */ 85 u32 paddr; /* Physical address of a buffer segment */
86 u32 length; /* Length of the buffer segment */ 86 u32 length; /* Length of the buffer segment */
87}; 87};
@@ -272,7 +272,7 @@ struct cx18_scb {
272 struct cx18_mailbox ppu2epu_mb; 272 struct cx18_mailbox ppu2epu_mb;
273 273
274 struct cx18_mdl_ack cpu_mdl_ack[CX18_MAX_STREAMS][CX18_MAX_MDL_ACKS]; 274 struct cx18_mdl_ack cpu_mdl_ack[CX18_MAX_STREAMS][CX18_MAX_MDL_ACKS];
275 struct cx18_mdl cpu_mdl[1]; 275 struct cx18_mdl_ent cpu_mdl[1];
276}; 276};
277 277
278void cx18_init_scb(struct cx18 *cx); 278void cx18_init_scb(struct cx18 *cx);
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 9956abf576c5..868806effdcf 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -363,7 +363,7 @@
363/* Description: This command provides the offset to a Memory Descriptor List 363/* Description: This command provides the offset to a Memory Descriptor List
364 IN[0] - Task handle. Handle of the task to start 364 IN[0] - Task handle. Handle of the task to start
365 IN[1] - Offset of the MDL from the beginning of the local DDR. 365 IN[1] - Offset of the MDL from the beginning of the local DDR.
366 IN[2] - Number of cx18_mdl structures in the array pointed to by IN[1] 366 IN[2] - Number of cx18_mdl_ent structures in the array pointed to by IN[1]
367 IN[3] - Buffer ID 367 IN[3] - Buffer ID
368 IN[4] - Total buffer length 368 IN[4] - Total buffer length
369 ReturnCode - One of the ERR_DE_... */ 369 ReturnCode - One of the ERR_DE_... */