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

- rework VUPLUS defines

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-06-12 22:27:03 +02:00
committed by Thilo Graf
parent 6137874561
commit ba934dd995
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
acinclude.m4
View File

@@ -305,26 +305,38 @@ fi
# all vuplus BOXMODELs
case "$BOXMODEL" in
vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
vuplus=true
AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all])
vuplus_all=true
;;
*)
vuplus=false
vuplus_all=false
;;
esac
AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true")
# all vuplus4k BOXMODELs
# all vuplus arm BOXMODELs
case "$BOXMODEL" in
vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
vuplus4k=true
AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm])
vuplus_arm=true
;;
*)
vuplus4k=false
vuplus_arm=false
;;
esac
AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true")
# all vuplus mips BOXMODELs
case "$BOXMODEL" in
vuduo)
AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips])
vuplus_mips=true
;;
*)
vuplus_mips=false
;;
esac
AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
])
dnl backward compatiblity

2
common/ca_ci.cpp
View File

@@ -1944,7 +1944,7 @@ void cCA::SetTSClock(u32 Speed, int slot)
}
}
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
void cCA::SetCIDelay(int Delay)
{
char buf[64];

2
include/ca_ci.h
View File

@@ -329,7 +329,7 @@ public:
/// sh4 unused
void SetTSClock(u32 Speed, int slot = 0);
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
/// dvb wait delay for ci response
void SetCIDelay(int Delay);
/// relevant pids routing

4
libarmbox/audio.cpp
View File

@@ -96,7 +96,7 @@ int map_volume(const int volume)
vol = 63 - vol * 63 / 100;
// now range is 63..0, where 0 is loudest
#if BOXMODEL_VUPLUS4K
#if BOXMODEL_VUPLUS_ALL
if (vol == 63)
vol = 255;
#endif
@@ -343,7 +343,7 @@ int cAudio::StopClip()
hal_info("%s: clipfd not yet opened\n", __FUNCTION__);
return -1;
}
#if BOXMODEL_VUPLUS4K
#if BOXMODEL_VUPLUS_ARM
ioctl(clipfd, SNDCTL_DSP_RESET);
#endif
close(clipfd);