diff options
Diffstat (limited to 'sys/dev/sequencer.c')
| -rw-r--r-- | sys/dev/sequencer.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 24e484efdb3..5714d8d4cf2 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sequencer.c,v 1.4 2000/06/26 22:43:44 art Exp $ */ +/* $OpenBSD: sequencer.c,v 1.5 2001/05/01 02:31:30 mickey Exp $ */ /* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -123,7 +123,7 @@ int seq_do_chncommon __P((struct sequencer_softc *, seq_event_rec *)); int seq_do_timing __P((struct sequencer_softc *, seq_event_rec *)); int seq_do_local __P((struct sequencer_softc *, seq_event_rec *)); int seq_do_sysex __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_fullsize __P((struct sequencer_softc *, seq_event_rec *, +int seq_do_fullsize __P((struct sequencer_softc *, seq_event_rec *, struct uio *)); int seq_timer __P((struct sequencer_softc *, int, int, seq_event_rec *)); static int seq_input_event __P((struct sequencer_softc *, seq_event_rec *)); @@ -147,7 +147,7 @@ int midiseq_pgmchange __P((struct midi_dev *, int, int)); int midiseq_chnpressure __P((struct midi_dev *, int, int)); int midiseq_ctlchange __P((struct midi_dev *, int, int, int)); int midiseq_pitchbend __P((struct midi_dev *, int, int)); -int midiseq_loadpatch __P((struct midi_dev *, struct sysex_info *, +int midiseq_loadpatch __P((struct midi_dev *, struct sysex_info *, struct uio *)); int midiseq_putc __P((struct midi_dev *, int)); void midiseq_in __P((struct midi_dev *, u_char *, int)); @@ -288,7 +288,7 @@ seq_timeout(addr) if (sc->async) psignal(sc->async, SIGIO); } - + } void @@ -340,7 +340,7 @@ seq_input_event(sc, cmd) { struct sequencer_queue *q = &sc->inq; - DPRINTFN(2, ("seq_input_event: %02x %02x %02x %02x %02x %02x %02x %02x\n", + DPRINTFN(2, ("seq_input_event: %02x %02x %02x %02x %02x %02x %02x %02x\n", cmd->arr[0], cmd->arr[1], cmd->arr[2], cmd->arr[3], cmd->arr[4], cmd->arr[5], cmd->arr[6], cmd->arr[7])); if (SEQ_QFULL(q)) @@ -398,7 +398,7 @@ sequencerread(dev, uio, ioflag) seq_event_rec ev; int error, s; - DPRINTFN(20, ("sequencerread: %p, count=%d, ioflag=%x\n", + DPRINTFN(20, ("sequencerread: %p, count=%d, ioflag=%x\n", sc, uio->uio_resid, ioflag)); if (sc->mode == SEQ_OLD) { @@ -548,7 +548,7 @@ sequencerioctl(dev, cmd, addr, flag, p) break; case SEQUENCER_OUTOFBAND: - DPRINTFN(3, ("sequencer_ioctl: OOB=%02x %02x %02x %02x %02x %02x %02x %02x\n", + DPRINTFN(3, ("sequencer_ioctl: OOB=%02x %02x %02x %02x %02x %02x %02x %02x\n", *(u_char *)addr, *(u_char *)(addr+1), *(u_char *)(addr+2), *(u_char *)(addr+3), *(u_char *)(addr+4), *(u_char *)(addr+5), @@ -703,7 +703,7 @@ seq_do_command(sc, b) return (ENXIO); return (midiseq_putc(sc->devs[dev], b->arr[1])); default: - DPRINTFN(-1,("seq_do_command: unimpl command %02x\n", + DPRINTFN(-1,("seq_do_command: unimpl command %02x\n", SEQ_CMD(b))); return (EINVAL); } @@ -726,7 +726,7 @@ seq_do_chnvoice(sc, b) chan = SEQ_ECHAN(b); note = SEQ_ENOTE(b); parm = SEQ_EPARM(b); - DPRINTFN(2,("seq_do_chnvoice: cmd=%02x dev=%d chan=%d note=%d parm=%d\n", + DPRINTFN(2,("seq_do_chnvoice: cmd=%02x dev=%d chan=%d note=%d parm=%d\n", cmd, dev, chan, note, parm)); voice = chan; if (cmd == MIDI_NOTEON && parm == 0) { @@ -735,7 +735,7 @@ seq_do_chnvoice(sc, b) } switch(cmd) { case MIDI_NOTEON: - DPRINTFN(5, ("seq_do_chnvoice: noteon %p %d %d %d\n", + DPRINTFN(5, ("seq_do_chnvoice: noteon %p %d %d %d\n", md, voice, note, parm)); error = midiseq_noteon(md, voice, note, parm); break; @@ -981,7 +981,7 @@ seq_to_new(ev, uio) if (cmd >= 0x80) { /* Fill the event record */ if (uio->uio_resid >= sizeof *ev - SEQOLD_CMDSIZE) { - error = uiomove(&ev->arr[SEQOLD_CMDSIZE], + error = uiomove(&ev->arr[SEQOLD_CMDSIZE], sizeof *ev - SEQOLD_CMDSIZE, uio); if (error) return (error); @@ -1050,7 +1050,7 @@ midiseq_in(md, msg, len) seq_event_rec ev; int status, chan; - DPRINTFN(2, ("midiseq_in: %p %02x %02x %02x\n", + DPRINTFN(2, ("midiseq_in: %p %02x %02x %02x\n", md, msg[0], msg[1], msg[2])); status = MIDI_GET_STATUS(msg[0]); @@ -1074,7 +1074,7 @@ midiseq_in(md, msg, len) SEQ_MK_CHN_COMMON(&ev, unit, status, chan, msg[1], 0, 0); break; case MIDI_PITCH_BEND: - SEQ_MK_CHN_COMMON(&ev, unit, status, chan, 0, 0, + SEQ_MK_CHN_COMMON(&ev, unit, status, chan, 0, 0, (msg[1] & 0x7f) | ((msg[2] & 0x7f) << 7)); break; default: @@ -1157,7 +1157,7 @@ midiseq_noteon(md, chan, note, vel) { u_char buf[3]; - DPRINTFN(6, ("midiseq_noteon 0x%02x %d %d\n", + DPRINTFN(6, ("midiseq_noteon 0x%02x %d %d\n", MIDI_NOTEON | chan, note, vel)); if (chan < 0 || chan > 15 || note < 0 || note > 127) @@ -1313,8 +1313,8 @@ midiseq_loadpatch(md, sysex, uio) if (i != cc) break; } - /* Any leftover data in uio is rubbish; - * the SYSEX should be one write ending in SYSEX_END. + /* Any leftover data in uio is rubbish; + * the SYSEX should be one write ending in SYSEX_END. */ uio->uio_resid = 0; c = MIDI_SYSEX_END; |