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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent 01e011efc9 8d55020df7
commit 0b9ac652bf
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hardware/coolstream/hardware_caps.cpp
View File

@@ -6,6 +6,7 @@
*
* License: GPL v2 or later
*/
#include <config.h>
#include "cs_api.h"
#include <stdio.h>
#include <string.h>
@@ -20,7 +21,10 @@ hw_caps_t *get_hwcaps(void) {
if (initialized)
return &caps;
int rev = cs_get_revision();
int chip = cs_get_chip_type();
int chip = 0;
#ifdef BOXMODEL_CS_HD2
chip = cs_get_chip_type();
#endif
caps.has_fan = (rev < 8 && CFEManager::getInstance()->getFE(0)->hasSat()); // only SAT-HD1 before rev 8 has fan
caps.has_HDMI = 1;
caps.has_SCART = (rev != 10);

2
lib/hardware/coolstream/hd1/libcoolstream/cs_api.h
View File

@@ -82,7 +82,7 @@ int cs_get_tsp_config(unsigned int port, tsrouter_tsp_config_t *tsp_config);
unsigned long long cs_get_serial(void);
unsigned int cs_get_revision(void);
/* Dummy function for compatibility with hd2 */
unsigned int cs_get_chip_type(void);
//unsigned int cs_get_chip_type(void);
// library version functions

22
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -5234,7 +5234,7 @@ void RenderPage()
{
page_atrb[32].fg = yellow;
page_atrb[32].bg = menu1;
int showpage = tuxtxt_cache.page_receiving;
int showpage = tuxtxt_cache.page_receiving < 0 ? 0 : tuxtxt_cache.page_receiving;
int showsubpage = tuxtxt_cache.subpagetable[showpage];
if (showsubpage!=0xff)
{
@@ -5524,7 +5524,7 @@ void CopyBB2FB()
{
fb_pixel_t *src, *dst, *topsrc;
int fillcolor, i, screenwidth, swtmp;
#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2)
#if defined(HAVE_SPARK_HARDWARE) || defined(HAVE_COOL_HARDWARE)
CFrameBuffer *f = CFrameBuffer::getInstance();
#endif
@@ -5537,10 +5537,20 @@ void CopyBB2FB()
{
#ifdef HAVE_SPARK_HARDWARE
f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true);
#elif defined BOXMODEL_CS_HD2
#elif defined(HAVE_COOL_HARDWARE)
f->fbCopyArea(var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, var_screeninfo.yres);
#else
memcpy(lfb, lbb, fix_screeninfo.line_length*var_screeninfo.yres);
if ((uint32_t)stride > var_screeninfo.xres) {
fb_pixel_t *lfb_ = lfb;
fb_pixel_t *lbb_ = lbb;
for (uint32_t i1 = 0; i1 < var_screeninfo.yres; i1++) {
memcpy(lfb_, lbb_, var_screeninfo.xres * sizeof(fb_pixel_t));
lfb_ += stride;
lbb_ += stride;
}
}
else
memcpy(lfb, lbb, fix_screeninfo.line_length*var_screeninfo.yres);
#endif
/* adapt background of backbuffer if changed */
@@ -5576,7 +5586,7 @@ void CopyBB2FB()
if (screenmode == 1)
{
screenwidth = ( TV43STARTX );
#if defined(HAVE_SPARK_HARDWARE) || defined(BOXMODEL_CS_HD2)
#if defined(HAVE_SPARK_HARDWARE)
int cx = var_screeninfo.xres - TV43STARTX; /* x start */
int cw = TV43STARTX; /* width */
int cy = StartY;
@@ -5584,8 +5594,6 @@ void CopyBB2FB()
#endif
#ifdef HAVE_SPARK_HARDWARE
f->blit2FB(lbb, cw, ch, cx, cy, cx, cy, true);
#elif defined BOXMODEL_CS_HD2
f->fbCopyArea(cw, ch, cx, cy, cx, cy+var_screeninfo.yres);
#else
fb_pixel_t *topdst = dst;
size_t width = (ex - screenwidth) * sizeof(fb_pixel_t);