summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-09-13 06:29:30 +0000
committerbde <bde@FreeBSD.org>1996-09-13 06:29:30 +0000
commit8469336aaffb5f60a2e80f6d45ebda96c8c5af07 (patch)
tree97c117fcb628e2f4e9042649c5cb4e71d0ab9d95
parent71f29bc747157201fd48f4f306ec110cb69baa0b (diff)
downloadFreeBSD-src-8469336aaffb5f60a2e80f6d45ebda96c8c5af07.zip
FreeBSD-src-8469336aaffb5f60a2e80f6d45ebda96c8c5af07.tar.gz
Don't compile a 256-byte unused table in the pca driver.
The other 256-byte table in ulaw.h still gets duplicated if both pca and snd are configured.
-rw-r--r--sys/i386/isa/pcaudio.c3
-rw-r--r--sys/i386/isa/sound/ulaw.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index 0b41159..4773b1d 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pcaudio.c,v 1.29 1996/07/17 20:18:56 joerg Exp $
+ * $Id: pcaudio.c,v 1.30 1996/09/06 23:07:54 phk Exp $
*/
#include "pca.h"
@@ -47,6 +47,7 @@
#include <i386/isa/isa_device.h>
#include <i386/isa/timerreg.h>
+#define DSP_ULAW_NOT_WANTED
#include <i386/isa/sound/ulaw.h>
#ifdef DEVFS
diff --git a/sys/i386/isa/sound/ulaw.h b/sys/i386/isa/sound/ulaw.h
index be9f92d..4a071dd 100644
--- a/sys/i386/isa/sound/ulaw.h
+++ b/sys/i386/isa/sound/ulaw.h
@@ -33,6 +33,7 @@ static unsigned char ulaw_dsp[] = {
129, 129, 129, 129, 128, 128, 128, 128,
};
+#ifndef DSP_ULAW_NOT_WANTED
static unsigned char dsp_ulaw[] = {
31, 31, 31, 32, 32, 32, 32, 33,
33, 33, 33, 34, 34, 34, 34, 35,
@@ -67,3 +68,4 @@ static unsigned char dsp_ulaw[] = {
163, 163, 162, 162, 162, 162, 161, 161,
161, 161, 160, 160, 160, 160, 159, 159,
};
+#endif /* !DSP_ULAW_NOT_WANTED */
OpenPOWER on IntegriCloud