Patch for ymfpci and xmms
Courtesy of Manish Singh, little bit extended
(I hope I did not break it too badly).
Supposedly it fixes bad skipping with xmms.
-- Pete
drivers/sound/ymfpci.c +10 -23
@@ -370,16 +370,14 @@/* * Create fake fragment sizes and numbers for OSS ioctls. +* Import what Doom might have set with SNDCTL_DSP_SETFRAGMENT. */ bufsize =PAGE_SIZE << dmabuf->buforder; -if (dmabuf->ossfragshift) { -if ((1000 << dmabuf->ossfragshift) < bytepersec) - dmabuf->fragshift =ld2 (bytepersec/1000 ); -else - dmabuf->fragshift = dmabuf->ossfragshift; - }else { -/* lets hand out reasonable big ass buffers by default */ - dmabuf->fragshift = (dmabuf->buforder +PAGE_SHIFT -2 ); +/* lets hand out reasonable big ass buffers by default */ + dmabuf->fragshift = (dmabuf->buforder +PAGE_SHIFT -2 ); +if (dmabuf->ossfragshift >3 && + dmabuf->ossfragshift < dmabuf->fragshift) { + dmabuf->fragshift = dmabuf->ossfragshift; } dmabuf->numfrag = bufsize >> dmabuf->fragshift;while (dmabuf->numfrag <4 && dmabuf->fragshift >3 ) {
@@ -389,9 +387,6 @@ dmabuf->fragsize =1 << dmabuf->fragshift; dmabuf->dmasize = dmabuf->numfrag << dmabuf->fragshift; -/* -* Import what Doom might have set with SNDCTL_DSD_SETFRAGMENT. -*/ if (dmabuf->ossmaxfrags >=2 && dmabuf->ossmaxfrags < dmabuf->numfrag) { dmabuf->numfrag = dmabuf->ossmaxfrags; dmabuf->dmasize = dmabuf->numfrag << dmabuf->fragshift;
@@ -1718,21 +1713,13 @@case SNDCTL_DSP_SETFRAGMENT :if (get_user (val, (int *)arg))return -EFAULT ; -/* P3: these frags are for Doom. Amasingly, it sets [2,2**11]. */ -/* P3 */ // printk("ymfpci: ioctl SNDCTL_DSP_SETFRAGMENT 0x%x\n", val); - dmabuf = &state->wpcm.dmabuf; dmabuf->ossfragshift = val &0xffff ; dmabuf->ossmaxfrags = (val >>16 ) &0xffff ; -switch (dmabuf->ossmaxfrags) { -case 1 : - dmabuf->ossfragshift =12 ; -return 0 ; -default : -/* Fragments must be 2K long */ - dmabuf->ossfragshift =11 ; - dmabuf->ossmaxfrags =2 ; - } +if (dmabuf->ossfragshift <4 ) + dmabuf->ossfragshift =4 ; +if (dmabuf->ossfragshift >15 ) + dmabuf->ossfragshift =15 ;return 0 ;case SNDCTL_DSP_GETOSPACE :
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/