mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

tuxtxt: fix build on generic pc, don't open framebuffer

Browse Source
This commit is contained in:
Stefan Seyfried
2012-11-02 20:06:53 +01:00
parent af6881a53c
commit 475608c594
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -1648,11 +1648,14 @@ int tuxtx_main(int _rc, int pid, int page, int source)
printf("TuxTxt %s\n", versioninfo); printf("TuxTxt %s\n", versioninfo);
printf("for 32bpp framebuffer\n"); printf("for 32bpp framebuffer\n");
fb = -1;
#ifdef USE_FBPAN
if ((fb=open("/dev/fb/0", O_RDWR)) == -1) if ((fb=open("/dev/fb/0", O_RDWR)) == -1)
{ {
perror("TuxTxt <open /dev/fb/0>"); perror("TuxTxt <open /dev/fb/0>");
return 0; return 0;
} }
#endif
rc = _rc; rc = _rc;
CFrameBuffer *fbp = CFrameBuffer::getInstance(); CFrameBuffer *fbp = CFrameBuffer::getInstance();
@@ -1668,7 +1671,7 @@ int tuxtx_main(int _rc, int pid, int page, int source)
fcntl(rc, F_SETFL, fcntl(rc, F_GETFL) | O_EXCL | O_NONBLOCK); fcntl(rc, F_SETFL, fcntl(rc, F_GETFL) | O_EXCL | O_NONBLOCK);
#ifndef HAVE_SPARK_HARDWARE #if 0 /* just get it from the framebuffer class */
/* get fixed screeninfo */ /* get fixed screeninfo */
if (ioctl(fb, FBIOGET_FSCREENINFO, &fix_screeninfo) == -1) if (ioctl(fb, FBIOGET_FSCREENINFO, &fix_screeninfo) == -1)
{ {
@@ -1868,7 +1871,8 @@ int tuxtx_main(int _rc, int pid, int page, int source)
/* exit */ /* exit */
CleanUp(); CleanUp();
close(fb); if (fb >= 0)
close(fb);
#if 1 #if 1
if ( initialized ) if ( initialized )