Commit 386c8a8e authored by Peter Wächtler's avatar Peter Wächtler Committed by Linus Torvalds

[PATCH] oss/dev_table.h - convert cli to spinlocks

parent 0a4d98b4
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#ifndef _DEV_TABLE_H_ #ifndef _DEV_TABLE_H_
#define _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) * 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. * Numbers 1000 to N are reserved for driver's internal use.
...@@ -107,9 +108,11 @@ struct dma_buffparms ...@@ -107,9 +108,11 @@ struct dma_buffparms
/* /*
* Queue parameters. * Queue parameters.
*/ */
int qlen; int qlen;
int qhead; int qhead;
int qtail; int qtail;
spinlock_t lock;
int cfrag; /* Current incomplete fragment (write) */ int cfrag; /* Current incomplete fragment (write) */
int nbufs; int nbufs;
...@@ -205,7 +208,7 @@ struct audio_operations ...@@ -205,7 +208,7 @@ struct audio_operations
int format_mask; /* Bitmask for supported audio formats */ int format_mask; /* Bitmask for supported audio formats */
void *devc; /* Driver specific info */ void *devc; /* Driver specific info */
struct audio_driver *d; struct audio_driver *d;
void *portc; /* Driver spesific info */ void *portc; /* Driver specific info */
struct dma_buffparms *dmap_in, *dmap_out; struct dma_buffparms *dmap_in, *dmap_out;
struct coproc_operations *coproc; struct coproc_operations *coproc;
int mixer_dev; int mixer_dev;
...@@ -292,7 +295,7 @@ struct midi_input_info ...@@ -292,7 +295,7 @@ struct midi_input_info
{ {
/* MIDI input scanner variables */ /* MIDI input scanner variables */
#define MI_MAX 10 #define MI_MAX 10
int m_busy; volatile int m_busy;
unsigned char m_buf[MI_MAX]; unsigned char m_buf[MI_MAX];
unsigned char m_prev_status; /* For running status */ unsigned char m_prev_status; /* For running status */
int m_ptr; int m_ptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment