Skip to content

Commit

Permalink
V4L/DVB (7968): zoran: endianness annotations
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Al Viro authored and Mauro Carvalho Chehab committed Jun 5, 2008
1 parent c1c36f3 commit 581a7f1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/zoran.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ struct zoran_mapping {

struct zoran_jpg_buffer {
struct zoran_mapping *map;
u32 *frag_tab; /* addresses of frag table */
__le32 *frag_tab; /* addresses of frag table */
u32 frag_tab_bus; /* same value cached to save time in ISR */
enum zoran_buffer_state state; /* non-zero if corresponding buffer is in use in grab queue */
struct zoran_sync bs; /* DONE: info to return to application */
Expand Down Expand Up @@ -450,7 +450,7 @@ struct zoran {
unsigned long jpg_queued_num; /* count of frames queued since grab/play started */

/* zr36057's code buffer table */
u32 *stat_com; /* stat_com[i] is indexed by dma_head/tail & BUZ_MASK_STAT_COM */
__le32 *stat_com; /* stat_com[i] is indexed by dma_head/tail & BUZ_MASK_STAT_COM */

/* (value & BUZ_MASK_FRAME) corresponds to index in pend[] queue */
int jpg_pend[BUZ_MAX_FRAME];
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/zoran_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@ error_handler (struct zoran *zr,
if (i) {
/* Rotate stat_comm entries to make current entry first */
int j;
u32 bus_addr[BUZ_NUM_STAT_COM];
__le32 bus_addr[BUZ_NUM_STAT_COM];

/* Here we are copying the stat_com array, which
* is already in little endian format, so
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/zoran_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ jpg_fbuffer_alloc (struct file *file)
jpg_fbuffer_free(file);
return -ENOBUFS;
}
fh->jpg_buffers.buffer[i].frag_tab = (u32 *) mem;
fh->jpg_buffers.buffer[i].frag_tab = (__le32 *) mem;
fh->jpg_buffers.buffer[i].frag_tab_bus =
virt_to_bus((void *) mem);

Expand Down Expand Up @@ -4506,7 +4506,7 @@ zoran_mmap (struct file *file,
if (todo > fraglen)
todo = fraglen;
pos =
le32_to_cpu((unsigned long) fh->jpg_buffers.
le32_to_cpu(fh->jpg_buffers.
buffer[i].frag_tab[2 * j]);
/* should just be pos on i386 */
page = virt_to_phys(bus_to_virt(pos))
Expand Down

0 comments on commit 581a7f1

Please sign in to comment.