Commit 9febd042 authored by Harvey Harrison's avatar Harvey Harrison Committed by Greg Kroah-Hartman

Staging: go7007: annotate code pointers

They are treated as __le16 everywhere, annotate as such.
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 65f9f619
...@@ -284,7 +284,7 @@ static const int zz[64] = { ...@@ -284,7 +284,7 @@ static const int zz[64] = {
58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63
}; };
static int copy_packages(u16 *dest, u16 *src, int pkg_cnt, int space) static int copy_packages(__le16 *dest, u16 *src, int pkg_cnt, int space)
{ {
int i, cnt = pkg_cnt * 32; int i, cnt = pkg_cnt * 32;
...@@ -292,7 +292,7 @@ static int copy_packages(u16 *dest, u16 *src, int pkg_cnt, int space) ...@@ -292,7 +292,7 @@ static int copy_packages(u16 *dest, u16 *src, int pkg_cnt, int space)
return -1; return -1;
for (i = 0; i < cnt; ++i) for (i = 0; i < cnt; ++i)
dest[i] = __cpu_to_le16(src[i]); dest[i] = cpu_to_le16p(src + i);
return cnt; return cnt;
} }
...@@ -372,7 +372,7 @@ static int mjpeg_frame_header(struct go7007 *go, unsigned char *buf, int q) ...@@ -372,7 +372,7 @@ static int mjpeg_frame_header(struct go7007 *go, unsigned char *buf, int q)
return p; return p;
} }
static int gen_mjpeghdr_to_package(struct go7007 *go, u16 *code, int space) static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
{ {
u8 *buf; u8 *buf;
u16 mem = 0x3e00; u16 mem = 0x3e00;
...@@ -643,7 +643,7 @@ static int mpeg1_sequence_header(struct go7007 *go, unsigned char *buf, int ext) ...@@ -643,7 +643,7 @@ static int mpeg1_sequence_header(struct go7007 *go, unsigned char *buf, int ext)
} }
static int gen_mpeg1hdr_to_package(struct go7007 *go, static int gen_mpeg1hdr_to_package(struct go7007 *go,
u16 *code, int space, int *framelen) __le16 *code, int space, int *framelen)
{ {
u8 *buf; u8 *buf;
u16 mem = 0x3e00; u16 mem = 0x3e00;
...@@ -831,7 +831,7 @@ static int mpeg4_sequence_header(struct go7007 *go, unsigned char *buf, int ext) ...@@ -831,7 +831,7 @@ static int mpeg4_sequence_header(struct go7007 *go, unsigned char *buf, int ext)
} }
static int gen_mpeg4hdr_to_package(struct go7007 *go, static int gen_mpeg4hdr_to_package(struct go7007 *go,
u16 *code, int space, int *framelen) __le16 *code, int space, int *framelen)
{ {
u8 *buf; u8 *buf;
u16 mem = 0x3e00; u16 mem = 0x3e00;
...@@ -936,7 +936,7 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go, ...@@ -936,7 +936,7 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
} }
static int brctrl_to_package(struct go7007 *go, static int brctrl_to_package(struct go7007 *go,
u16 *code, int space, int *framelen) __le16 *code, int space, int *framelen)
{ {
int converge_speed = 0; int converge_speed = 0;
int lambda = (go->format == GO7007_FORMAT_MJPEG || go->dvd_mode) ? int lambda = (go->format == GO7007_FORMAT_MJPEG || go->dvd_mode) ?
...@@ -1091,7 +1091,7 @@ static int brctrl_to_package(struct go7007 *go, ...@@ -1091,7 +1091,7 @@ static int brctrl_to_package(struct go7007 *go,
return copy_packages(code, pack, 6, space); return copy_packages(code, pack, 6, space);
} }
static int config_package(struct go7007 *go, u16 *code, int space) static int config_package(struct go7007 *go, __le16 *code, int space)
{ {
int fps = go->sensor_framerate / go->fps_scale / 1000; int fps = go->sensor_framerate / go->fps_scale / 1000;
int rows = go->interlace_coding ? go->height / 32 : go->height / 16; int rows = go->interlace_coding ? go->height / 32 : go->height / 16;
...@@ -1213,7 +1213,7 @@ static int config_package(struct go7007 *go, u16 *code, int space) ...@@ -1213,7 +1213,7 @@ static int config_package(struct go7007 *go, u16 *code, int space)
return copy_packages(code, pack, 5, space); return copy_packages(code, pack, 5, space);
} }
static int seqhead_to_package(struct go7007 *go, u16 *code, int space, static int seqhead_to_package(struct go7007 *go, __le16 *code, int space,
int (*sequence_header_func)(struct go7007 *go, int (*sequence_header_func)(struct go7007 *go,
unsigned char *buf, int ext)) unsigned char *buf, int ext))
{ {
...@@ -1292,7 +1292,7 @@ static int relative_prime(int big, int little) ...@@ -1292,7 +1292,7 @@ static int relative_prime(int big, int little)
return big; return big;
} }
static int avsync_to_package(struct go7007 *go, u16 *code, int space) static int avsync_to_package(struct go7007 *go, __le16 *code, int space)
{ {
int arate = go->board_info->audio_rate * 1001 * go->fps_scale; int arate = go->board_info->audio_rate * 1001 * go->fps_scale;
int ratio = arate / go->sensor_framerate; int ratio = arate / go->sensor_framerate;
...@@ -1323,7 +1323,7 @@ static int avsync_to_package(struct go7007 *go, u16 *code, int space) ...@@ -1323,7 +1323,7 @@ static int avsync_to_package(struct go7007 *go, u16 *code, int space)
return copy_packages(code, pack, 1, space); return copy_packages(code, pack, 1, space);
} }
static int final_package(struct go7007 *go, u16 *code, int space) static int final_package(struct go7007 *go, __le16 *code, int space)
{ {
int rows = go->interlace_coding ? go->height / 32 : go->height / 16; int rows = go->interlace_coding ? go->height / 32 : go->height / 16;
u16 pack[] = { u16 pack[] = {
...@@ -1386,7 +1386,7 @@ static int final_package(struct go7007 *go, u16 *code, int space) ...@@ -1386,7 +1386,7 @@ static int final_package(struct go7007 *go, u16 *code, int space)
return copy_packages(code, pack, 1, space); return copy_packages(code, pack, 1, space);
} }
static int audio_to_package(struct go7007 *go, u16 *code, int space) static int audio_to_package(struct go7007 *go, __le16 *code, int space)
{ {
int clock_config = ((go->board_info->audio_flags & int clock_config = ((go->board_info->audio_flags &
GO7007_AUDIO_I2S_MASTER ? 1 : 0) << 11) | GO7007_AUDIO_I2S_MASTER ? 1 : 0) << 11) |
...@@ -1436,7 +1436,7 @@ static int audio_to_package(struct go7007 *go, u16 *code, int space) ...@@ -1436,7 +1436,7 @@ static int audio_to_package(struct go7007 *go, u16 *code, int space)
return copy_packages(code, pack, 2, space); return copy_packages(code, pack, 2, space);
} }
static int modet_to_package(struct go7007 *go, u16 *code, int space) static int modet_to_package(struct go7007 *go, __le16 *code, int space)
{ {
int ret, mb, i, addr, cnt = 0; int ret, mb, i, addr, cnt = 0;
u16 pack[32]; u16 pack[32];
...@@ -1505,7 +1505,7 @@ static int modet_to_package(struct go7007 *go, u16 *code, int space) ...@@ -1505,7 +1505,7 @@ static int modet_to_package(struct go7007 *go, u16 *code, int space)
return cnt; return cnt;
} }
static int do_special(struct go7007 *go, u16 type, u16 *code, int space, static int do_special(struct go7007 *go, u16 type, __le16 *code, int space,
int *framelen) int *framelen)
{ {
switch (type) { switch (type) {
...@@ -1555,7 +1555,7 @@ static int do_special(struct go7007 *go, u16 type, u16 *code, int space, ...@@ -1555,7 +1555,7 @@ static int do_special(struct go7007 *go, u16 type, u16 *code, int space,
int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen) int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
{ {
const struct firmware *fw_entry; const struct firmware *fw_entry;
u16 *code, *src; __le16 *code, *src;
int framelen[8] = { }; /* holds the lengths of empty frame templates */ int framelen[8] = { }; /* holds the lengths of empty frame templates */
int codespace = 64 * 1024, i = 0, srclen, chunk_len, chunk_flags; int codespace = 64 * 1024, i = 0, srclen, chunk_len, chunk_flags;
int mode_flag; int mode_flag;
...@@ -1590,7 +1590,7 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen) ...@@ -1590,7 +1590,7 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
goto fw_failed; goto fw_failed;
} }
memset(code, 0, codespace * 2); memset(code, 0, codespace * 2);
src = (u16 *)fw_entry->data; src = (__le16 *)fw_entry->data;
srclen = fw_entry->size / 2; srclen = fw_entry->size / 2;
while (srclen >= 2) { while (srclen >= 2) {
chunk_flags = __le16_to_cpu(src[0]); chunk_flags = __le16_to_cpu(src[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment