git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
sequencer.c
diff --git
a/sound/oss/sequencer.c
b/sound/oss/sequencer.c
index
6986142
..
5c215f7
100644
(file)
--- a/
sound/oss/sequencer.c
+++ b/
sound/oss/sequencer.c
@@
-1,5
+1,5
@@
/*
/*
- * sound/sequencer.c
+ * sound/
oss/
sequencer.c
*
* The sequencer personality manager.
*/
*
* The sequencer personality manager.
*/
@@
-16,7
+16,6
@@
*/
#include <linux/kmod.h>
#include <linux/spinlock.h>
*/
#include <linux/kmod.h>
#include <linux/spinlock.h>
-#define SEQUENCER_C
#include "sound_config.h"
#include "midi_ctrl.h"
#include "sound_config.h"
#include "midi_ctrl.h"
@@
-157,6
+156,7
@@
void seq_copy_to_input(unsigned char *event_rec, int len)
wake_up(&midi_sleeper);
spin_unlock_irqrestore(&lock,flags);
}
wake_up(&midi_sleeper);
spin_unlock_irqrestore(&lock,flags);
}
+EXPORT_SYMBOL(seq_copy_to_input);
static void sequencer_midi_input(int dev, unsigned char data)
{
static void sequencer_midi_input(int dev, unsigned char data)
{
@@
-206,6
+206,7
@@
void seq_input_event(unsigned char *event_rec, int len)
}
seq_copy_to_input(event_rec, len);
}
}
seq_copy_to_input(event_rec, len);
}
+EXPORT_SYMBOL(seq_input_event);
int sequencer_write(int dev, struct file *file, const char __user *buf, int count)
{
int sequencer_write(int dev, struct file *file, const char __user *buf, int count)
{
@@
-709,11
+710,11
@@
static void seq_local_event(unsigned char *event_rec)
static void seq_sysex_message(unsigned char *event_rec)
{
static void seq_sysex_message(unsigned char *event_rec)
{
- int dev = event_rec[1];
+
unsigned
int dev = event_rec[1];
int i, l = 0;
unsigned char *buf = &event_rec[2];
int i, l = 0;
unsigned char *buf = &event_rec[2];
- if (
(int)
dev > max_synthdev)
+ if (dev > max_synthdev)
return;
if (!(synth_open_mask & (1 << dev)))
return;
return;
if (!(synth_open_mask & (1 << dev)))
return;
@@
-1554,6
+1555,7
@@
void sequencer_timer(unsigned long dummy)
{
seq_startplay();
}
{
seq_startplay();
}
+EXPORT_SYMBOL(sequencer_timer);
int note_to_freq(int note_num)
{
int note_to_freq(int note_num)
{
@@
-1587,6
+1589,7
@@
int note_to_freq(int note_num)
return note_freq;
}
return note_freq;
}
+EXPORT_SYMBOL(note_to_freq);
unsigned long compute_finetune(unsigned long base_freq, int bend, int range,
int vibrato_cents)
unsigned long compute_finetune(unsigned long base_freq, int bend, int range,
int vibrato_cents)
@@
-1640,19
+1643,12
@@
unsigned long compute_finetune(unsigned long base_freq, int bend, int range,
else
return (base_freq * amount) / 10000; /* Bend up */
}
else
return (base_freq * amount) / 10000; /* Bend up */
}
-
+EXPORT_SYMBOL(compute_finetune);
void sequencer_init(void)
{
void sequencer_init(void)
{
- /* drag in sequencer_syms.o */
- {
- extern char sequencer_syms_symbol;
- sequencer_syms_symbol = 0;
- }
-
if (sequencer_ok)
return;
if (sequencer_ok)
return;
- MIDIbuf_init();
queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ);
if (queue == NULL)
{
queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ);
if (queue == NULL)
{
@@
-1668,17
+1664,11
@@
void sequencer_init(void)
}
sequencer_ok = 1;
}
}
sequencer_ok = 1;
}
+EXPORT_SYMBOL(sequencer_init);
void sequencer_unload(void)
{
void sequencer_unload(void)
{
- if(queue)
- {
- vfree(queue);
- queue=NULL;
- }
- if(iqueue)
- {
- vfree(iqueue);
- iqueue=NULL;
- }
+ vfree(queue);
+ vfree(iqueue);
+ queue = iqueue = NULL;
}
}