- rename BOXMODEL_CS => BOXMODEL_CST

Conflicts:
	data/scripts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/imageinfo_ni.cpp
	src/gui/osd_setup.cpp
	src/gui/update.cpp
	src/gui/update.h
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-03 22:07:12 +02:00
committed by Thilo Graf
parent d29c98d7d5
commit a9882cdc22
34 changed files with 121 additions and 98 deletions

View File

@@ -130,10 +130,10 @@ CFrameBuffer* CFrameBuffer::getInstance()
frameBuffer = new CFbAccelSTi();
#endif
#if HAVE_CST_HARDWARE
#ifdef BOXMODEL_CS_HD1
#ifdef BOXMODEL_CST_HD1
frameBuffer = new CFbAccelCSHD1();
#endif
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
frameBuffer = new CFbAccelCSHD2();
#endif
#endif
@@ -542,7 +542,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
int w_align;
int offs_align;
#ifdef BOXMODEL_CS_HD2
#ifdef BOXMODEL_CST_HD2
if (_dx%4 != 0) {
w_align = getWidth4FB_HW_ACC(x, _dx, true);
if (w_align < _dx)