--- vanilla-2.5.32/sound/oss/dev_table.h Sat Apr 20 18:25:19 2002
+++ linux-2.5-cli-oss/sound/oss/dev_table.h Fri Aug 16 12:41:32 2002
@@ -15,6 +15,7 @@
#ifndef _DEV_TABLE_H_
#define _DEV_TABLE_H_
+#include <linux/spinlock.h>
/*
* Sound card numbers 27 to 999. (1 to 26 are defined in soundcard.h)
* Numbers 1000 to N are reserved for driver's internal use.
@@ -107,9 +108,11 @@
/*
* Queue parameters.
*/
- int qlen;
- int qhead;
- int qtail;
+ int qlen;
+ int qhead;
+ int qtail;
+ spinlock_t lock;
+
int cfrag; /* Current incomplete fragment (write) */
int nbufs;
@@ -205,7 +208,7 @@
int format_mask; /* Bitmask for supported audio formats */
void *devc; /* Driver specific info */
struct audio_driver *d;
- void *portc; /* Driver spesific info */
+ void *portc; /* Driver specific info */
struct dma_buffparms *dmap_in, *dmap_out;
struct coproc_operations *coproc;
int mixer_dev;
@@ -292,7 +295,7 @@
{
/* MIDI input scanner variables */
#define MI_MAX 10
- int m_busy;
+ volatile int m_busy;
unsigned char m_buf[MI_MAX];
unsigned char m_prev_status; /* For running status */
int m_ptr;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Aug 31 2002 - 22:00:28 EST