patch-2.3.26 linux/drivers/usb/audio.c

• Lines: 55
• Date: Fri Nov 5 10:42:15 1999
• Orig file: v2.3.25/linux/drivers/usb/audio.c
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/usb/audio.c linux/drivers/usb/audio.c
@@ -48,6 +48,10 @@
  *              decent headphones!
  *              "Let's make things better" -> but please Philips start with your
  *              own stuff!!!!
+ * 1999-11-02:  It takes the Philips boxes several seconds to acquire synchronisation
+ *              that means they won't play short sounds. Should probably maintain
+ *              the ISO datastream even if there's nothing to play.
+ *              Fix counting the total_bytes counter, RealPlayer G2 depends on it.
  *
  *
  */
@@ -455,6 +459,7 @@
 {
 	unsigned int pgrem, rem;
 
+	db->total_bytes += size;
 	for (;;) {
 		if (size <= 0)
 			return;
@@ -477,6 +482,7 @@
 {
 	unsigned int pgrem, rem;
 
+	db->total_bytes += size;
 	for (;;) {
 		if (size <= 0)
 			return;
@@ -3285,7 +3291,9 @@
 			prepmixch(state);
 		}
 	}
+#if 0
 	/* if there are mute controls, unmute them */
+	/* does not seem to be necessary, and the Dallas chip does not seem to support the "all" channel (255) */
 	if ((chftr & 1) || (mchftr & 1)) {
 		printk(KERN_DEBUG "usbaudio: unmuting feature unit %u interface %u\n", ftr[3], state->ctrlif);
 		data[0] = 0;
@@ -3293,6 +3301,7 @@
                                     (MUTE_CONTROL << 8) | 0xff, state->ctrlif | (ftr[3] << 8), data, 1, HZ) < 0)
 			printk(KERN_WARNING "usbaudio: failure to unmute feature unit %u interface %u\n", ftr[3], state->ctrlif);
  	}
+#endif
 }
 
 static void usb_audio_recurseunit(struct consmixstate *state, unsigned char unitid)
@@ -3612,8 +3621,7 @@
 
 int usb_audio_init(void)
 {
-	usb_register(&usb_audio_driver);
-	return 0;
+	return usb_register(&usb_audio_driver);
 }
 
 #ifdef MODULE