Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c6f3fdc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: sm750fb: fix hw_imageblit parameters 



Fix up hw_imageblit() so that the function paramaters match up with what
the driver expects them to be when using it as a function pointer.

Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf2fbc2a

drivers/staging/sm750fb/sm750_accel.c

+14 −15
Original line number Original line Diff line number Diff line
@@ -395,21 +395,20 @@ static unsigned int deGetTransparency(struct lynx_accel * accel) 
    return de_ctrl;

    return de_ctrl;

}

}





int hw_imageblit(

int hw_imageblit(struct lynx_accel *accel,

struct lynx_accel * accel,

		 const char *pSrcbuf, /* pointer to start of source buffer in system memory */

unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory */

		 u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */

int srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */

		 u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */

unsigned int startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */

		 u32 dBase,    /* Address of destination: offset in frame buffer */

unsigned int dBase,    /* Address of destination: offset in frame buffer */

		 u32 dPitch,   /* Pitch value of destination surface in BYTE */

unsigned int dPitch,   /* Pitch value of destination surface in BYTE */

		 u32 bytePerPixel,      /* Color depth of destination surface */

unsigned int bytePerPixel,      /* Color depth of destination surface */

		 u32 dx,

unsigned int dx,

		 u32 dy,       /* Starting coordinate of destination surface */

unsigned int dy,       /* Starting coordinate of destination surface */

		 u32 width,

unsigned int width,

		 u32 height,   /* width and height of rectange in pixel value */

unsigned int height,   /* width and height of rectange in pixel value */

		 u32 fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */

unsigned int fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */

		 u32 bColor,   /* Background color (corresponding to a 0 in the monochrome data */

unsigned int bColor,   /* Background color (corresponding to a 0 in the monochrome data */

		 u32 rop2)     /* ROP value */

unsigned int rop2)     /* ROP value */

{

{

    unsigned int ulBytesPerScan;

    unsigned int ulBytesPerScan;

    unsigned int ul4BytesPerScan;

    unsigned int ul4BytesPerScan;

drivers/staging/sm750fb/sm750_accel.h

+14 −15
Original line number Original line Diff line number Diff line
@@ -258,19 +258,18 @@ unsigned int width, 
unsigned int height, /* width and height of rectangle in pixel value */

unsigned int height, /* width and height of rectangle in pixel value */

unsigned int rop2);

unsigned int rop2);





int hw_imageblit(

int hw_imageblit(struct lynx_accel *accel,

struct lynx_accel * accel,

		 const char *pSrcbuf, /* pointer to start of source buffer in system memory */

unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory */

		 u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */

int srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */

		 u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */

unsigned int startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */

		 u32 dBase,    /* Address of destination: offset in frame buffer */

unsigned int dBase,    /* Address of destination: offset in frame buffer */

		 u32 dPitch,   /* Pitch value of destination surface in BYTE */

unsigned int dPitch,   /* Pitch value of destination surface in BYTE */

		 u32 bytePerPixel,      /* Color depth of destination surface */

unsigned int bytePerPixel,      /* Color depth of destination surface */

		 u32 dx,

unsigned int dx,

		 u32 dy,       /* Starting coordinate of destination surface */

unsigned int dy,       /* Starting coordinate of destination surface */

		 u32 width,

unsigned int width,

		 u32 height,   /* width and height of rectange in pixel value */

unsigned int height,   /* width and height of rectange in pixel value */

		 u32 fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */

unsigned int fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */

		 u32 bColor,   /* Background color (corresponding to a 0 in the monochrome data */

unsigned int bColor,   /* Background color (corresponding to a 0 in the monochrome data */

		 u32 rop2);

unsigned int rop2);

#endif
 
#endif