Date: Sun, 23 Nov 1997 21:22:01 +0200 From: Mark Murray <mark@grondar.za> To: Amancio Hasty <hasty@rah.star-gate.com> Cc: Mark Murray <mark@grondar.za>, John-Mark Gurney <jmg@FreeBSD.ORG>, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG Subject: Re: cvs commit: src/sys/i386/isa/snd ad1848.c clones.c dmabuf.c sb_dsp.c sbcard.h sound.c sound.h soundcard.h Message-ID: <199711231922.VAA13656@greenpeace.grondar.za>
next in thread | raw e-mail | index | archive | help
Report back: In theory: Luigi's sound driver and Amancio's sound driver have the same soundcard.h. In practice, each developer worked independantly on this file. We are now in the untenable situation where the different soundcard.h's are very different. When I committed Amancio's driver to the tree, I put his driver in The Right Place (tm). Luigi's driver, however has been put in the same place as the rest of his code, which is The Wrong Place (tm). We now need to either 1) break these two files _way_ apart and rename them to different names, or 2) merge them properly. IMHO, #2 should be done. Please could you sound developers merge your changes and requirements into The Right Place (tm) being sys/i386/includes/soundcard.h, and remove sys/i386/isa/snd/soundcard.h? This will have the added benefit of not requiring evil symlinks to make Luigi's code work. Thanks! M Amancio Hasty wrote: > Fine, has he or anyone tested it with the voxware driver? > > Tnks, > Amancio > > > Amancio Hasty wrote: > > > Sure if their soundcard.h has been tested with the voxware sound driver. > > > > According to Luigi, this is the case. Luigi's solution is just to make > > sys/i386/include/soundcard.h a symlink. I pointed out that this was > > evil, and that proper merging was better. Luigi reckoned that was OK, > > as his code is compatible with the Voxware model. > > > > M > > > > > > > > John-Mark Gurney wrote: > > > > > jmg 1997/11/22 23:03:23 PST > > > > > > > > > > Modified files: > > > > > sys/i386/isa/snd ad1848.c clones.c dmabuf.c sb_dsp.c > > > > > sbcard.h sound.c sound.h soundcard.h > > > > ^^^^^^^^^^^ > > > > Any differences to this file from sys/i386/include/soundcard.h should > > > > be merged into there as well. > > > > > > > > M > > > > -- > > > > Mark Murray > > > > Join the anti-SPAM movement: http://www.cauce.org > > > > > > > > > > > > > > > > -- > > Mark Murray > > Join the anti-SPAM movement: http://www.cauce.org > > > > > > -- Mark Murray Join the anti-SPAM movement: http://www.cauce.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199711231922.VAA13656>