fix build

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@886 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2010-09-06 19:30:16 +00:00
parent c7eb229a3c
commit 739e1043a0
2 changed files with 7 additions and 5 deletions

View file

@ -11,6 +11,8 @@
int main() int main()
{ {
struct fb_var_screeninfo fbvar; struct fb_var_screeninfo fbvar;
struct omapfb_plane_info pi;
struct omapfb_mem_info mi;
int ret, fbdev, kbdfd; int ret, fbdev, kbdfd;
fbdev = open("/dev/fb0", O_RDWR); fbdev = open("/dev/fb0", O_RDWR);
@ -45,18 +47,18 @@ end_fb0:
goto end_fb1; goto end_fb1;
} }
ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi); ret = ioctl(fbdev, OMAPFB_QUERY_PLANE, &pi);
ret |= ioctl(fd, OMAPFB_QUERY_MEM, &mi); ret |= ioctl(fbdev, OMAPFB_QUERY_MEM, &mi);
if (ret != 0) if (ret != 0)
perror("QUERY_*"); perror("QUERY_*");
pi.enabled = 0; pi.enabled = 0;
ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); ret = ioctl(fbdev, OMAPFB_SETUP_PLANE, &pi);
if (ret != 0) if (ret != 0)
perror("SETUP_PLANE"); perror("SETUP_PLANE");
mi.size = 0; mi.size = 0;
ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); ret = ioctl(fbdev, OMAPFB_SETUP_MEM, &mi);
if (ret != 0) if (ret != 0)
perror("SETUP_MEM"); perror("SETUP_MEM");

View file

@ -339,7 +339,7 @@ int pnd_setup_layer(int enabled, int x, int y, int w, int h)
void pnd_restore_layer_data(void) void pnd_restore_layer_data(void)
{ {
short *t = ((short *)fb_copy)[320*240 / 2 + 160]; short *t = (short *)fb_copy + 320*240 / 2 + 160;
// right now this is used by menu, which wants to preview something // right now this is used by menu, which wants to preview something
// so try to get something on the layer. // so try to get something on the layer.