Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 209ac85d authored by Adrian Bunk's avatar Adrian Bunk Committed by Jaroslav Kysela
Browse files

[ALSA] sound/isa/: cleanups 



GUS Library
This patch contains the following possible cleanups:
- make needlesly global code static
- #if 0 the following unused global functions:
  - gus/gus_volume.c: snd_gf1_gvol_to_lvol_raw
  - gus/gus_volume.c: snd_gf1_calc_ramp_rate
  - gus/gus_volume.c: snd_gf1_compute_vibrato
  - gus/gus_volume.c: snd_gf1_compute_pitchbend
  - gus/gus_volume.c: snd_gf1_compute_freq
  - gus/gus_io.c: snd_gf1_i_adlib_write
  - gus/gus_io.c: snd_gf1_i_write_addr
  - gus/gus_io.c: snd_gf1_pokew
  - gus/gus_io.c: snd_gf1_peekw
  - gus/gus_io.c: snd_gf1_dram_setmem
  - gus/gus_io.c: snd_gf1_print_global_registers
  - gus/gus_io.c: snd_gf1_print_setup_registers
  - gus/gus_io.c: snd_gf1_peek_print_block
  - gus/gus_io.c: snd_gf1_print_setup_registers
  - gus/gus_io.c: snd_gf1_peek_print_block
- #if 0 the following unused global variable:
  - gus/gus_tables.h: snd_gf1_scale_table
- remove the following unneeded EXPORT_SYMBOL's:
  - gus/gus_main.c: snd_gf1_i_write16
  - gus/gus_main.c: snd_gf1_start
  - gus/gus_main.c: snd_gf1_stop

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1baa705b

include/sound/gus.h

+0 −23
Original line number Diff line number Diff line
@@ -526,9 +526,6 @@ extern void snd_gf1_adlib_write(snd_gus_card_t * gus, unsigned char reg, unsigne 
extern void snd_gf1_dram_addr(snd_gus_card_t * gus, unsigned int addr);

extern void snd_gf1_poke(snd_gus_card_t * gus, unsigned int addr, unsigned char data);

extern unsigned char snd_gf1_peek(snd_gus_card_t * gus, unsigned int addr);

extern void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data);

extern unsigned short snd_gf1_peekw(snd_gus_card_t * gus, unsigned int addr);

extern void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr, unsigned short value, unsigned int count);

extern void snd_gf1_write_addr(snd_gus_card_t * gus, unsigned char reg, unsigned int addr, short w_16bit);

extern unsigned int snd_gf1_read_addr(snd_gus_card_t * gus, unsigned char reg, short w_16bit);

extern void snd_gf1_i_ctrl_stop(snd_gus_card_t * gus, unsigned char reg);
@@ -544,9 +541,6 @@ extern inline unsigned short snd_gf1_i_read16(snd_gus_card_t * gus, unsigned cha 
{

	return snd_gf1_i_look16(gus, reg | 0x80);

}

extern void snd_gf1_i_adlib_write(snd_gus_card_t * gus, unsigned char reg, unsigned char data);

extern void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg, unsigned int addr, short w_16bit);

extern unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus, unsigned char reg, short w_16bit);



extern void snd_gf1_select_active_voices(snd_gus_card_t * gus);
@@ -580,10 +574,6 @@ extern void snd_gf1_lfo_command(snd_gus_card_t * gus, int voice, unsigned char * 


void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup);

int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block);

snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,

				      unsigned int address);

snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,

				       unsigned int *share_id);

snd_gf1_mem_block_t *snd_gf1_mem_alloc(snd_gf1_mem_t * alloc, int owner,

				       char *name, int size, int w_16,

				       int align, unsigned int *share_id);
@@ -608,23 +598,13 @@ int snd_gf1_dma_transfer_block(snd_gus_card_t * gus, 
/* gus_volume.c */



unsigned short snd_gf1_lvol_to_gvol_raw(unsigned int vol);

unsigned int snd_gf1_gvol_to_lvol_raw(unsigned short gf1_vol);

unsigned int snd_gf1_calc_ramp_rate(snd_gus_card_t * gus,

				    unsigned short start,

				    unsigned short end,

				    unsigned int us);

unsigned short snd_gf1_translate_freq(snd_gus_card_t * gus, unsigned int freq2);

unsigned short snd_gf1_compute_pitchbend(unsigned short pitchbend, unsigned short sens);

unsigned short snd_gf1_compute_freq(unsigned int freq,

				    unsigned int rate,

				    unsigned short mix_rate);



/* gus_reset.c */



void snd_gf1_set_default_handlers(snd_gus_card_t * gus, unsigned int what);

void snd_gf1_smart_stop_voice(snd_gus_card_t * gus, unsigned short voice);

void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice);

void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max);

void snd_gf1_stop_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max);

snd_gus_voice_t *snd_gf1_alloc_voice(snd_gus_card_t * gus, int type, int client, int port);

void snd_gf1_free_voice(snd_gus_card_t * gus, snd_gus_voice_t *voice);
@@ -641,9 +621,6 @@ int snd_gf1_pcm_new(snd_gus_card_t * gus, int pcm_dev, int control_index, snd_pc 


#ifdef CONFIG_SND_DEBUG

extern void snd_gf1_print_voice_registers(snd_gus_card_t * gus);

extern void snd_gf1_print_global_registers(snd_gus_card_t * gus);

extern void snd_gf1_print_setup_registers(snd_gus_card_t * gus);

extern void snd_gf1_peek_print_block(snd_gus_card_t * gus, unsigned int addr, int count, int w_16bit);

#endif



/* gus.c */

sound/isa/gus/gus_io.c

+11 −3
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@ unsigned short snd_gf1_i_look16(snd_gus_card_t * gus, unsigned char reg) 
	return res;

}



#if 0



void snd_gf1_i_adlib_write(snd_gus_card_t * gus,

		           unsigned char reg,

		           unsigned char data)
@@ -265,6 +267,8 @@ void snd_gf1_i_write_addr(snd_gus_card_t * gus, unsigned char reg, 
	spin_unlock_irqrestore(&gus->reg_lock, flags);

}



#endif  /*  0  */



unsigned int snd_gf1_i_read_addr(snd_gus_card_t * gus,

				 unsigned char reg, short w_16bit)

{
@@ -329,6 +333,8 @@ unsigned char snd_gf1_peek(snd_gus_card_t * gus, unsigned int addr) 
	return res;

}



#if 0



void snd_gf1_pokew(snd_gus_card_t * gus, unsigned int addr, unsigned short data)

{

	unsigned long flags;
@@ -405,9 +411,7 @@ void snd_gf1_dram_setmem(snd_gus_card_t * gus, unsigned int addr, 
	spin_unlock_irqrestore(&gus->reg_lock, flags);

}



/*



 */

#endif  /*  0  */



void snd_gf1_select_active_voices(snd_gus_card_t * gus)

{
@@ -469,6 +473,8 @@ void snd_gf1_print_voice_registers(snd_gus_card_t * gus) 
		printk(" -%i- GF1  pan                    = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x0c));

}



#if 0



void snd_gf1_print_global_registers(snd_gus_card_t * gus)

{

	unsigned char global_mode = 0x00;
@@ -528,4 +534,6 @@ void snd_gf1_peek_print_block(snd_gus_card_t * gus, unsigned int addr, int count 
	}

}



#endif  /*  0  */



#endif

sound/isa/gus/gus_main.c

+0 −3
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ EXPORT_SYMBOL(snd_gf1_write16); 
EXPORT_SYMBOL(snd_gf1_look16);

EXPORT_SYMBOL(snd_gf1_i_write8);

EXPORT_SYMBOL(snd_gf1_i_look8);

EXPORT_SYMBOL(snd_gf1_i_write16);

EXPORT_SYMBOL(snd_gf1_i_look16);

EXPORT_SYMBOL(snd_gf1_dram_addr);

EXPORT_SYMBOL(snd_gf1_write_addr);
@@ -470,8 +469,6 @@ EXPORT_SYMBOL(snd_gf1_alloc_voice); 
EXPORT_SYMBOL(snd_gf1_free_voice);

EXPORT_SYMBOL(snd_gf1_ctrl_stop);

EXPORT_SYMBOL(snd_gf1_stop_voice);

EXPORT_SYMBOL(snd_gf1_start);

EXPORT_SYMBOL(snd_gf1_stop);

  /* gus_mixer.c */

EXPORT_SYMBOL(snd_gf1_new_mixer);

  /* gus_pcm.c */

sound/isa/gus/gus_mem.c

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void snd_gf1_mem_lock(snd_gf1_mem_t * alloc, int xup) 
	}

}



snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,

static snd_gf1_mem_block_t *snd_gf1_mem_xalloc(snd_gf1_mem_t * alloc,

					       snd_gf1_mem_block_t * block)

{

	snd_gf1_mem_block_t *pblock, *nblock;
@@ -105,7 +105,7 @@ int snd_gf1_mem_xfree(snd_gf1_mem_t * alloc, snd_gf1_mem_block_t * block) 
	return 0;

}



snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,

static snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc,

					     unsigned int address)

{

	snd_gf1_mem_block_t *block;
@@ -118,7 +118,7 @@ snd_gf1_mem_block_t *snd_gf1_mem_look(snd_gf1_mem_t * alloc, 
	return NULL;

}



snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,

static snd_gf1_mem_block_t *snd_gf1_mem_share(snd_gf1_mem_t * alloc,

					      unsigned int *share_id)

{

	snd_gf1_mem_block_t *block;

sound/isa/gus/gus_reset.c

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ void snd_gf1_stop_voice(snd_gus_card_t * gus, unsigned short voice) 
#endif

}



void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min, unsigned short v_max)

static void snd_gf1_clear_voices(snd_gus_card_t * gus, unsigned short v_min,

				 unsigned short v_max)

{

	unsigned long flags;

	unsigned int daddr;