Commit ece7f77b authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] kill sound/oss/*_syms.c 



Move all EXPORT_SYMBOL's from sound/oss/*_syms.c to the files with the
actual functions.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d56b9b9c

sound/oss/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ obj-$(CONFIG_DMASOUND) += dmasound/ 
# Declare multi-part drivers.



sound-objs	:= 							\

    dev_table.o soundcard.o sound_syms.o		\

    audio.o audio_syms.o dmabuf.o					\

    midi_syms.o midi_synth.o midibuf.o					\

    sequencer.o sequencer_syms.o sound_timer.o sys_timer.o

    dev_table.o soundcard.o 		\

    audio.o dmabuf.o					\

    midi_synth.o midibuf.o					\

    sequencer.o sound_timer.o sys_timer.o



pas2-objs	:= pas2_card.o pas2_midi.o pas2_mixer.o pas2_pcm.o

sb-objs		:= sb_card.o

sound/oss/audio_syms.c

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * Exported symbols for audio driver.

 */



#include <linux/module.h>



char audio_syms_symbol;



#include "sound_config.h"

#include "sound_calls.h"



EXPORT_SYMBOL(DMAbuf_start_dma);

EXPORT_SYMBOL(DMAbuf_inputintr);

EXPORT_SYMBOL(DMAbuf_outputintr);

sound/oss/dev_table.c

+43 −1
Original line number Diff line number Diff line
@@ -13,9 +13,39 @@ 


#include <linux/init.h>



#define _DEV_TABLE_C_

#include "sound_config.h"



struct audio_operations *audio_devs[MAX_AUDIO_DEV];

EXPORT_SYMBOL(audio_devs);



int num_audiodevs;

EXPORT_SYMBOL(num_audiodevs);



struct mixer_operations *mixer_devs[MAX_MIXER_DEV];

EXPORT_SYMBOL(mixer_devs);



int num_mixers;

EXPORT_SYMBOL(num_mixers);



struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV];

EXPORT_SYMBOL(synth_devs);



int num_synths;



struct midi_operations *midi_devs[MAX_MIDI_DEV];

EXPORT_SYMBOL(midi_devs);



int num_midis;

EXPORT_SYMBOL(num_midis);



struct sound_timer_operations *sound_timer_devs[MAX_TIMER_DEV] = {

	&default_sound_timer, NULL

};

EXPORT_SYMBOL(sound_timer_devs);



int num_sound_timers = 1;





static int sound_alloc_audiodev(void);



int sound_install_audiodrv(int vers, char *name, struct audio_driver *driver,
@@ -75,6 +105,7 @@ int sound_install_audiodrv(int vers, char *name, struct audio_driver *driver, 
	audio_init_devices();

	return num;

}

EXPORT_SYMBOL(sound_install_audiodrv);



int sound_install_mixer(int vers, char *name, struct mixer_operations *driver,

	int driver_size, void *devc)
@@ -113,6 +144,7 @@ int sound_install_mixer(int vers, char *name, struct mixer_operations *driver, 
	mixer_devs[n] = op;

	return n;

}

EXPORT_SYMBOL(sound_install_mixer);



void sound_unload_audiodev(int dev)

{
@@ -122,6 +154,7 @@ void sound_unload_audiodev(int dev) 
		unregister_sound_dsp((dev<<4)+3);

	}

}

EXPORT_SYMBOL(sound_unload_audiodev);



static int sound_alloc_audiodev(void)

{
@@ -144,6 +177,7 @@ int sound_alloc_mididev(void) 
		num_midis = i + 1;

	return i;

}

EXPORT_SYMBOL(sound_alloc_mididev);



int sound_alloc_synthdev(void)

{
@@ -158,6 +192,7 @@ int sound_alloc_synthdev(void) 
	}

	return -1;

}

EXPORT_SYMBOL(sound_alloc_synthdev);



int sound_alloc_mixerdev(void)

{
@@ -169,6 +204,7 @@ int sound_alloc_mixerdev(void) 
		num_mixers = i + 1;

	return i;

}

EXPORT_SYMBOL(sound_alloc_mixerdev);



int sound_alloc_timerdev(void)

{
@@ -183,6 +219,7 @@ int sound_alloc_timerdev(void) 
	}

	return -1;

}

EXPORT_SYMBOL(sound_alloc_timerdev);



void sound_unload_mixerdev(int dev)

{
@@ -192,6 +229,7 @@ void sound_unload_mixerdev(int dev) 
		num_mixers--;

	}

}

EXPORT_SYMBOL(sound_unload_mixerdev);



void sound_unload_mididev(int dev)

{
@@ -200,15 +238,19 @@ void sound_unload_mididev(int dev) 
		unregister_sound_midi((dev<<4)+2);

	}

}

EXPORT_SYMBOL(sound_unload_mididev);



void sound_unload_synthdev(int dev)

{

	if (dev != -1)

		synth_devs[dev] = NULL;

}

EXPORT_SYMBOL(sound_unload_synthdev);



void sound_unload_timerdev(int dev)

{

	if (dev != -1)

		sound_timer_devs[dev] = NULL;

}

EXPORT_SYMBOL(sound_unload_timerdev);

sound/oss/dev_table.h

+1 −16
Original line number Diff line number Diff line
@@ -352,22 +352,8 @@ struct sound_timer_operations 
	void (*arm_timer)(int dev, long time);

};



#ifdef _DEV_TABLE_C_   

struct audio_operations *audio_devs[MAX_AUDIO_DEV];

int num_audiodevs;

struct mixer_operations *mixer_devs[MAX_MIXER_DEV];

int num_mixers;

struct synth_operations *synth_devs[MAX_SYNTH_DEV+MAX_MIDI_DEV];

int num_synths;

struct midi_operations *midi_devs[MAX_MIDI_DEV];

int num_midis;



extern struct sound_timer_operations default_sound_timer;

struct sound_timer_operations *sound_timer_devs[MAX_TIMER_DEV] = {

	&default_sound_timer, NULL

}; 

int num_sound_timers = 1;

#else



extern struct audio_operations *audio_devs[MAX_AUDIO_DEV];

extern int num_audiodevs;

extern struct mixer_operations *mixer_devs[MAX_MIXER_DEV];
@@ -378,7 +364,6 @@ extern struct midi_operations *midi_devs[MAX_MIDI_DEV]; 
extern int num_midis;

extern struct sound_timer_operations * sound_timer_devs[MAX_TIMER_DEV];

extern int num_sound_timers;

#endif	/* _DEV_TABLE_C_ */



extern int sound_map_buffer (int dev, struct dma_buffparms *dmap, buffmem_desc *info);

void sound_timer_init (struct sound_lowlev_timer *t, char *name);

sound/oss/dmabuf.c

+4 −6
Original line number Diff line number Diff line
@@ -926,6 +926,7 @@ int DMAbuf_start_dma(int dev, unsigned long physaddr, int count, int dma_mode) 
	sound_start_dma(dmap, physaddr, count, dma_mode);

	return count;

}

EXPORT_SYMBOL(DMAbuf_start_dma);



static int local_start_dma(struct audio_operations *adev, unsigned long physaddr, int count, int dma_mode)

{
@@ -1055,6 +1056,8 @@ void DMAbuf_outputintr(int dev, int notify_only) 
		do_outputintr(dev, notify_only);

	spin_unlock_irqrestore(&dmap->lock,flags);

}

EXPORT_SYMBOL(DMAbuf_outputintr);



/* called with dmap->lock held in irq context */

static void do_inputintr(int dev)

{
@@ -1154,6 +1157,7 @@ void DMAbuf_inputintr(int dev) 
		do_inputintr(dev);

	spin_unlock_irqrestore(&dmap->lock,flags);

}

EXPORT_SYMBOL(DMAbuf_inputintr);



void DMAbuf_init(int dev, int dma1, int dma2)

{
@@ -1162,12 +1166,6 @@ void DMAbuf_init(int dev, int dma1, int dma2) 
	 * NOTE! This routine could be called several times.

	 */



	/* drag in audio_syms.o */

	{

		extern char audio_syms_symbol;

		audio_syms_symbol = 0;

	}



	if (adev && adev->dmap_out == NULL) {

		if (adev->d == NULL)

			panic("OSS: audio_devs[%d]->d == NULL\n", dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE