smscufx: reduce number of casts in ufx_raw_rect
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
This commit is contained in:
parent
21b5a3adf9
commit
be444890c8
|
@ -807,7 +807,7 @@ static int ufx_ops_mmap(struct fb_info *info, struct vm_area_struct *vma)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ufx_raw_rect(struct ufx_data *dev, char *cmd, int x, int y,
|
static void ufx_raw_rect(struct ufx_data *dev, u16 *cmd, int x, int y,
|
||||||
int width, int height)
|
int width, int height)
|
||||||
{
|
{
|
||||||
size_t packed_line_len = ALIGN((width * 2), 4);
|
size_t packed_line_len = ALIGN((width * 2), 4);
|
||||||
|
@ -821,27 +821,27 @@ static void ufx_raw_rect(struct ufx_data *dev, char *cmd, int x, int y,
|
||||||
*((u32 *)&cmd[0]) = cpu_to_le32(0x01);
|
*((u32 *)&cmd[0]) = cpu_to_le32(0x01);
|
||||||
|
|
||||||
/* length word */
|
/* length word */
|
||||||
*((u32 *)&cmd[4]) = cpu_to_le32(packed_rect_len + 16);
|
*((u32 *)&cmd[2]) = cpu_to_le32(packed_rect_len + 16);
|
||||||
|
|
||||||
*((u16 *)&cmd[8]) = cpu_to_le16(x);
|
cmd[4] = cpu_to_le16(x);
|
||||||
*((u16 *)&cmd[10]) = cpu_to_le16(y);
|
cmd[5] = cpu_to_le16(y);
|
||||||
*((u16 *)&cmd[12]) = cpu_to_le16(width);
|
cmd[6] = cpu_to_le16(width);
|
||||||
*((u16 *)&cmd[14]) = cpu_to_le16(height);
|
cmd[7] = cpu_to_le16(height);
|
||||||
|
|
||||||
/* frame base address */
|
/* frame base address */
|
||||||
*((u32 *)&cmd[16]) = cpu_to_le32(0 & 0xffffff80);
|
*((u32 *)&cmd[8]) = cpu_to_le32(0);
|
||||||
|
|
||||||
/* color mode and horizontal resolution */
|
/* color mode and horizontal resolution */
|
||||||
*((u16 *)&cmd[20]) = cpu_to_le16(0x4000 | dev->info->var.xres);
|
cmd[10] = cpu_to_le16(0x4000 | dev->info->var.xres);
|
||||||
|
|
||||||
/* vertical resolution */
|
/* vertical resolution */
|
||||||
*((u16 *)&cmd[22]) = cpu_to_le16(dev->info->var.yres);
|
cmd[11] = cpu_to_le16(dev->info->var.yres);
|
||||||
|
|
||||||
/* packed data */
|
/* packed data */
|
||||||
for (line = 0; line < height; line++) {
|
for (line = 0; line < height; line++) {
|
||||||
const int line_offset = dev->info->fix.line_length * (y + line);
|
const int line_offset = dev->info->fix.line_length * (y + line);
|
||||||
const int byte_offset = line_offset + (x * BPP);
|
const int byte_offset = line_offset + (x * BPP);
|
||||||
memcpy(&cmd[24 + (packed_line_len * line)],
|
memcpy(&cmd[(24 + (packed_line_len * line)) / 2],
|
||||||
(char *)dev->info->fix.smem_start + byte_offset, width * BPP);
|
(char *)dev->info->fix.smem_start + byte_offset, width * BPP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue