Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv24336/lib
Modified Files:
esddsp.c
Log Message:
this creates bus errors for now
Index: esddsp.c
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/esddsp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- esddsp.c 6 Nov 2002 20:14:42 -0000 1.10
+++ esddsp.c 6 Nov 2002 20:44:45 -0000 1.11
@@ -186,29 +186,20 @@
static int
dspctl (int fd, request_t request, void *argp)
{
- static esd_format_t fmt = ESD_BITS16 | ESD_MONO | ESD_STREAM | ESD_PLAY;
+ static esd_format_t fmt = ESD_BITS16 | ESD_STEREO | ESD_STREAM | ESD_PLAY;
static int speed;
int *arg = (int *) argp;
- int retval = 0;
switch (request)
{
case SNDCTL_DSP_RESET:
- retval = liboss_ioctl(fd, AUDIO_FLUSH, 0);
- if (retval < 0)
- return retval;
- break;
-
- case SNDCTL_DSP_SYNC:
- retval = liboss_ioctl(fd, AUDIO_DRAIN, 0);
- if (retval < 0)
- return retval;
+ case SNDCTL_DSP_POST:
break;
- case SNDCTL_DSP_POST:
- /* This call is merely advisory, and may be a nop. */
- /* Execpt that it is relevant for fragment implementations */
+ case SNDCTL_DSP_SETFMT:
+ fmt |= (*arg & 0x30) ? ESD_BITS16 : ESD_BITS8;
+ settings |= 1;
break;
case SNDCTL_DSP_SPEED:
@@ -225,11 +216,6 @@
*arg = ESD_BUF_SIZE;
break;
- case SNDCTL_DSP_SETFMT:
- fmt |= (*arg & 0x30) ? ESD_BITS16 : ESD_BITS8;
- settings |= 1;
- break;
-
case SNDCTL_DSP_GETFMTS:
*arg = 0x38;
break;
@@ -266,7 +252,7 @@
if (write(sndfd, ident, ESD_NAME_MAX) != ESD_NAME_MAX)
return -1;
- fmt = ESD_BITS16 | ESD_MONO | ESD_STREAM | ESD_PLAY;
+ fmt = ESD_BITS16 | ESD_STEREO | ESD_STREAM | ESD_PLAY;
speed = 0;
if (use_mixer)
|
