diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2006-09-29 09:28:22 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2006-09-29 09:28:22 +0000 |
| commit | a861847014f7cc1d6685af71ede52677e6367d65 (patch) | |
| tree | 8765cea1a84a30fcef8a22442281089d872f6833 /sys/dev/sound/midi | |
| parent | f77472e6dc12b2f23d712c959b58ae731997580e (diff) | |
| download | src-a861847014f7cc1d6685af71ede52677e6367d65.tar.gz src-a861847014f7cc1d6685af71ede52677e6367d65.zip | |
SNDCTL_TMR_{START,STOP,CONTINUE} don't take an argument.
Notes
Notes:
svn path=/head/; revision=162776
Diffstat (limited to 'sys/dev/sound/midi')
| -rw-r--r-- | sys/dev/sound/midi/sequencer.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 17abb4ba62f8..245765f4fcb0 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -1133,9 +1133,17 @@ seq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread * break; case SNDCTL_TMR_TEMPO: event[1] = TMR_TEMPO; + event[4] = *(int *)arg & 0xFF; + event[5] = (*(int *)arg >> 8) & 0xFF; + event[6] = (*(int *)arg >> 16) & 0xFF; + event[7] = (*(int *)arg >> 24) & 0xFF; goto timerevent; case SNDCTL_TMR_TIMEBASE: event[1] = TMR_TIMERBASE; + event[4] = *(int *)arg & 0xFF; + event[5] = (*(int *)arg >> 8) & 0xFF; + event[6] = (*(int *)arg >> 16) & 0xFF; + event[7] = (*(int *)arg >> 24) & 0xFF; goto timerevent; case SNDCTL_TMR_START: event[1] = TMR_START; @@ -1147,10 +1155,6 @@ seq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, struct thread * event[1] = TMR_CONTINUE; timerevent: event[0] = EV_TIMING; - event[4] = *(int *)arg & 0xFF; - event[5] = (*(int *)arg >> 8) & 0xFF; - event[6] = (*(int *)arg >> 16) & 0xFF; - event[7] = (*(int *)arg >> 24) & 0xFF; mtx_lock(&scp->seq_lock); if (!scp->music) { ret = EINVAL; |