[alsa-devel] [PATCH 4/6] Adding GPIO routines for mask and direction

[Pavel Hofman]

Takashi Iwai wrote:
> At Tue, 15 Sep 2009 00:45:01 +0200,
> pavel.hofman at ivitera.com wrote:
>> diff --git a/pci/ice1712/ice1712.h b/pci/ice1712/ice1712.h
>> index 9da2dae..2105055 100644
>> --- a/pci/ice1712/ice1712.h
>> +++ b/pci/ice1712/ice1712.h
>> @@ -28,6 +28,7 @@
>>  #include <sound/i2c.h>
>>  #include <sound/ak4xxx-adda.h>
>>  #include <sound/ak4114.h>
>> +#include <sound/ak4113.h>
> 
> Here you don't need to include this header, at this stage.
> 
>> @@ -359,7 +360,9 @@ struct snd_ice1712 {
>>  		unsigned int saved[2];		/* for ewx_i2c */
>>  		/* operators */
>>  		void (*set_mask)(struct snd_ice1712 *ice, unsigned int data);
>> +		unsigned int (*get_mask)(struct snd_ice1712 *ice);
>>  		void (*set_dir)(struct snd_ice1712 *ice, unsigned int data);
>> +		unsigned int (*get_dir)(struct snd_ice1712 *ice);
>>  		void (*set_data)(struct snd_ice1712 *ice, unsigned int data);
>>  		unsigned int (*get_data)(struct snd_ice1712 *ice);
>>  		/* misc operators - move to another place? */
>> @@ -399,6 +402,11 @@ static inline void snd_ice1712_gpio_set_dir(struct snd_ice1712 *ice, unsigned in
>>  	ice->gpio.set_dir(ice, bits);
>>  }
>>  
>> +static inline unsigned int snd_ice1712_gpio_get_dir(struct snd_ice1712 *ice)
>> +{
>> +	return ice->gpio.get_dir(ice);
>> +}
>> +
>>  static inline void snd_ice1712_gpio_set_mask(struct snd_ice1712 *ice, unsigned int bits)
>>  {
>>  	ice->gpio.set_mask(ice, bits);
> 
> No get_mask() accessor defined?

It has not been needed yet. I will define it though.

> 
> 
>> diff --git a/pci/ice1712/ice1724.c b/pci/ice1712/ice1724.c
>> index af6e001..673edd5 100644
>> --- a/pci/ice1712/ice1724.c
>> +++ b/pci/ice1712/ice1724.c
>> @@ -196,6 +196,12 @@ static void snd_vt1724_set_gpio_dir(struct snd_ice1712 *ice, unsigned int data)
>>  	inw(ICEREG1724(ice, GPIO_DIRECTION)); /* dummy read for pci-posting */
>>  }
>>  
>> +/* get gpio direction 0 = read, 1 = write */
>> +static unsigned int snd_vt1724_get_gpio_dir(struct snd_ice1712 *ice)
>> +{
>> +	return inl(ICEREG1724(ice, GPIO_DIRECTION));
>> +}
>> +
>>  /* set the gpio mask (0 = writable) */
>>  static void snd_vt1724_set_gpio_mask(struct snd_ice1712 *ice, unsigned int data)
>>  {
>> @@ -2435,6 +2441,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
>>  	mutex_init(&ice->i2c_mutex);
>>  	ice->gpio.set_mask = snd_vt1724_set_gpio_mask;
>>  	ice->gpio.set_dir = snd_vt1724_set_gpio_dir;
>> +	ice->gpio.get_dir = snd_vt1724_get_gpio_dir;
>>  	ice->gpio.set_data = snd_vt1724_set_gpio_data;
>>  	ice->gpio.get_data = snd_vt1724_get_gpio_data;
>>  	ice->card = card;
> 
> Include get_mask definitions rather in this patch.
> No reason to split and put into another changes.
> 
> 
> thanks,
> 
> Takashi
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel