projects / packages / detect.git / blame
| Commit | Line | Data |
|---|---|---|
| 47ab3315 KK |
1 | Only in detect-new/src: .deps |
| 2 | diff -ur detect/src/CVS/Entries detect-new/src/CVS/Entries | |
| 3 | --- detect/src/CVS/Entries Thu Aug 31 09:11:11 2000 | |
| 4 | +++ detect-new/src/CVS/Entries Mon Sep 11 12:13:32 2000 | |
| 5 | @@ -4,13 +4,10 @@ | |
| 6 | /bus.c/1.5/Mon Jul 24 22:27:20 2000// | |
| 7 | /calls.c/1.5/Fri Aug 11 10:43:05 2000// | |
| 8 | /cdrom.c/1.21/Mon Aug 14 10:12:00 2000// | |
| 9 | -/conv.c/1.36/Wed Aug 16 13:39:55 2000// | |
| 10 | /cpu.c/1.29/Fri Aug 11 14:02:46 2000// | |
| 11 | /detect.c/1.14/Mon Jun 19 12:51:03 2000// | |
| 12 | -/detect.h/1.114/Wed Aug 30 16:15:03 2000// | |
| 13 | /disk.c/1.27/Wed Aug 30 16:15:03 2000// | |
| 14 | /ethernet.c/1.34/Wed Aug 16 13:56:50 2000// | |
| 15 | -/floppy.c/1.29/Fri Aug 11 10:43:05 2000// | |
| 16 | /ide.c/1.27/Wed Aug 30 16:15:03 2000// | |
| 17 | /isa.c/1.61/Wed Aug 30 13:50:04 2000// | |
| 18 | /isdn.c/1.3/Wed Aug 16 13:56:50 2000// | |
| 19 | @@ -39,8 +36,11 @@ | |
| 20 | /usb.h/1.1/Mon Jul 24 10:56:56 2000// | |
| 21 | /utils.c/1.32/Fri Jul 14 14:56:37 2000// | |
| 22 | /utils.h/1.19/Thu Aug 10 15:24:38 2000// | |
| 23 | -/video.c/1.26/Wed Aug 16 13:56:50 2000// | |
| 24 | /webcam.c/1.3/Wed Aug 16 13:56:50 2000// | |
| 25 | D/SuperProbe//// | |
| 26 | D/lst//// | |
| 27 | D/pcmcia//// | |
| 28 | +/conv.c/1.37/Sun Sep 10 20:34:31 2000// | |
| 29 | +/detect.h/1.115/Sun Sep 10 20:34:31 2000// | |
| 30 | +/floppy.c/1.30/Sun Sep 10 20:34:31 2000// | |
| 31 | +/video.c/1.26/Mon Sep 11 10:13:31 2000// | |
| 32 | diff -ur detect/src/CVS/Root detect-new/src/CVS/Root | |
| 33 | --- detect/src/CVS/Root Thu Aug 31 09:09:37 2000 | |
| 34 | +++ detect-new/src/CVS/Root Mon Sep 4 11:56:49 2000 | |
| 35 | @@ -1 +1 @@ | |
| 36 | -:pserver:anoncvs@mandrakesoft.com:/home/cvs/harddrake | |
| 37 | +:pserver:adussart@mandrakesoft.com:/home/cvs/harddrake | |
| 38 | Only in detect-new/src: Makefile | |
| 39 | Only in detect-new/src: Makefile.in | |
| 40 | diff -ur detect/src/conv.c detect-new/src/conv.c | |
| 41 | --- detect/src/conv.c Wed Aug 16 15:39:55 2000 | |
| 42 | +++ detect-new/src/conv.c Tue Sep 12 11:45:04 2000 | |
| 43 | @@ -270,6 +270,8 @@ | |
| 44 | if(strstr(str, "HAS_DREAM")) options += HAS_DREAM; | |
| 45 | if(strstr(str, "HAS_MAD16")) options += HAS_MAD16; | |
| 46 | if(strstr(str, "IS_SERIAL")) options += IS_SERIAL; | |
| 47 | + if(strstr(str, "IS_MPU401")) options += IS_MPU401; | |
| 48 | + if(strstr(str, "IS_OPL3")) options += IS_OPL3; | |
| 49 | if(strstr(str, s_unknown)) options = 0; | |
| 50 | return options; | |
| 51 | }/*endfunc str2options*/ | |
| 52 | @@ -306,6 +308,10 @@ | |
| 53 | sprintf(str, "%s:%s", str, "HAS_MAD16"); | |
| 54 | if(options & IS_SERIAL) | |
| 55 | sprintf(str, "%s:%s", str, "IS_SERIAL"); | |
| 56 | + if(options & IS_MPU401) | |
| 57 | + sprintf(str, "%s:%s", str, "IS_MPU401"); | |
| 58 | + if(options & IS_OPL3) | |
| 59 | + sprintf(str, "%s:%s", str, "IS_OPL3"); | |
| 60 | if(strlen(str)<1){ | |
| 61 | sprintf(str, "[]"); | |
| 62 | }else{ | |
| 63 | diff -ur detect/src/detect.h detect-new/src/detect.h | |
| 64 | --- detect/src/detect.h Wed Aug 30 18:15:03 2000 | |
| 65 | +++ detect-new/src/detect.h Sun Sep 10 22:34:31 2000 | |
| 66 | @@ -64,6 +64,9 @@ | |
| 67 | ||
| 68 | #define IS_SERIAL (1<<14) /* indicate SERIAL device */ | |
| 69 | ||
| 70 | +#define IS_MPU401 (1<<15) /*if sound device is mpu401 in fact*/ | |
| 71 | +#define IS_OPL3 (1<<16) /* ' is opl3 ' */ | |
| 72 | + | |
| 73 | /* Modprobe version to be used */ | |
| 74 | #define DETECT_MODPROBE_MAJOR 2 | |
| 75 | #define DETECT_MODPROBE_MINOR 3 |