Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-19 01:07:17 +01:00
8 changed files with 45 additions and 21 deletions

View File

@@ -358,6 +358,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set invert failed!");
}
#if 0
if (g_info.box_Type == CControld::TUXBOX_MAKER_PHILIPS)
{
if (ioctl(fd, LCD_IOCTL_BIAS, &bias) < 0)
@@ -365,6 +366,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set bias failed!");
}
}
#endif
close(fd);
}
#endif