Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicting types

Browse Source
This commit is contained in:
Markus Fröschle
2017-04-14 09:10:18 +00:00
parent 866462aaba
commit 6c01a1b6a6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaS_gcc/video/fbmem.c
View File

@@ -28,7 +28,7 @@
*/ */
int32_t fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
{ {
int32_t xoffset = var->xoffset; int32_t xoffset = var->xoffset;
int32_t yoffset = var->yoffset; int32_t yoffset = var->yoffset;
@@ -58,7 +58,7 @@ int32_t fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)
return 0; return 0;
} }
int32_t fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) int fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
{ {
int32_t err; int32_t err;
@@ -91,7 +91,7 @@ int32_t fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
return 0; return 0;
} }
int32_t fb_blank(struct fb_info *info, int32_t blank) int fb_blank(struct fb_info *info, int blank)
{ {
dbg("\r\n"); dbg("\r\n");
if (blank > FB_BLANK_POWERDOWN) if (blank > FB_BLANK_POWERDOWN)
@@ -99,7 +99,7 @@ int32_t fb_blank(struct fb_info *info, int32_t blank)
return(info->fbops->fb_blank(blank, info)); return(info->fbops->fb_blank(blank, info));
} }
int32_t fb_ioctl(struct fb_info *info, uint32_t cmd, uint32_t arg) int fb_ioctl(struct fb_info *info, uint32_t cmd, uint32_t arg)
{ {
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
struct fb_fix_screeninfo fix; struct fb_fix_screeninfo fix;