summaryrefslogtreecommitdiff
path: root/src/xine-utils/xine_check.c
diff options
context:
space:
mode:
authorStephen Torri <storri@users.sourceforge.net>2002-11-03 23:07:14 +0000
committerStephen Torri <storri@users.sourceforge.net>2002-11-03 23:07:14 +0000
commitd10688862e58c6c169935e127e90ee3c553c5ff4 (patch)
treef5f28afc91f647feca733634b6142faabdf7f9ad /src/xine-utils/xine_check.c
parent3018a1d3fda698707e2610e2a6d11ace633fc3ca (diff)
downloadxine-lib-d10688862e58c6c169935e127e90ee3c553c5ff4.tar.gz
xine-lib-d10688862e58c6c169935e127e90ee3c553c5ff4.tar.bz2
Added newer interface to xine_health_check
CVS patchset: 3175 CVS date: 2002/11/03 23:07:14
Diffstat (limited to 'src/xine-utils/xine_check.c')
-rw-r--r--src/xine-utils/xine_check.c72
1 files changed, 26 insertions, 46 deletions
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;