From owner-freebsd-current Sat Sep 9 18:50:01 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id SAA09088 for current-outgoing; Sat, 9 Sep 1995 18:50:01 -0700 Received: from Root.COM (implode.Root.COM [198.145.90.17]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id SAA09073 ; Sat, 9 Sep 1995 18:49:59 -0700 Received: from corbin.Root.COM (corbin [198.145.90.34]) by Root.COM (8.6.12/8.6.5) with ESMTP id SAA06034; Sat, 9 Sep 1995 18:48:52 -0700 Received: from localhost (localhost [127.0.0.1]) by corbin.Root.COM (8.6.12/8.6.5) with SMTP id SAA00714; Sat, 9 Sep 1995 18:51:02 -0700 Message-Id: <199509100151.SAA00714@corbin.Root.COM> To: Nate Williams cc: current@freebsd.org, jkh@freebsd.org Subject: Re: GUS Max support in -stable? In-reply-to: Your message of "Sat, 09 Sep 95 19:36:23 MDT." <199509100136.TAA28763@rocky.sri.MT.net> From: David Greenman Reply-To: davidg@Root.COM Date: Sat, 09 Sep 1995 18:51:02 -0700 Sender: current-owner@freebsd.org Precedence: bulk >David Greenman writes: >> Hmmm. I haven't touched the sound code. So unless Jordan messed >> with it, it should be identical to what was in 2.0.5. > >This is strange. This sounds rather naive, but how does config know >which include files to generate? It no longer generates 'gusmax.h', and >I'm not sure how it determines which include files to generate. It's based on the "files" file. Each 'optional' will cause a .h file to be generated. There are two "files" files - /sys/conf/files and /sys/i386/conf/files.i386. >If I comment out the need for gusmax.h in isa/sound/local.h in my >-stable tree everything works great, otherwise it fails. I've looked at >the code in the sound directory, and *it* hasn't changed since 2.0.5, >but whatever file config uses to build the necessary kernel-specific >files has changed. > >The solution is to either remove the need for gusmax.h in sound/local.h >or put back the building of 'gusmax.h' in config. The following might be revealing. :-) JORDAN!!!! -DG (i386/conf/files.i386) ---------------------------- revision 1.105 date: 1995/09/01 20:53:44; author: jkh; state: Exp; lines: +2 -2 Something got spammed in my 2.2 work tree (don't know how :( ) and had a 2.1 tag, thus sending these two changes into the 2.1 branch instead of -current. Argh. I may bring these changes into the 2.1 anyway (they're benign there) so I'm not going to admin them out of 2.1 for the time being. ---------------------------- revision 1.98.4.3 date: 1995/09/01 19:09:49; author: jkh; state: Exp; lines: +2 -2 Jim's attempt to fix the new sound code somewhat. Tested with the pas-16, GUS, and GUS-MAX cards. Sound blaster owners, please test also! Submitted by: Jim Lowe Index: files.i386 =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/files.i386,v retrieving revision 1.98.4.2 retrieving revision 1.98.4.3 diff -c -r1.98.4.2 -r1.98.4.3 *** 1.98.4.2 1995/08/23 05:05:54 --- 1.98.4.3 1995/09/01 19:09:49 *************** *** 1,7 **** # This file tells config what files go into building a kernel, # files marked standard are always included. # ! # $Id: files.i386,v 1.98.4.2 1995/08/23 05:05:54 davidg Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ --- 1,7 ---- # This file tells config what files go into building a kernel, # files marked standard are always included. # ! # $Id: files.i386,v 1.98.4.3 1995/09/01 19:09:49 jkh Exp $ # aic7xxx_asm optional ahc device-driver \ dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \ *************** *** 133,139 **** i386/isa/sound/midi_synth.c optional gus device-driver i386/isa/sound/midibuf.c optional gus device-driver i386/isa/sound/ad1848.c optional gusxvi device-driver ! i386/isa/sound/ad1848.c optional gusmax device-driver i386/isa/sound/ad1848.c optional mss device-driver i386/isa/sound/midi_synth.c optional mss device-driver i386/isa/sound/midibuf.c optional mss device-driver --- 133,139 ---- i386/isa/sound/midi_synth.c optional gus device-driver i386/isa/sound/midibuf.c optional gus device-driver i386/isa/sound/ad1848.c optional gusxvi device-driver ! i386/isa/sound/ad1848.c optional gus device-driver i386/isa/sound/ad1848.c optional mss device-driver i386/isa/sound/midi_synth.c optional mss device-driver i386/isa/sound/midibuf.c optional mss device-driver