patch-1.3.63 linux/drivers/sound/cs4232.c
Next file: linux/drivers/sound/dev_table.c
Previous file: linux/drivers/sound/configure.c
Back to the patch index
Back to the overall index
- Lines: 55
- Date:
Sat Feb 10 22:04:38 1996
- Orig file:
v1.3.62/linux/drivers/sound/cs4232.c
- Orig date:
Tue Jan 23 21:15:45 1996
diff -u --recursive --new-file v1.3.62/linux/drivers/sound/cs4232.c linux/drivers/sound/cs4232.c
@@ -7,8 +7,9 @@
* interfaces. This is just a temporary driver until full PnP support
* gets inplemented. Just the WSS codec, FM synth and the MIDI ports are
* supported. Other interfaces are left uninitialized.
- *
- * Copyright by Hannu Savolainen 1995
+ */
+/*
+ * Copyright by Hannu Savolainen 1993-1996
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -29,8 +30,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
*/
+#include <linux/config.h>
+
#include "sound_config.h"
@@ -39,7 +41,13 @@
#define KEY_PORT 0x279 /* Same as LPT1 status port */
#define CSN_NUM 0x99 /* Just a random number */
-#define CS_OUT(a) outb( a, KEY_PORT)
+static int *osp;
+
+static void
+CS_OUT (unsigned char a)
+{
+ outb (a, KEY_PORT);
+}
#define CS_OUT2(a, b) {CS_OUT(a);CS_OUT(b);}
#define CS_OUT3(a, b, c) {CS_OUT(a);CS_OUT(b);CS_OUT(c);}
@@ -55,6 +63,7 @@
mpu_base = hw_config->io_base;
mpu_irq = hw_config->irq;
+
return 0;
}
@@ -78,6 +87,8 @@
int i;
int base = hw_config->io_base, irq = hw_config->irq;
int dma1 = hw_config->dma, dma2 = hw_config->dma2;
+
+ osp = hw_config->osp;
/*
* Verify that the I/O port range is free.
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this