From d10688862e58c6c169935e127e90ee3c553c5ff4 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Sun, 3 Nov 2002 23:07:14 +0000 Subject: Added newer interface to xine_health_check CVS patchset: 3175 CVS date: 2002/11/03 23:07:14 --- src/xine-utils/xine_check.c | 72 ++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 46 deletions(-) (limited to 'src/xine-utils/xine_check.c') diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c index 946e5c7eb..1755d5ac6 100644 --- a/src/xine-utils/xine_check.c +++ b/src/xine-utils/xine_check.c @@ -65,57 +65,37 @@ xine_health_check_t* -xine_health_check (xine_health_check_t* hc) { - -#if 0 - if (xine_health_check_os() < 0) { - retval = -1; +xine_health_check (xine_health_check_t* hc, int check_num) { + + switch(check_num) { + case CHECK_KERNEL: + hc = xine_health_check_kernel (hc); + break; + case CHECK_MTRR: + hc = xine_health_check_mtrr (hc); + break; + case CHECK_CDROM: + hc = xine_health_check_cdrom (hc); + break; + case CHECK_DVDROM: + hc = xine_health_check_dvdrom (hc); + break; + case CHECK_DMA: + hc = xine_health_check_dma (hc); + break; + case CHECK_X: + hc = xine_health_check_x (hc); + break; + case CHECK_XV: + hc = xine_health_check_xv (hc); + break; + default: + hc->status = XINE_HEALTH_CHECK_NO_SUCH_CHECK; } -#endif - - hc = xine_health_check_kernel (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } - -#ifdef ARCH_X86 - hc = xine_health_check_mtrr (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } -#endif /* ARCH_X86 */ - - hc = xine_health_check_cdrom (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } - - hc = xine_health_check_dvdrom (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } - - hc = xine_health_check_dma (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } - - hc = xine_health_check_x (hc); - if (hc->status == XINE_HEALTH_CHECK_FAIL) { - return hc; - } - - hc = xine_health_check_xv (hc); return hc; } -int -xine_health_check_os(void) -{ - return 0; -} - xine_health_check_t* xine_health_check_kernel (xine_health_check_t* hc) { struct utsname kernel; -- cgit v1.2.3