diff options
| author | kib <kib@FreeBSD.org> | 2009-06-25 18:46:30 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2009-06-25 18:46:30 +0000 |
| commit | a7a5954511a4b948ae8218744bc2069641a3ab19 (patch) | |
| tree | 78b4ad05c311866c8b27041ac4ed99ffd980653d /sys/dev/sound | |
| parent | eb2a6cf16eda6c60423ca640ec4c2a4e7a04373e (diff) | |
| download | FreeBSD-src-a7a5954511a4b948ae8218744bc2069641a3ab19.zip FreeBSD-src-a7a5954511a4b948ae8218744bc2069641a3ab19.tar.gz | |
Change the type of uio_resid member of struct uio from int to ssize_t.
Note that this does not actually enable full-range i/o requests for
64 architectures, and is done now to update KBI only.
Tested by: pho
Reviewed by: jhb, bde (as part of the review of the bigger patch)
Diffstat (limited to 'sys/dev/sound')
| -rw-r--r-- | sys/dev/sound/midi/midi.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/midi/sequencer.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 4b33808..53cc5fd 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -852,7 +852,7 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); used = MIN(used, MIDI_WSIZE); - MIDI_DEBUG(5, printf("midiout: resid %d len %jd avail %jd\n", + MIDI_DEBUG(5, printf("midiout: resid %zd len %jd avail %jd\n", uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), (intmax_t)MIDIQ_AVAIL(m->outq))); diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 5bb030d..1ef7845 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -878,7 +878,7 @@ seq_read(struct cdev *i_dev, struct uio *uio, int ioflag) if (scp == NULL) return ENXIO; - SEQ_DEBUG(7, printf("seq_read: unit %d, resid %d.\n", + SEQ_DEBUG(7, printf("seq_read: unit %d, resid %zd.\n", scp->unit, uio->uio_resid)); mtx_lock(&scp->seq_lock); @@ -936,7 +936,7 @@ seq_read(struct cdev *i_dev, struct uio *uio, int ioflag) retval = 0; err1: mtx_unlock(&scp->seq_lock); - SEQ_DEBUG(6, printf("seq_read: ret %d, resid %d.\n", + SEQ_DEBUG(6, printf("seq_read: ret %d, resid %zd.\n", retval, uio->uio_resid)); return retval; @@ -950,7 +950,7 @@ seq_write(struct cdev *i_dev, struct uio *uio, int ioflag) int retval; int used; - SEQ_DEBUG(7, printf("seq_write: unit %d, resid %d.\n", + SEQ_DEBUG(7, printf("seq_write: unit %d, resid %zd.\n", scp->unit, uio->uio_resid)); if (scp == NULL) @@ -995,7 +995,7 @@ seq_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(uio->uio_resid, 4); - SEQ_DEBUG(8, printf("seqout: resid %d len %jd avail %jd\n", + SEQ_DEBUG(8, printf("seqout: resid %zd len %jd avail %jd\n", uio->uio_resid, (intmax_t)MIDIQ_LEN(scp->out_q), (intmax_t)MIDIQ_AVAIL(scp->out_q))); @@ -1115,7 +1115,7 @@ seq_write(struct cdev *i_dev, struct uio *uio, int ioflag) err0: SEQ_DEBUG(6, - printf("seq_write done: leftover buffer length %d retval %d\n", + printf("seq_write done: leftover buffer length %zd retval %d\n", uio->uio_resid, retval)); mtx_unlock(&scp->seq_lock); return retval; |
