*** audio.c	Fri May 25 11:46:32 2001
--- audio.c.v	Fri May 25 11:47:39 2001
***************
*** 195,199 ****
  #define SND_DEV_DSP16   5 
  
! #define dprintk(x)	printk x
  
  /* --------------------------------------------------------------------- */
--- 195,199 ----
  #define SND_DEV_DSP16   5 
  
! #define dprintk(x)
  
  /* --------------------------------------------------------------------- */
***************
*** 477,481 ****
  	db->bufsize = nr << PAGE_SHIFT;
  	db->ready = 1;
! 	dprintk((KERN_DEBUG "usbaudio: dmabuf_init: bytepersec %d bufs %d ossfragshift %d ossmaxfrags %d "
  	         "fragshift %d fragsize %d numfrag %d dmasize %d bufsize %d fmt 0x%x\n",
  	         bytepersec, bufs, db->ossfragshift, db->ossmaxfrags, db->fragshift, db->fragsize,
--- 477,481 ----
  	db->bufsize = nr << PAGE_SHIFT;
  	db->ready = 1;
! 	dprintk((KERN_DEBUG "dmabuf_init: bytepersec %d bufs %d ossfragshift %d ossmaxfrags %d "
  	         "fragshift %d fragsize %d numfrag %d dmasize %d bufsize %d fmt 0x%x\n",
  	         bytepersec, bufs, db->ossfragshift, db->ossmaxfrags, db->fragshift, db->fragsize,
***************
*** 1271,1275 ****
   * return value: 0 if descriptor should be restarted, -1 otherwise
   */
- int abs( int );
  static int usbout_sync_retire_desc(struct usbout *u, purb_t urb)
  {
--- 1271,1274 ----
***************
*** 1565,1569 ****
  		        dev->devnum, u->interface, fmt->altsetting, d->srate, data[0] | (data[1] << 8) | (data[2] << 16)));
  		d->srate = data[0] | (data[1] << 8) | (data[2] << 16);
- 		printk(KERN_ERR "usbaudio: actual sampling frequency %d\n", d->srate);
  	}
  	dprintk((KERN_DEBUG "usbaudio: set_format_in: USB format 0x%x, DMA format 0x%x srate %u\n", u->format, d->format, d->srate));
--- 1564,1567 ----
***************
*** 2896,2904 ****
  				continue;
  			}
- 			//
- 			//	Parse Type I Format Type Descriptor fields:
- 			//		bLength, bDescriptorType, bDescriptorSubtype, bFormatType
- 			//		bNrChannels, bSubFrameSize, bBitResolution, bSameFreqType, tSamFreq
- 			//
  			fmt = find_csinterface_descriptor(buffer, buflen, NULL, AS_GENERAL, asifout, i);
  			if (!fmt) {
--- 2894,2897 ----
***************
*** 2952,2956 ****
  			for (j = fmt[7] ? (fmt[7]-1) : 1; j > 0; j--) {
  				k = fmt[8+3*j] | (fmt[9+3*j] << 8) | (fmt[10+3*j] << 16);
- 				printk(KERN_INFO "usbaudio: valid device sample rate %u\n", k);
  				if (k > fp->sratehi)
  					fp->sratehi = k;
--- 2945,2948 ----
***************
*** 2959,2965 ****
  			}
  			fp->attributes = csep[3];
! 			printk(KERN_INFO "usbaudio: device %u / %u altsetting %u: format 0x%08x sratelo %u sratehi %u bits %u attr 0x%02x\n",
!                                dev->devnum, asifin, i, fp->format, fp->sratelo, fp->sratehi, fmt[6], fp->attributes);
! 
  		}
  	}
--- 2951,2956 ----
  			}
  			fp->attributes = csep[3];
! 			printk(KERN_INFO "usbaudio: device %u interface %u altsetting %u: format 0x%08x sratelo %u sratehi %u attributes 0x%02x\n", 
! 			       dev->devnum, asifout, i, fp->format, fp->sratelo, fp->sratehi, fp->attributes);
  		}
  	}
***************
*** 2973,2977 ****
  		return;
  	}
- 	printk(KERN_INFO "usbaudio: registered dsp %d\n", as->dev_audio);
  	/* everything successful */
  	list_add_tail(&as->list, &s->audiolist);
--- 2964,2967 ----
***************
*** 3320,3325 ****
  }
  
- 
- //	See Audio Class Spec, section 4.3.2.5
  static void usb_audio_featureunit(struct consmixstate *state, unsigned char *ftr)
  {
--- 3310,3313 ----
***************
*** 3469,3473 ****
  		return;
  
! 	case FEATURE_UNIT:			// See 4.3.2.5
  		if (p1[0] < 7 || p1[0] < 7+p1[5]) {
  			printk(KERN_ERR "usbaudio: unit %u: invalid FEATURE_UNIT descriptor\n", unitid);
--- 3457,3461 ----
  		return;
  
! 	case FEATURE_UNIT:
  		if (p1[0] < 7 || p1[0] < 7+p1[5]) {
  			printk(KERN_ERR "usbaudio: unit %u: invalid FEATURE_UNIT descriptor\n", unitid);
***************
*** 3540,3544 ****
  		return;
  	}
- 	printk(KERN_INFO "usbaudio: register mixer %d\n", ms->dev_mixer);
  	list_add_tail(&ms->list, &s->mixerlist);
  }
--- 3528,3531 ----
***************
*** 3725,3733 ****
  	/* we get called with -1 for every audiostreaming interface registered */
  	if (s == (struct usb_audio_state *)-1) {
! 		dprintk((KERN_DEBUG "usbaudio: note, usb_audio_disconnect called with -1\n"));
  		return;
  	}
  	if (!s->usbdev) {
! 		dprintk((KERN_DEBUG "usb_audio_disconnect: error, already called for %p!\n", s));
  		return;
  	}
--- 3712,3720 ----
  	/* we get called with -1 for every audiostreaming interface registered */
  	if (s == (struct usb_audio_state *)-1) {
! 		dprintk((KERN_DEBUG "usb_audio_disconnect: called with -1\n"));
  		return;
  	}
  	if (!s->usbdev) {
! 		dprintk((KERN_DEBUG "usb_audio_disconnect: already called for %p!\n", s));
  		return;
  	}
***************
*** 3743,3758 ****
  		wake_up(&as->usbin.dma.wait);
  		wake_up(&as->usbout.dma.wait);
! 		if (as->dev_audio >= 0) {
  			unregister_sound_dsp(as->dev_audio);
- 			printk(KERN_INFO "usbaudio: unregister dsp %d\n", as->dev_audio);
- 		}
  		as->dev_audio = -1;
  	}
  	for(list = s->mixerlist.next; list != &s->mixerlist; list = list->next) {
  		ms = list_entry(list, struct usb_mixerdev, list);
! 		if (ms->dev_mixer >= 0) {
  			unregister_sound_mixer(ms->dev_mixer);
- 			printk(KERN_INFO "usbaudio: unregister mixer %d\n", ms->dev_mixer);
- 		}
  		ms->dev_mixer = -1;
  	}
--- 3730,3741 ----
  		wake_up(&as->usbin.dma.wait);
  		wake_up(&as->usbout.dma.wait);
! 		if (as->dev_audio >= 0)
  			unregister_sound_dsp(as->dev_audio);
  		as->dev_audio = -1;
  	}
  	for(list = s->mixerlist.next; list != &s->mixerlist; list = list->next) {
  		ms = list_entry(list, struct usb_mixerdev, list);
! 		if (ms->dev_mixer >= 0)
  			unregister_sound_mixer(ms->dev_mixer);
  		ms->dev_mixer = -1;
  	}