Only in detect-new/src: .deps diff -ur detect/src/CVS/Entries detect-new/src/CVS/Entries --- detect/src/CVS/Entries Thu Aug 31 09:11:11 2000 +++ detect-new/src/CVS/Entries Mon Sep 11 12:13:32 2000 @@ -4,13 +4,10 @@ /bus.c/1.5/Mon Jul 24 22:27:20 2000// /calls.c/1.5/Fri Aug 11 10:43:05 2000// /cdrom.c/1.21/Mon Aug 14 10:12:00 2000// -/conv.c/1.36/Wed Aug 16 13:39:55 2000// /cpu.c/1.29/Fri Aug 11 14:02:46 2000// /detect.c/1.14/Mon Jun 19 12:51:03 2000// -/detect.h/1.114/Wed Aug 30 16:15:03 2000// /disk.c/1.27/Wed Aug 30 16:15:03 2000// /ethernet.c/1.34/Wed Aug 16 13:56:50 2000// -/floppy.c/1.29/Fri Aug 11 10:43:05 2000// /ide.c/1.27/Wed Aug 30 16:15:03 2000// /isa.c/1.61/Wed Aug 30 13:50:04 2000// /isdn.c/1.3/Wed Aug 16 13:56:50 2000// @@ -39,8 +36,11 @@ /usb.h/1.1/Mon Jul 24 10:56:56 2000// /utils.c/1.32/Fri Jul 14 14:56:37 2000// /utils.h/1.19/Thu Aug 10 15:24:38 2000// -/video.c/1.26/Wed Aug 16 13:56:50 2000// /webcam.c/1.3/Wed Aug 16 13:56:50 2000// D/SuperProbe//// D/lst//// D/pcmcia//// +/conv.c/1.37/Sun Sep 10 20:34:31 2000// +/detect.h/1.115/Sun Sep 10 20:34:31 2000// +/floppy.c/1.30/Sun Sep 10 20:34:31 2000// +/video.c/1.26/Mon Sep 11 10:13:31 2000// diff -ur detect/src/CVS/Root detect-new/src/CVS/Root --- detect/src/CVS/Root Thu Aug 31 09:09:37 2000 +++ detect-new/src/CVS/Root Mon Sep 4 11:56:49 2000 @@ -1 +1 @@ -:pserver:anoncvs@mandrakesoft.com:/home/cvs/harddrake +:pserver:adussart@mandrakesoft.com:/home/cvs/harddrake Only in detect-new/src: Makefile Only in detect-new/src: Makefile.in diff -ur detect/src/conv.c detect-new/src/conv.c --- detect/src/conv.c Wed Aug 16 15:39:55 2000 +++ detect-new/src/conv.c Tue Sep 12 11:45:04 2000 @@ -270,6 +270,8 @@ if(strstr(str, "HAS_DREAM")) options += HAS_DREAM; if(strstr(str, "HAS_MAD16")) options += HAS_MAD16; if(strstr(str, "IS_SERIAL")) options += IS_SERIAL; + if(strstr(str, "IS_MPU401")) options += IS_MPU401; + if(strstr(str, "IS_OPL3")) options += IS_OPL3; if(strstr(str, s_unknown)) options = 0; return options; }/*endfunc str2options*/ @@ -306,6 +308,10 @@ sprintf(str, "%s:%s", str, "HAS_MAD16"); if(options & IS_SERIAL) sprintf(str, "%s:%s", str, "IS_SERIAL"); + if(options & IS_MPU401) + sprintf(str, "%s:%s", str, "IS_MPU401"); + if(options & IS_OPL3) + sprintf(str, "%s:%s", str, "IS_OPL3"); if(strlen(str)<1){ sprintf(str, "[]"); }else{ diff -ur detect/src/detect.h detect-new/src/detect.h --- detect/src/detect.h Wed Aug 30 18:15:03 2000 +++ detect-new/src/detect.h Sun Sep 10 22:34:31 2000 @@ -64,6 +64,9 @@ #define IS_SERIAL (1<<14) /* indicate SERIAL device */ +#define IS_MPU401 (1<<15) /*if sound device is mpu401 in fact*/ +#define IS_OPL3 (1<<16) /* ' is opl3 ' */ + /* Modprobe version to be used */ #define DETECT_MODPROBE_MAJOR 2 #define DETECT_MODPROBE_MINOR 3