patch-2.3.16 linux/drivers/sbus/audio/dbri.c

• Lines: 39
• Date: Tue Aug 31 11:25:33 1999
• Orig file: v2.3.15/linux/drivers/sbus/audio/dbri.c
• Orig date: Thu Jun 17 01:08:50 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/sbus/audio/dbri.c linux/drivers/sbus/audio/dbri.c
@@ -1907,19 +1907,11 @@
 {
 	MOD_INC_USE_COUNT;
 
-	/* SunOS 5.5.1 audio(7I) man page says:
-	 * "Upon the initial open() of the audio device, the driver
-	 *  will reset the data format of the device to the default
-	 *  state of 8-bit, 8KHz, mono u-law data."
-	 *
-	 * I've also taken the liberty of setting half gain and
+        /*
+	 * I've taken the liberty of setting half gain and
 	 * mid balance, to put the codec in a known state.
 	 */
 
-	dbri_set_output_channels(drv, 1);
-	dbri_set_output_encoding(drv, AUDIO_ENCODING_ULAW);
-	dbri_set_output_rate(drv, 8000);
-
 	dbri_set_output_balance(drv, AUDIO_MID_BALANCE);
 	dbri_set_output_volume(drv, AUDIO_MAX_GAIN/2);
 
@@ -2162,7 +2154,6 @@
                int hdlcmode, u_char xmit_idle_char)
 {
        struct dbri *dbri;
-       int val;
 
        if (dev >= num_drivers || chan > 1) {
                return -1;
@@ -2356,7 +2347,7 @@
 #ifdef MODULE
 int init_module(void)
 #else
-__initfunc(int dbri_init(void))
+int __init dbri_init(void)
 #endif
 {
 	struct linux_sbus *bus;