diff options
| author | kato <kato@FreeBSD.org> | 1999-04-08 08:09:34 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-04-08 08:09:34 +0000 |
| commit | c6830aafcd8f3c5d987f307101c1011c7f735f7d (patch) | |
| tree | f167e90f130087d01067f5161ec9eef1f043b203 /sys/i386 | |
| parent | 51fc707de4415bb309d5ba047239d09c4bc641b3 (diff) | |
| download | FreeBSD-src-c6830aafcd8f3c5d987f307101c1011c7f735f7d.zip FreeBSD-src-c6830aafcd8f3c5d987f307101c1011c7f735f7d.tar.gz | |
o sys/i386/include/soundcard.h
Reduce synth_info.name lenght for binary compatibility.
o sys/i386/isa/sound/mpu401.c
Reduce mpu device number info to avoid overflow of mpu_synth_info.name.
Submitted by: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/soundcard.h | 2 | ||||
| -rw-r--r-- | sys/i386/isa/sound/mpu401.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h index a9fbe6a..fe9124e 100644 --- a/sys/i386/include/soundcard.h +++ b/sys/i386/include/soundcard.h @@ -649,7 +649,7 @@ struct sbi_instrument { }; struct synth_info { /* Read only */ - char name[33]; + char name[30]; int device; /* 0-N. INITIALIZE BEFORE CALLING */ int synth_type; #define SYNTH_TYPE_FM 0 diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c index 14c920c..2858ef3 100644 --- a/sys/i386/isa/sound/mpu401.c +++ b/sys/i386/isa/sound/mpu401.c @@ -1032,11 +1032,10 @@ attach_mpu401(struct address_info * hw_config) snprintf(mpu_synth_info[num_midis].name, sizeof(mpu_synth_info[num_midis].name), - "MPU-401 %d.%d%c Midi interface #%d", + "MPU-401 %d.%d%c Midi interface", (int) (devc->version & 0xf0) >> 4, devc->version & 0x0f, - revision_char, - n_mpu_devs); + revision_char); } strcpy(mpu401_midi_operations[num_midis].info.name, |
