mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 20:22:37 +01:00
parent 695c7d3df9 5f774f310f
commit ab0fdc2825
12 changed files with 255 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -150,10 +150,6 @@ CFbAccelCSHD1::~CFbAccelCSHD1()
munmap((void *)gxa_base, 0x40000);
if (devmem_fd != -1)
close(devmem_fd);
if (lfb)
munmap(lfb, available);
if (fd > -1)
close(fd);
}
void CFbAccelCSHD1::setColor(fb_pixel_t col)
@@ -344,7 +340,7 @@ int CFbAccelCSHD1::setMode(unsigned int, unsigned int, unsigned int)
xRes = screeninfo.xres;
yRes = screeninfo.yres;
bpp = screeninfo.bits_per_pixel;
printf(LOGTAG "%dx%dx%d line length %d. using hd1 graphics accelerator.\n", xRes, yRes, bpp, stride);
printf(LOGTAG "%dx%dx%d line length %d. using %s graphics accelerator.\n", xRes, yRes, bpp, stride, _fix.id);
int needmem = stride * yRes * 2;
if (available >= needmem)
{