#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <linux/mutex.h>
+
#include <sound/core.h>
#include "ice1712.h"
#include "hoontech.h"
-static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned char byte)
+static void __devinit snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, unsigned char byte)
{
byte |= ICE1712_STDSP24_CLOCK_BIT;
udelay(100);
snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, byte);
}
-static void __devinit snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_darear(struct snd_ice1712 *ice, int activate)
{
- down(&ice->gpio_mutex);
- ICE1712_STDSP24_0_DAREAR(ice->hoontech_boxbits, activate);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[0]);
- up(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
+ ICE1712_STDSP24_0_DAREAR(ice->spec.hoontech.boxbits, activate);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[0]);
+ mutex_unlock(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_mute(struct snd_ice1712 *ice, int activate)
{
- down(&ice->gpio_mutex);
- ICE1712_STDSP24_3_MUTE(ice->hoontech_boxbits, activate);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
- up(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
+ ICE1712_STDSP24_3_MUTE(ice->spec.hoontech.boxbits, activate);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
+ mutex_unlock(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_insel(struct snd_ice1712 *ice, int activate)
{
- down(&ice->gpio_mutex);
- ICE1712_STDSP24_3_INSEL(ice->hoontech_boxbits, activate);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
- up(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
+ ICE1712_STDSP24_3_INSEL(ice->spec.hoontech.boxbits, activate);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
+ mutex_unlock(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, int chn, int activate)
+static void __devinit snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, int box, int chn, int activate)
{
- down(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
/* select box */
- ICE1712_STDSP24_0_BOX(ice->hoontech_boxbits, box);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[0]);
+ ICE1712_STDSP24_0_BOX(ice->spec.hoontech.boxbits, box);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[0]);
/* prepare for write */
if (chn == 3)
- ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 0);
- ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, activate);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
-
- ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN3(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 1);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[1]);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_2_CHN4(ice->spec.hoontech.boxbits, 0);
+ ICE1712_STDSP24_2_MIDI1(ice->spec.hoontech.boxbits, activate);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
+
+ ICE1712_STDSP24_1_CHN1(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN2(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN3(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_2_CHN4(ice->spec.hoontech.boxbits, 1);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[1]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
udelay(100);
if (chn == 3) {
- ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 0);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_2_CHN4(ice->spec.hoontech.boxbits, 0);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
} else {
switch (chn) {
- case 0: ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 0); break;
- case 1: ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 0); break;
- case 2: ICE1712_STDSP24_1_CHN3(ice->hoontech_boxbits, 0); break;
+ case 0: ICE1712_STDSP24_1_CHN1(ice->spec.hoontech.boxbits, 0); break;
+ case 1: ICE1712_STDSP24_1_CHN2(ice->spec.hoontech.boxbits, 0); break;
+ case 2: ICE1712_STDSP24_1_CHN3(ice->spec.hoontech.boxbits, 0); break;
}
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[1]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[1]);
}
udelay(100);
- ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN3(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 1);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[1]);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_1_CHN1(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN2(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN3(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_2_CHN4(ice->spec.hoontech.boxbits, 1);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[1]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
udelay(100);
- ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, 0);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_2_MIDI1(ice->spec.hoontech.boxbits, 0);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
- up(&ice->gpio_mutex);
+ mutex_unlock(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master)
+static void __devinit snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int box, int master)
{
- down(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
/* select box */
- ICE1712_STDSP24_0_BOX(ice->hoontech_boxbits, box);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[0]);
+ ICE1712_STDSP24_0_BOX(ice->spec.hoontech.boxbits, box);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[0]);
- ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, master);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
+ ICE1712_STDSP24_2_MIDIIN(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_2_MIDI1(ice->spec.hoontech.boxbits, master);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
udelay(100);
- ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 0);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_2_MIDIIN(ice->spec.hoontech.boxbits, 0);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
mdelay(10);
- ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[2]);
+ ICE1712_STDSP24_2_MIDIIN(ice->spec.hoontech.boxbits, 1);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[2]);
- up(&ice->gpio_mutex);
+ mutex_unlock(&ice->gpio_mutex);
}
-static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate)
+static void __devinit snd_ice1712_stdsp24_midi2(struct snd_ice1712 *ice, int activate)
{
- down(&ice->gpio_mutex);
- ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, activate);
- snd_ice1712_stdsp24_gpio_write(ice, ice->hoontech_boxbits[3]);
- up(&ice->gpio_mutex);
+ mutex_lock(&ice->gpio_mutex);
+ ICE1712_STDSP24_3_MIDI2(ice->spec.hoontech.boxbits, activate);
+ snd_ice1712_stdsp24_gpio_write(ice, ice->spec.hoontech.boxbits[3]);
+ mutex_unlock(&ice->gpio_mutex);
}
-static int __devinit snd_ice1712_hoontech_init(ice1712_t *ice)
+static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)
{
int box, chn;
ice->num_total_dacs = 8;
ice->num_total_adcs = 8;
- ice->hoontech_boxbits[0] =
- ice->hoontech_boxbits[1] =
- ice->hoontech_boxbits[2] =
- ice->hoontech_boxbits[3] = 0; /* should be already */
-
- ICE1712_STDSP24_SET_ADDR(ice->hoontech_boxbits, 0);
- ICE1712_STDSP24_CLOCK(ice->hoontech_boxbits, 0, 1);
- ICE1712_STDSP24_0_BOX(ice->hoontech_boxbits, 0);
- ICE1712_STDSP24_0_DAREAR(ice->hoontech_boxbits, 0);
-
- ICE1712_STDSP24_SET_ADDR(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_CLOCK(ice->hoontech_boxbits, 1, 1);
- ICE1712_STDSP24_1_CHN1(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN2(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_1_CHN3(ice->hoontech_boxbits, 1);
+ ice->spec.hoontech.boxbits[0] =
+ ice->spec.hoontech.boxbits[1] =
+ ice->spec.hoontech.boxbits[2] =
+ ice->spec.hoontech.boxbits[3] = 0; /* should be already */
+
+ ICE1712_STDSP24_SET_ADDR(ice->spec.hoontech.boxbits, 0);
+ ICE1712_STDSP24_CLOCK(ice->spec.hoontech.boxbits, 0, 1);
+ ICE1712_STDSP24_0_BOX(ice->spec.hoontech.boxbits, 0);
+ ICE1712_STDSP24_0_DAREAR(ice->spec.hoontech.boxbits, 0);
+
+ ICE1712_STDSP24_SET_ADDR(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_CLOCK(ice->spec.hoontech.boxbits, 1, 1);
+ ICE1712_STDSP24_1_CHN1(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN2(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_1_CHN3(ice->spec.hoontech.boxbits, 1);
- ICE1712_STDSP24_SET_ADDR(ice->hoontech_boxbits, 2);
- ICE1712_STDSP24_CLOCK(ice->hoontech_boxbits, 2, 1);
- ICE1712_STDSP24_2_CHN4(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_2_MIDIIN(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_2_MIDI1(ice->hoontech_boxbits, 0);
-
- ICE1712_STDSP24_SET_ADDR(ice->hoontech_boxbits, 3);
- ICE1712_STDSP24_CLOCK(ice->hoontech_boxbits, 3, 1);
- ICE1712_STDSP24_3_MIDI2(ice->hoontech_boxbits, 0);
- ICE1712_STDSP24_3_MUTE(ice->hoontech_boxbits, 1);
- ICE1712_STDSP24_3_INSEL(ice->hoontech_boxbits, 0);
+ ICE1712_STDSP24_SET_ADDR(ice->spec.hoontech.boxbits, 2);
+ ICE1712_STDSP24_CLOCK(ice->spec.hoontech.boxbits, 2, 1);
+ ICE1712_STDSP24_2_CHN4(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_2_MIDIIN(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_2_MIDI1(ice->spec.hoontech.boxbits, 0);
+
+ ICE1712_STDSP24_SET_ADDR(ice->spec.hoontech.boxbits, 3);
+ ICE1712_STDSP24_CLOCK(ice->spec.hoontech.boxbits, 3, 1);
+ ICE1712_STDSP24_3_MIDI2(ice->spec.hoontech.boxbits, 0);
+ ICE1712_STDSP24_3_MUTE(ice->spec.hoontech.boxbits, 1);
+ ICE1712_STDSP24_3_INSEL(ice->spec.hoontech.boxbits, 0);
/* let's go - activate only functions in first box */
- ice->hoontech_config = 0;
+ ice->spec.hoontech.config = 0;
/* ICE1712_STDSP24_MUTE |
ICE1712_STDSP24_INSEL |
ICE1712_STDSP24_DAREAR; */
- ice->hoontech_boxconfig[0] = ICE1712_STDSP24_BOX_CHN1 |
+ ice->spec.hoontech.boxconfig[0] = ICE1712_STDSP24_BOX_CHN1 |
ICE1712_STDSP24_BOX_CHN2 |
ICE1712_STDSP24_BOX_CHN3 |
ICE1712_STDSP24_BOX_CHN4 |
ICE1712_STDSP24_BOX_MIDI1 |
ICE1712_STDSP24_BOX_MIDI2;
- ice->hoontech_boxconfig[1] =
- ice->hoontech_boxconfig[2] =
- ice->hoontech_boxconfig[3] = 0;
- snd_ice1712_stdsp24_darear(ice, (ice->hoontech_config & ICE1712_STDSP24_DAREAR) ? 1 : 0);
- snd_ice1712_stdsp24_mute(ice, (ice->hoontech_config & ICE1712_STDSP24_MUTE) ? 1 : 0);
- snd_ice1712_stdsp24_insel(ice, (ice->hoontech_config & ICE1712_STDSP24_INSEL) ? 1 : 0);
+ ice->spec.hoontech.boxconfig[1] =
+ ice->spec.hoontech.boxconfig[2] =
+ ice->spec.hoontech.boxconfig[3] = 0;
+ snd_ice1712_stdsp24_darear(ice, (ice->spec.hoontech.config & ICE1712_STDSP24_DAREAR) ? 1 : 0);
+ snd_ice1712_stdsp24_mute(ice, (ice->spec.hoontech.config & ICE1712_STDSP24_MUTE) ? 1 : 0);
+ snd_ice1712_stdsp24_insel(ice, (ice->spec.hoontech.config & ICE1712_STDSP24_INSEL) ? 1 : 0);
for (box = 0; box < 4; box++) {
for (chn = 0; chn < 4; chn++)
- snd_ice1712_stdsp24_box_channel(ice, box, chn, (ice->hoontech_boxconfig[box] & (1 << chn)) ? 1 : 0);
+ snd_ice1712_stdsp24_box_channel(ice, box, chn, (ice->spec.hoontech.boxconfig[box] & (1 << chn)) ? 1 : 0);
snd_ice1712_stdsp24_box_midi(ice, box,
- (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0);
- if (ice->hoontech_boxconfig[box] & ICE1712_STDSP24_BOX_MIDI2)
+ (ice->spec.hoontech.boxconfig[box] & ICE1712_STDSP24_BOX_MIDI1) ? 1 : 0);
+ if (ice->spec.hoontech.boxconfig[box] & ICE1712_STDSP24_BOX_MIDI2)
snd_ice1712_stdsp24_midi2(ice, 1);
}
*/
/* start callback for STDSP24 with modified hardware */
-static void stdsp24_ak4524_lock(akm4xxx_t *ak, int chip)
+static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)
{
- ice1712_t *ice = ak->private_data[0];
+ struct snd_ice1712 *ice = ak->private_data[0];
unsigned char tmp;
snd_ice1712_save_gpio_status(ice);
tmp = ICE1712_STDSP24_SERIAL_DATA |
snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~tmp);
}
-static int __devinit snd_ice1712_value_init(ice1712_t *ice)
+static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
{
/* Hoontech STDSP24 with modified hardware */
- static akm4xxx_t akm_stdsp24_mv __devinitdata = {
+ static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
.num_adcs = 2,
.num_dacs = 2,
.type = SND_AK4524,
};
int err;
- akm4xxx_t *ak;
+ struct snd_akm4xxx *ak;
/* set the analog DACs */
ice->num_total_dacs = 2;
ice->num_total_adcs = 2;
/* analog section */
- ak = ice->akm = kmalloc(sizeof(akm4xxx_t), GFP_KERNEL);
+ ak = ice->akm = kmalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
if (! ak)
return -ENOMEM;
ice->akm_codecs = 1;
return 0;
}
-static int __devinit snd_ice1712_ez8_init(ice1712_t *ice)
+static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)
{
ice->gpio.write_mask = ice->eeprom.gpiomask;
ice->gpio.direction = ice->eeprom.gpiodir;
git://git.onelab.eu / linux-2.6.git / blobdiff