Skip to content

Commit

Permalink
Staging: go7007: annotate code pointers
Browse files Browse the repository at this point in the history 
They are treated as __le16 everywhere, annotate as such.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Harvey Harrison authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 65f9f61 commit 9febd04
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/staging/go7007/go7007-fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,15 +284,15 @@ static const int zz[64] = {
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;

if (space < cnt)
return -1;

for (i = 0; i < cnt; ++i)
dest[i] = __cpu_to_le16(src[i]);
dest[i] = cpu_to_le16p(src + i);

return cnt;
}
Expand Down Expand Up @@ -372,7 +372,7 @@ static int mjpeg_frame_header(struct go7007 *go, unsigned char *buf, int q)
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;
u16 mem = 0x3e00;
Expand Down Expand Up @@ -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,
u16 *code, int space, int *framelen)
__le16 *code, int space, int *framelen)
{
u8 *buf;
u16 mem = 0x3e00;
Expand Down Expand Up @@ -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,
u16 *code, int space, int *framelen)
__le16 *code, int space, int *framelen)
{
u8 *buf;
u16 mem = 0x3e00;
Expand Down Expand Up @@ -936,7 +936,7 @@ static int gen_mpeg4hdr_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 lambda = (go->format == GO7007_FORMAT_MJPEG || go->dvd_mode) ?
Expand Down Expand Up @@ -1091,7 +1091,7 @@ static int brctrl_to_package(struct go7007 *go,
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 rows = go->interlace_coding ? go->height / 32 : go->height / 16;
Expand Down Expand Up @@ -1213,7 +1213,7 @@ static int config_package(struct go7007 *go, u16 *code, int 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,
unsigned char *buf, int ext))
{
Expand Down Expand Up @@ -1292,7 +1292,7 @@ static int relative_prime(int big, int little)
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 ratio = arate / go->sensor_framerate;
Expand Down Expand Up @@ -1323,7 +1323,7 @@ static int avsync_to_package(struct go7007 *go, u16 *code, int 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;
u16 pack[] = {
Expand Down Expand Up @@ -1386,7 +1386,7 @@ static int final_package(struct go7007 *go, u16 *code, int 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 &
GO7007_AUDIO_I2S_MASTER ? 1 : 0) << 11) |
Expand Down Expand Up @@ -1436,7 +1436,7 @@ static int audio_to_package(struct go7007 *go, u16 *code, int 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;
u16 pack[32];
Expand Down Expand Up @@ -1505,7 +1505,7 @@ static int modet_to_package(struct go7007 *go, u16 *code, int space)
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)
{
switch (type) {
Expand Down Expand Up @@ -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)
{
const struct firmware *fw_entry;
u16 *code, *src;
__le16 *code, *src;
int framelen[8] = { }; /* holds the lengths of empty frame templates */
int codespace = 64 * 1024, i = 0, srclen, chunk_len, chunk_flags;
int mode_flag;
Expand Down Expand Up @@ -1590,7 +1590,7 @@ int go7007_construct_fw_image(struct go7007 *go, u8 **fw, int *fwlen)
goto fw_failed;
}
memset(code, 0, codespace * 2);
src = (u16 *)fw_entry->data;
src = (__le16 *)fw_entry->data;
srclen = fw_entry->size / 2;
while (srclen >= 2) {
chunk_flags = __le16_to_cpu(src[0]);
Expand Down

0 comments on commit 9febd04

Please sign in to comment.