ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backout latest

This commit is contained in:
Alexandre Ratchov 2014-02-15 21:56:05 +01:00
parent 3fe3b27ace
commit d02745522d
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsndio/sio.c
View File

@ -302,7 +302,7 @@ sio_read(struct sio_hdl *hdl, void *buf, size_t len)
{ {
unsigned int n; unsigned int n;
char *data = buf; char *data = buf;
size_t todo = len, maxread; size_t todo = len;
if (hdl->eof) { if (hdl->eof) {
DPRINTF("sio_read: eof\n"); DPRINTF("sio_read: eof\n");
@ -320,10 +320,7 @@ sio_read(struct sio_hdl *hdl, void *buf, size_t len)
if (!sio_rdrop(hdl)) if (!sio_rdrop(hdl))
return 0; return 0;
while (todo > 0) { while (todo > 0) {
maxread = hdl->rused; n = hdl->ops->read(hdl, data, todo);
if (maxread > todo)
maxread = todo;
n = hdl->ops->read(hdl, data, maxread);
if (n == 0) { if (n == 0) {
if (hdl->nbio || hdl->eof || todo < len) if (hdl->nbio || hdl->eof || todo < len)
break; break;
@ -343,7 +340,7 @@ sio_write(struct sio_hdl *hdl, const void *buf, size_t len)
{ {
unsigned int n; unsigned int n;
const unsigned char *data = buf; const unsigned char *data = buf;
size_t todo = len, maxwrite, wbufsz; size_t todo = len;
if (hdl->eof) { if (hdl->eof) {
DPRINTF("sio_write: eof\n"); DPRINTF("sio_write: eof\n");
@ -360,12 +357,8 @@ sio_write(struct sio_hdl *hdl, const void *buf, size_t len)
} }
if (!sio_wsil(hdl)) if (!sio_wsil(hdl))
return 0; return 0;
wbufsz = hdl->par.bufsz * hdl->par.pchan * hdl->par.bps;
while (todo > 0) { while (todo > 0) {
maxwrite = wbufsz - hdl->wused; n = hdl->ops->write(hdl, data, todo);
if (maxwrite > todo)
maxwrite = todo;
n = hdl->ops->write(hdl, data, maxwrite);
if (n == 0) { if (n == 0) {
if (hdl->nbio || hdl->eof) if (hdl->nbio || hdl->eof)
break; break;
@ -507,11 +500,6 @@ _sio_onmove_cb(struct sio_hdl *hdl, int delta)
#ifdef DEBUG #ifdef DEBUG
if (_sndio_debug >= 3) if (_sndio_debug >= 3)
_sio_printpos(hdl); _sio_printpos(hdl);
if (hdl->wused < 0) {
DPRINTFN(1, "sndio h/w failure: clock ahead of write ptr\n");
hdl->eof = 1;
return;
}
#endif #endif
if (hdl->move_cb) if (hdl->move_cb)
hdl->move_cb(hdl->move_addr, delta); hdl->move_cb(hdl->move_addr, delta);