Преглед на файлове

V4L/DVB (7968): zoran: endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Al Viro преди 17 години
родител
ревизия
581a7f1a2d
променени са 3 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 2 2
      drivers/media/video/zoran.h
  2. 1 1
      drivers/media/video/zoran_device.c
  3. 2 2
      drivers/media/video/zoran_driver.c

+ 2 - 2
drivers/media/video/zoran.h

@@ -285,7 +285,7 @@ struct zoran_mapping {
 
 
 struct zoran_jpg_buffer {
 struct zoran_jpg_buffer {
 	struct zoran_mapping *map;
 	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 */
 	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 */
 	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 */
 	struct zoran_sync bs;	/* DONE: info to return to application */
@@ -450,7 +450,7 @@ struct zoran {
 	unsigned long jpg_queued_num;	/* count of frames queued since grab/play started */
 	unsigned long jpg_queued_num;	/* count of frames queued since grab/play started */
 
 
 	/* zr36057's code buffer table */
 	/* 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 */
 	/* (value & BUZ_MASK_FRAME) corresponds to index in pend[] queue */
 	int jpg_pend[BUZ_MAX_FRAME];
 	int jpg_pend[BUZ_MAX_FRAME];

+ 1 - 1
drivers/media/video/zoran_device.c

@@ -1320,7 +1320,7 @@ error_handler (struct zoran *zr,
 			if (i) {
 			if (i) {
 				/* Rotate stat_comm entries to make current entry first */
 				/* Rotate stat_comm entries to make current entry first */
 				int j;
 				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
 				/* Here we are copying the stat_com array, which
 				 * is already in little endian format, so
 				 * is already in little endian format, so

+ 2 - 2
drivers/media/video/zoran_driver.c

@@ -495,7 +495,7 @@ jpg_fbuffer_alloc (struct file *file)
 			jpg_fbuffer_free(file);
 			jpg_fbuffer_free(file);
 			return -ENOBUFS;
 			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 =
 		fh->jpg_buffers.buffer[i].frag_tab_bus =
 		    virt_to_bus((void *) mem);
 		    virt_to_bus((void *) mem);
 
 
@@ -4506,7 +4506,7 @@ zoran_mmap (struct file           *file,
 				if (todo > fraglen)
 				if (todo > fraglen)
 					todo = fraglen;
 					todo = fraglen;
 				pos =
 				pos =
-				    le32_to_cpu((unsigned long) fh->jpg_buffers.
+				    le32_to_cpu(fh->jpg_buffers.
 				    buffer[i].frag_tab[2 * j]);
 				    buffer[i].frag_tab[2 * j]);
 				/* should just be pos on i386 */
 				/* should just be pos on i386 */
 				page = virt_to_phys(bus_to_virt(pos))
 				page = virt_to_phys(bus_to_virt(pos))