- Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH -mm] sound/pci/pcxhr/pcxhr.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/pcxhr/pcxhr.c 2007-03-25 00:31:00.000000000 +0100 +++ linux-work3/sound/pci/pcxhr/pcxhr.c 2007-03-25 14:45:33.000000000 +0200 @@ -477,26 +477,6 @@ static int pcxhr_update_r_buffer(struct return err; } - -#if 0 -static int pcxhr_pipe_sample_count(struct pcxhr_stream *stream, snd_pcm_uframes_t *sample_count) -{ - struct pcxhr_rmh rmh; - int err; - pcxhr_t *chip = snd_pcm_substream_chip(stream->substream); - pcxhr_init_rmh(&rmh, CMD_PIPE_SAMPLE_COUNT); - pcxhr_set_pipe_cmd_params(&rmh, stream->pipe->is_capture, 0, 0, - 1<<stream->pipe->first_audio); - err = pcxhr_send_msg(chip->mgr, &rmh); - if (err == 0) { - *sample_count = ((snd_pcm_uframes_t)rmh.stat[0]) << 24; - *sample_count += (snd_pcm_uframes_t)rmh.stat[1]; - } - snd_printdd("PIPE_SAMPLE_COUNT = %lx\n", *sample_count); - return err; -} -#endif - static inline int pcxhr_stream_scheduled_get_pipe(struct pcxhr_stream *stream, struct pcxhr_pipe **pipe) {

1 0

[alsa-devel] [PATCH -mm] sound/pci/pcxhr/pcxhr_hwdep.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/pcxhr/pcxhr_hwdep.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/pcxhr/pcxhr_hwdep.c 2007-03-25 14:39:47.000000000 +0200 @@ -175,38 +175,6 @@ static int pcxhr_dsp_allocate_pipe( stru return 0; } -/* - * free playback/capture pipe (pcmp0/pcmc0) - */ -#if 0 -static int pcxhr_dsp_free_pipe( struct pcxhr_mgr *mgr, struct pcxhr_pipe *pipe) -{ - struct pcxhr_rmh rmh; - int capture_mask = 0; - int playback_mask = 0; - int err = 0; - - if (pipe->is_capture) - capture_mask = (1 << pipe->first_audio); - else - playback_mask = (1 << pipe->first_audio); - - /* stop one pipe */ - err = pcxhr_set_pipe_state(mgr, playback_mask, capture_mask, 0); - if (err < 0) - snd_printk(KERN_ERR "error stopping pipe!\n"); - /* release the pipe */ - pcxhr_init_rmh(&rmh, CMD_FREE_PIPE); - pcxhr_set_pipe_cmd_params(&rmh, pipe->is_capture, pipe->first_audio, 0, 0); - err = pcxhr_send_msg(mgr, &rmh); - if (err < 0) - snd_printk(KERN_ERR "error pipe release (CMD_FREE_PIPE) err(%x)\n", err); - pipe->status = PCXHR_PIPE_UNDEFINED; - return err; -} -#endif - - static int pcxhr_config_pipes(struct pcxhr_mgr *mgr) { int err, i, j;

1 0

[alsa-devel] [PATCH -mm] sound/pci/ice1712/pontis.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/ice1712/pontis.c 2007-03-25 00:31:00.000000000 +0100 +++ linux-work3/sound/pci/ice1712/pontis.c 2007-03-25 00:56:33.000000000 +0100 @@ -767,12 +767,6 @@ static int __devinit pontis_init(struct WM_DAC_CTRL2, 0x0000, /* no deemphasis, no ZFLG */ WM_ADC_ATTEN_L, 0x0000, /* ADC muted */ WM_ADC_ATTEN_R, 0x0000, /* ADC muted */ -#if 0 - WM_ALC_CTRL1, 0x007b, /* */ - WM_ALC_CTRL2, 0x0000, /* */ - WM_ALC_CTRL3, 0x0000, /* */ - WM_NOISE_GATE, 0x0000, /* */ -#endif WM_DAC_MUTE, 0x0000, /* DAC unmute */ WM_ADC_MUX, 0x0003, /* ADC unmute, both CD/Line On */ };

1 0

[alsa-devel] [PATCH -mm] sound/pci/ice1712/prodigy192.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/ice1712/prodigy192.c 2007-03-25 00:31:00.000000000 +0100 +++ linux-work3/sound/pci/ice1712/prodigy192.c 2007-03-25 14:32:42.000000000 +0200 @@ -234,129 +234,6 @@ static int stac9460_adc_vol_put(struct s return change; } -#if 0 -/* - * Headphone Amplifier - */ -static int aureon_set_headphone_amp(struct snd_ice1712 *ice, int enable) -{ - unsigned int tmp, tmp2; - - tmp2 = tmp = snd_ice1712_gpio_read(ice); - if (enable) - tmp |= AUREON_HP_SEL; - else - tmp &= ~ AUREON_HP_SEL; - if (tmp != tmp2) { - snd_ice1712_gpio_write(ice, tmp); - return 1; - } - return 0; -} - -static int aureon_get_headphone_amp(struct snd_ice1712 *ice) -{ - unsigned int tmp = snd_ice1712_gpio_read(ice); - - return ( tmp & AUREON_HP_SEL )!= 0; -} - -static int aureon_bool_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo) -{ - uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; - uinfo->count = 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = 1; - return 0; -} - -static int aureon_hpamp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - - ucontrol->value.integer.value[0] = aureon_get_headphone_amp(ice); - return 0; -} - - -static int aureon_hpamp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - - return aureon_set_headphone_amp(ice,ucontrol->value.integer.value[0]); -} - -/* - * Deemphasis - */ -static int aureon_deemp_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - ucontrol->value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL2) & 0xf) == 0xf; - return 0; -} - -static int aureon_deemp_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - int temp, temp2; - temp2 = temp = wm_get(ice, WM_DAC_CTRL2); - if (ucontrol->value.integer.value[0]) - temp |= 0xf; - else - temp &= ~0xf; - if (temp != temp2) { - wm_put(ice, WM_DAC_CTRL2, temp); - return 1; - } - return 0; -} - -/* - * ADC Oversampling - */ -static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_info *uinfo) -{ - static char *texts[2] = { "128x", "64x" }; - - uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; - uinfo->count = 1; - uinfo->value.enumerated.items = 2; - - if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) - uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; - strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); - - return 0; -} - -static int aureon_oversampling_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - ucontrol->value.enumerated.item[0] = (wm_get(ice, WM_MASTER) & 0x8) == 0x8; - return 0; -} - -static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ - int temp, temp2; - struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol); - - temp2 = temp = wm_get(ice, WM_MASTER); - - if (ucontrol->value.enumerated.item[0]) - temp |= 0x8; - else - temp &= ~0x8; - - if (temp != temp2) { - wm_put(ice, WM_MASTER, temp); - return 1; - } - return 0; -} -#endif - static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0); static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0); @@ -424,36 +301,6 @@ static struct snd_kcontrol_new stac_cont .put = stac9460_adc_vol_put, .tlv = { .p = db_scale_adc } }, -#if 0 - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Capture Route", - .info = wm_adc_mux_info, - .get = wm_adc_mux_get, - .put = wm_adc_mux_put, - }, - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Headphone Amplifier Switch", - .info = aureon_bool_info, - .get = aureon_hpamp_get, - .put = aureon_hpamp_put - }, - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "DAC Deemphasis Switch", - .info = aureon_bool_info, - .get = aureon_deemp_get, - .put = aureon_deemp_put - }, - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "ADC Oversampling", - .info = aureon_oversampling_info, - .get = aureon_oversampling_get, - .put = aureon_oversampling_put - }, -#endif }; static int __devinit prodigy192_add_controls(struct snd_ice1712 *ice)

1 0

[alsa-devel] [PATCH -mm] sound/pci/ice1712/juli.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/ice1712/juli.c 2007-03-25 00:31:00.000000000 +0100 +++ linux-work3/sound/pci/ice1712/juli.c 2007-03-25 14:27:33.000000000 +0200 @@ -160,13 +160,6 @@ static int __devinit juli_init(struct sn int err; struct snd_akm4xxx *ak; -#if 0 - for (err = 0; err < 0x20; err++) - juli_ak4114_read(ice, err); - juli_ak4114_write(ice, 0, 0x0f); - juli_ak4114_read(ice, 0); - juli_ak4114_read(ice, 1); -#endif err = snd_ak4114_create(ice->card, juli_ak4114_read, juli_ak4114_write, @@ -175,14 +168,7 @@ static int __devinit juli_init(struct sn if (err < 0) return err; -#if 0 - /* it seems that the analog doughter board detection does not work - reliably, so force the analog flag; it should be very rare - to use Juli@ without the analog doughter board */ - ice->spec.juli.analog = (ice->gpio.get_data(ice) & GPIO_ANALOG_PRESENT) ? 0 : 1; -#else ice->spec.juli.analog = 1; -#endif if (ice->spec.juli.analog) { printk(KERN_INFO "juli@: analog I/O detected\n");

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0_xtalk.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/au88x0/au88x0_xtalk.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0_xtalk.c 2007-03-25 16:52:23.000000000 +0200 @@ -369,148 +369,6 @@ vortex_XtalkHw_SetRightXTStates(vortex_t hwwrite(vortex->mmio, 0x24534 + i * 0x24, arg_0[3]); } -#if 0 -static void -vortex_XtalkHw_GetLeftEQ(vortex_t * vortex, short *arg_0, short *arg_4, - xtalk_coefs_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x24200 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x24204 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x24208 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x2420c + i * 0x24); - coefs[i][4] = hwread(vortex->mmio, 0x24210 + i * 0x24); - } - *arg_0 = hwread(vortex->mmio, 0x24538) & 0xffff; - *arg_4 = hwread(vortex->mmio, 0x2453c) & 0xffff; -} - -static void -vortex_XtalkHw_GetRightEQ(vortex_t * vortex, short *arg_0, short *arg_4, - xtalk_coefs_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x242b4 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x242b8 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x242bc + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x242c0 + i * 0x24); - coefs[i][4] = hwread(vortex->mmio, 0x242c4 + i * 0x24); - } - *arg_0 = hwread(vortex->mmio, 0x24540) & 0xffff; - *arg_4 = hwread(vortex->mmio, 0x24544) & 0xffff; -} - -static void -vortex_XtalkHw_GetLeftXT(vortex_t * vortex, short *arg_0, short *arg_4, - xtalk_coefs_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x24368 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x2436C + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x24370 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x24374 + i * 0x24); - coefs[i][4] = hwread(vortex->mmio, 0x24378 + i * 0x24); - } - *arg_0 = hwread(vortex->mmio, 0x24548) & 0xffff; - *arg_4 = hwread(vortex->mmio, 0x2454C) & 0xffff; -} - -static void -vortex_XtalkHw_GetRightXT(vortex_t * vortex, short *arg_0, short *arg_4, - xtalk_coefs_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x2441C + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x24420 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x24424 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x24428 + i * 0x24); - coefs[i][4] = hwread(vortex->mmio, 0x2442C + i * 0x24); - } - *arg_0 = hwread(vortex->mmio, 0x24550) & 0xffff; - *arg_4 = hwread(vortex->mmio, 0x24554) & 0xffff; -} - -static void -vortex_XtalkHw_GetLeftEQStates(vortex_t * vortex, xtalk_instate_t arg_0, - xtalk_state_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x24214 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x24218 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x2421C + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x24220 + i * 0x24); - } - arg_0[0] = hwread(vortex->mmio, 0x244F8 + i * 0x24); - arg_0[1] = hwread(vortex->mmio, 0x244FC + i * 0x24); - arg_0[2] = hwread(vortex->mmio, 0x24500 + i * 0x24); - arg_0[3] = hwread(vortex->mmio, 0x24504 + i * 0x24); -} - -static void -vortex_XtalkHw_GetRightEQStates(vortex_t * vortex, xtalk_instate_t arg_0, - xtalk_state_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x242C8 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x242CC + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x242D0 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x242D4 + i * 0x24); - } - arg_0[0] = hwread(vortex->mmio, 0x24508 + i * 0x24); - arg_0[1] = hwread(vortex->mmio, 0x2450C + i * 0x24); - arg_0[2] = hwread(vortex->mmio, 0x24510 + i * 0x24); - arg_0[3] = hwread(vortex->mmio, 0x24514 + i * 0x24); -} - -static void -vortex_XtalkHw_GetLeftXTStates(vortex_t * vortex, xtalk_instate_t arg_0, - xtalk_state_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x2437C + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x24380 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x24384 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x24388 + i * 0x24); - } - arg_0[0] = hwread(vortex->mmio, 0x24518 + i * 0x24); - arg_0[1] = hwread(vortex->mmio, 0x2451C + i * 0x24); - arg_0[2] = hwread(vortex->mmio, 0x24520 + i * 0x24); - arg_0[3] = hwread(vortex->mmio, 0x24524 + i * 0x24); -} - -static void -vortex_XtalkHw_GetRightXTStates(vortex_t * vortex, xtalk_instate_t arg_0, - xtalk_state_t coefs) -{ - int i; - - for (i = 0; i < 5; i++) { - coefs[i][0] = hwread(vortex->mmio, 0x24430 + i * 0x24); - coefs[i][1] = hwread(vortex->mmio, 0x24434 + i * 0x24); - coefs[i][2] = hwread(vortex->mmio, 0x24438 + i * 0x24); - coefs[i][3] = hwread(vortex->mmio, 0x2443C + i * 0x24); - } - arg_0[0] = hwread(vortex->mmio, 0x24528 + i * 0x24); - arg_0[1] = hwread(vortex->mmio, 0x2452C + i * 0x24); - arg_0[2] = hwread(vortex->mmio, 0x24530 + i * 0x24); - arg_0[3] = hwread(vortex->mmio, 0x24534 + i * 0x24); -} - -#endif /* Gains */ static void @@ -529,16 +387,6 @@ vortex_XtalkHw_SetGainsAllChan(vortex_t vortex_XtalkHw_SetGains(vortex, asXtalkGainsAllChan); } -#if 0 -static void vortex_XtalkHw_GetGains(vortex_t * vortex, xtalk_gains_t gains) -{ - int i; - - for (i = 0; i < XTGAINS_SZ; i++) - gains[i] = hwread(vortex->mmio, 0x244D0 + i * 4); -} - -#endif /* Delay parameters */ static void @@ -577,53 +425,6 @@ vortex_XtalkHw_SetRightDline(vortex_t * } } -#if 0 -static void -vortex_XtalkHw_GetDelay(vortex_t * vortex, unsigned short *right, - unsigned short *left) -{ - int esp0; - - esp0 = hwread(vortex->mmio, 0x24660); - *right = (esp0 >> 8) & 0x1f; - *left = (esp0 >> 0xd) & 0x1f; -} - -static void vortex_XtalkHw_GetLeftDline(vortex_t * vortex, xtalk_dline_t dline) -{ - int i; - - for (i = 0; i < 0x20; i++) { - dline[i] = - (hwread(vortex->mmio, 0x24000 + (i << 2)) & 0xffff) | - (hwread(vortex->mmio, 0x24080 + (i << 2)) << 0x10); - } -} - -static void vortex_XtalkHw_GetRightDline(vortex_t * vortex, xtalk_dline_t dline) -{ - int i; - - for (i = 0; i < 0x20; i++) { - dline[i] = - (hwread(vortex->mmio, 0x24100 + (i << 2)) & 0xffff) | - (hwread(vortex->mmio, 0x24180 + (i << 2)) << 0x10); - } -} - -#endif -/* Control/Global stuff */ - -#if 0 -static void vortex_XtalkHw_SetControlReg(vortex_t * vortex, u32 ctrl) -{ - hwwrite(vortex->mmio, 0x24660, ctrl); -} -static void vortex_XtalkHw_GetControlReg(vortex_t * vortex, u32 *ctrl) -{ - *ctrl = hwread(vortex->mmio, 0x24660); -} -#endif static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex, u32 sr) { u32 temp; @@ -633,13 +434,6 @@ static void vortex_XtalkHw_SetSampleRate hwwrite(vortex->mmio, 0x24660, temp); } -#if 0 -static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex, u32 *sr) -{ - *sr = (hwread(vortex->mmio, 0x24660) >> 3) & 0x1f; -} - -#endif static void vortex_XtalkHw_Enable(vortex_t * vortex) { u32 temp;

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0_synth.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/au88x0/au88x0_synth.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0_synth.c 2007-03-25 17:16:29.000000000 +0200 @@ -147,47 +147,6 @@ static void vortex_wt_connect(vortex_t * } } -/* Read WT Register */ -#if 0 -static int vortex_wt_GetReg(vortex_t * vortex, char reg, int wt) -{ - //int eax, esi; - - if (reg == 4) { - return hwread(vortex->mmio, WT_PARM(wt, 3)); - } - if (reg == 7) { - return hwread(vortex->mmio, WT_GMODE(wt)); - } - - return 0; -} - -/* WT hardware abstraction layer generic register interface. */ -static int -vortex_wt_SetReg2(vortex_t * vortex, unsigned char reg, int wt, - u16 val) -{ - /* - int eax, edx; - - if (wt >= NR_WT) // 0x40 -> NR_WT - return 0; - - if ((reg - 0x20) > 0) { - if ((reg - 0x21) != 0) - return 0; - eax = ((((b & 0xff) << 0xb) + (edx & 0xff)) << 4) + 0x208; // param 2 - } else { - eax = ((((b & 0xff) << 0xb) + (edx & 0xff)) << 4) + 0x20a; // param 3 - } - hwwrite(vortex->mmio, eax, c); - */ - return 1; -} - -/*public: static void __thiscall CWTHal::SetReg(unsigned char,int,unsigned long) */ -#endif static int vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, u32 val) @@ -315,81 +274,4 @@ static void vortex_wt_init(vortex_t * vo vortex_wt_SetReg(vortex, 0xa, edi, var10); /* ctrl */ } -/* Extract of CAdbTopology::SetVolume(struct _ASPVOLUME *) */ -#if 0 -static void vortex_wt_SetVolume(vortex_t * vortex, int wt, int vol[]) -{ - wt_voice_t *voice = &(vortex->wt_voice[wt]); - int ecx = vol[1], eax = vol[0]; - - /* This is pure guess */ - voice->parm0 &= 0xff00ffff; - voice->parm0 |= (vol[0] & 0xff) << 0x10; - voice->parm1 &= 0xff00ffff; - voice->parm1 |= (vol[1] & 0xff) << 0x10; - - /* This is real */ - hwwrite(vortex, WT_PARM(wt, 0), voice->parm0); - hwwrite(vortex, WT_PARM(wt, 1), voice->parm0); - - if (voice->this_1D0 & 4) { - eax >>= 8; - ecx = eax; - if (ecx < 0x80) - ecx = 0x7f; - voice->parm3 &= 0xFFFFC07F; - voice->parm3 |= (ecx & 0x7f) << 7; - voice->parm3 &= 0xFFFFFF80; - voice->parm3 |= (eax & 0x7f); - } else { - voice->parm3 &= 0xFFE03FFF; - voice->parm3 |= (eax & 0xFE00) << 5; - } - - hwwrite(vortex, WT_PARM(wt, 3), voice->parm3); -} - -/* Extract of CAdbTopology::SetFrequency(unsigned long arg_0) */ -static void vortex_wt_SetFrequency(vortex_t * vortex, int wt, unsigned int sr) -{ - wt_voice_t *voice = &(vortex->wt_voice[wt]); - u32 eax, edx; - - //FIXME: 64 bit operation. - eax = ((sr << 0xf) * 0x57619F1) & 0xffffffff; - edx = (((sr << 0xf) * 0x57619F1)) >> 0x20; - - edx >>= 0xa; - edx <<= 1; - if (edx) { - if (edx & 0x0FFF80000) - eax = 0x7fff; - else { - edx <<= 0xd; - eax = 7; - while ((edx & 0x80000000) == 0) { - edx <<= 1; - eax--; - if (eax == 0) ; - break; - } - if (eax) - edx <<= 1; - eax <<= 0xc; - edx >>= 0x14; - eax |= edx; - } - } else - eax = 0; - voice->parm0 &= 0xffff0001; - voice->parm0 |= (eax & 0x7fff) << 1; - voice->parm1 = voice->parm0 | 1; - // Wt: this_1D4 - //AuWt::WriteReg((ulong)(this_1DC<<4)+0x200, (ulong)this_1E4); - //AuWt::WriteReg((ulong)(this_1DC<<4)+0x204, (ulong)this_1E8); - hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0); - hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1); -} -#endif - /* End of File */

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0_wt.h remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> mjander(a)users.sourceforge.org --- linux-work5/sound/pci/au88x0/au88x0_wt.h 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0_wt.h 2007-03-25 16:57:17.000000000 +0200 @@ -33,25 +33,6 @@ #define WT_PARM(x,y) (((WT_BAR(x))+ 0x80 +(((x)&0x1f)<<2)+(y))<<2) /* 0x0200 */ #define WT_DELAY(x,y) (((WT_BAR(x))+ 0x100 +(((x)&0x1f)<<2)+(y))<<2) /* 0x0400 */ -/* Numeric indexes used by SetReg() and GetReg() */ -#if 0 -enum { - run = 0, /* 0 W 1:run 0:stop */ - parm0, /* 1 W filter, samplerate */ - parm1, /* 2 W filter, samplerate */ - parm2, /* 3 W */ - parm3, /* 4 RW volume. This value is calculated using floating point ops. */ - sramp, /* 5 W */ - mute, /* 6 W 1:mute, 0:unmute */ - gmode, /* 7 RO Looks like only bit0 is used. */ - aramp, /* 8 W */ - mramp, /* 9 W */ - ctrl, /* a W */ - delay, /* b W All 4 values are written at once with same value. */ - dsreg, /* c (R)W */ -} wt_reg; -#endif - typedef struct { u32 parm0; /* this_1E4 */ u32 parm1; /* this_1E8 */

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0.h remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/au88x0/au88x0.h 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0.h 2007-03-25 16:32:57.000000000 +0200 @@ -253,11 +253,6 @@ static void vortex_wt_init(vortex_t * vo static void vortex_route(vortex_t * vortex, int en, unsigned char channel, unsigned char source, unsigned char dest); -#if 0 -static void vortex_routes(vortex_t * vortex, int en, unsigned char channel, - unsigned char source, unsigned char dest0, - unsigned char dest1); -#endif static void vortex_connection_mixin_mix(vortex_t * vortex, int en, unsigned char mixin, unsigned char mix, int a);

1 0

[alsa-devel] [PATCH -mm] sound/pci/au88x0/au88x0_core.c remove unused code
by Michal Piotrowski 25 Mar '07

25 Mar '07

This patch is against the latest -mm snapshot. Regards, Michal -- Michal K. K. Piotrowski LTG - Linux Testers Group (PL) (http://www.stardust.webpages.pl/ltg/) LTG - Linux Testers Group (EN) (http://www.stardust.webpages.pl/linux_testers_group_en/) Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski(a)gmail.com> --- linux-work5/sound/pci/au88x0/au88x0_core.c 2007-02-04 19:44:54.000000000 +0100 +++ linux-work3/sound/pci/au88x0/au88x0_core.c 2007-03-25 17:06:31.000000000 +0200 @@ -97,85 +97,6 @@ static void vortex_mixer_dis_sr(vortex_t hwread(vortex->mmio, VORTEX_MIXER_SR) & ~(0x1 << channel)); } -#if 0 -static void -vortex_mix_muteinputgain(vortex_t * vortex, unsigned char mix, - unsigned char channel) -{ - hwwrite(vortex->mmio, VORTEX_MIX_INVOL_A + ((mix << 5) + channel), - 0x80); - hwwrite(vortex->mmio, VORTEX_MIX_INVOL_B + ((mix << 5) + channel), - 0x80); -} - -static int vortex_mix_getvolume(vortex_t * vortex, unsigned char mix) -{ - int a; - a = hwread(vortex->mmio, VORTEX_MIX_VOL_A + (mix << 2)) & 0xff; - //FP2LinearFrac(a); - return (a); -} - -static int -vortex_mix_getinputvolume(vortex_t * vortex, unsigned char mix, - int channel, int *vol) -{ - int a; - if (!(mchannels[mix] & (1 << channel))) - return 0; - a = hwread(vortex->mmio, - VORTEX_MIX_INVOL_A + (((mix << 5) + channel) << 2)); - /* - if (rampchs[mix] == 0) - a = FP2LinearFrac(a); - else - a = FP2LinearFracWT(a); - */ - *vol = a; - return (0); -} - -static unsigned int vortex_mix_boost6db(unsigned char vol) -{ - return (vol + 8); /* WOW! what a complex function! */ -} - -static void vortex_mix_rampvolume(vortex_t * vortex, int mix) -{ - int ch; - char a; - // This function is intended for ramping down only (see vortex_disableinput()). - for (ch = 0; ch < 0x20; ch++) { - if (((1 << ch) & rampchs[mix]) == 0) - continue; - a = hwread(vortex->mmio, - VORTEX_MIX_INVOL_B + (((mix << 5) + ch) << 2)); - if (a > -126) { - a -= 2; - hwwrite(vortex->mmio, - VORTEX_MIX_INVOL_A + - (((mix << 5) + ch) << 2), a); - hwwrite(vortex->mmio, - VORTEX_MIX_INVOL_B + - (((mix << 5) + ch) << 2), a); - } else - vortex_mix_killinput(vortex, mix, ch); - } -} - -static int -vortex_mix_getenablebit(vortex_t * vortex, unsigned char mix, int mixin) -{ - int addr, temp; - if (mixin >= 0) - addr = mixin; - else - addr = mixin + 3; - addr = ((mix << 3) + (addr >> 2)) << 2; - temp = hwread(vortex->mmio, VORTEX_MIX_ENIN + addr); - return ((temp >> (mixin & 3)) & 1); -} -#endif static void vortex_mix_setvolumebyte(vortex_t * vortex, unsigned char mix, unsigned char vol) @@ -500,61 +421,6 @@ vortex_src_persist_convratio(vortex_t * return temp; } -#if 0 -static void vortex_src_slowlock(vortex_t * vortex, unsigned char src) -{ - int temp; - - hwwrite(vortex->mmio, VORTEX_SRC_DRIFT2 + (src << 2), 1); - hwwrite(vortex->mmio, VORTEX_SRC_DRIFT0 + (src << 2), 0); - temp = hwread(vortex->mmio, VORTEX_SRC_U0 + (src << 2)); - if (temp & 0x200) - hwwrite(vortex->mmio, VORTEX_SRC_U0 + (src << 2), - temp & ~0x200L); -} - -static void -vortex_src_change_convratio(vortex_t * vortex, unsigned char src, int ratio) -{ - int temp, a; - - if ((ratio & 0x10000) && (ratio != 0x10000)) { - if (ratio & 0x3fff) - a = (0x11 - ((ratio >> 0xe) & 0x3)) - 1; - else - a = (0x11 - ((ratio >> 0xe) & 0x3)) - 2; - } else - a = 0xc; - temp = hwread(vortex->mmio, VORTEX_SRC_U0 + (src << 2)); - if (((temp >> 4) & 0xf) != a) - hwwrite(vortex->mmio, VORTEX_SRC_U0 + (src << 2), - (temp & 0xf) | ((a & 0xf) << 4)); - - vortex_src_persist_convratio(vortex, src, ratio); -} - -static int -vortex_src_checkratio(vortex_t * vortex, unsigned char src, - unsigned int desired_ratio) -{ - int hw_ratio, lifeboat = 0; - - hw_ratio = hwread(vortex->mmio, VORTEX_SRC_CONVRATIO + (src << 2)); - - while (hw_ratio != desired_ratio) { - hwwrite(vortex->mmio, VORTEX_SRC_CONVRATIO + (src << 2), desired_ratio); - - if ((lifeboat++) > 15) { - printk(KERN_ERR "Vortex: could not set src-%d from %d to %d\n", - src, hw_ratio, desired_ratio); - break; - } - } - - return hw_ratio; -} - -#endif /* Objective: Set samplerate for given SRC module. Arguments: @@ -784,19 +650,6 @@ vortex_fifo_clearadbdata(vortex_t * vort (((fifo << FIFO_SIZE_BITS) + x) << 2), 0); } -#if 0 -static void vortex_fifo_adbinitialize(vortex_t * vortex, int fifo, int j) -{ - vortex_fifo_clearadbdata(vortex, fifo, FIFO_SIZE); -#ifdef CHIP_AU8820 - hwwrite(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2), - (FIFO_U1 | ((j & FIFO_MASK) << 0xb))); -#else - hwwrite(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2), - (FIFO_U1 | ((j & FIFO_MASK) << 0xc))); -#endif -} -#endif static void vortex_fifo_setadbvalid(vortex_t * vortex, int fifo, int en) { hwwrite(vortex->mmio, VORTEX_FIFO_ADBCTRL + (fifo << 2), @@ -1329,22 +1182,6 @@ static void vortex_adbdma_pausefifo(vort dma->fifo_status = FIFO_PAUSE; } -#if 0 // Using pause instead -static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) -{ - stream_t *dma = &vortex->dma_adb[adbdma]; - - int this_4 = 0, this_8 = 0; - if (dma->fifo_status == FIFO_START) - vortex_fifo_setadbctrl(vortex, adbdma, dma->dma_unknown, - this_4, this_8, 0, 0); - else if (dma->fifo_status == FIFO_STOP) - return; - dma->fifo_status = FIFO_STOP; - dma->fifo_enabled = 0; -} - -#endif /* WTDMA */ #ifndef CHIP_AU8810 @@ -1483,22 +1320,6 @@ static int vortex_wtdma_bufshift(vortex_ return delta; } -#if 0 -static void -vortex_wtdma_getposition(vortex_t * vortex, int wtdma, int *subbuf, int *pos) -{ - int temp; - temp = hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)); - *subbuf = (temp >> WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK; - *pos = temp & POS_MASK; -} - -static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma) -{ - return ((hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) >> - POS_SHIFT) & POS_MASK); -} -#endif static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma) { stream_t *dma = &vortex->dma_wt[wtdma]; @@ -1743,40 +1564,6 @@ vortex_route(vortex_t * vortex, int en, } } -#if 0 -static void -vortex_routes(vortex_t * vortex, int en, unsigned char channel, - unsigned char source, unsigned char dest0, unsigned char dest1) -{ - ADBRamLink route[2]; - - route[0] = ((source & ADB_MASK) << ADB_SHIFT) | (dest0 & ADB_MASK); - route[1] = ((source & ADB_MASK) << ADB_SHIFT) | (dest1 & ADB_MASK); - - if (en) { - vortex_adb_addroutes(vortex, channel, route, 2); - if ((source < (OFFSET_SRCOUT + NR_SRC)) - && (source >= (OFFSET_SRCOUT))) - vortex_src_addWTD(vortex, (source - OFFSET_SRCOUT), - channel); - else if ((source < (OFFSET_MIXOUT + NR_MIXOUT)) - && (source >= (OFFSET_MIXOUT))) - vortex_mixer_addWTD(vortex, - (source - OFFSET_MIXOUT), channel); - } else { - vortex_adb_delroutes(vortex, channel, route[0], route[1]); - if ((source < (OFFSET_SRCOUT + NR_SRC)) - && (source >= (OFFSET_SRCOUT))) - vortex_src_delWTD(vortex, (source - OFFSET_SRCOUT), - channel); - else if ((source < (OFFSET_MIXOUT + NR_MIXOUT)) - && (source >= (OFFSET_MIXOUT))) - vortex_mixer_delWTD(vortex, - (source - OFFSET_MIXOUT), channel); - } -} - -#endif /* Route two sources to same target. Sources must be of same class !!! */ static void vortex_routeLRT(vortex_t * vortex, int en, unsigned char ch, @@ -1899,44 +1686,6 @@ vortex_connection_mix_src(vortex_t * vor vortex_mix_setvolumebyte(vortex, mix, MIX_DEFOGAIN); // added to original code. } -#if 0 -static void -vortex_connection_adbdma_src_src(vortex_t * vortex, int en, - unsigned char channel, - unsigned char adbdma, unsigned char src0, - unsigned char src1) -{ - vortex_routes(vortex, en, channel, ADB_DMA(adbdma), - ADB_SRCIN(src0), ADB_SRCIN(src1)); -} - -// Connect two mix to AdbDma. -static void -vortex_connection_mix_mix_adbdma(vortex_t * vortex, int en, - unsigned char ch, unsigned char mix0, - unsigned char mix1, unsigned char adbdma) -{ - - ADBRamLink routes[2]; - routes[0] = - (((mix0 + - OFFSET_MIXOUT) & ADB_MASK) << ADB_SHIFT) | (adbdma & ADB_MASK); - routes[1] = - (((mix1 + OFFSET_MIXOUT) & ADB_MASK) << ADB_SHIFT) | ((adbdma + - 0x20) & - ADB_MASK); - if (en) { - vortex_adb_addroutes(vortex, ch, routes, 0x2); - vortex_mixer_addWTD(vortex, mix0, ch); - vortex_mixer_addWTD(vortex, mix1, ch); - } else { - vortex_adb_delroutes(vortex, ch, routes[0], routes[1]); - vortex_mixer_delWTD(vortex, mix0, ch); - vortex_mixer_delWTD(vortex, mix1, ch); - } -} -#endif - /* CODEC connect. */ static void @@ -1946,7 +1695,6 @@ vortex_connect_codecplay(vortex_t * vort vortex_connection_mix_adb(vortex, en, 0x11, mixers[0], ADB_CODECOUT(0)); vortex_connection_mix_adb(vortex, en, 0x11, mixers[1], ADB_CODECOUT(1)); #else -#if 1 // Connect front channels through EQ. vortex_connection_mix_adb(vortex, en, 0x11, mixers[0], ADB_EQIN(0)); vortex_connection_mix_adb(vortex, en, 0x11, mixers[1], ADB_EQIN(1)); @@ -1965,11 +1713,6 @@ vortex_connect_codecplay(vortex_t * vort ADB_CODECOUT(1 + 4)); //printk("SDAC detected "); } -#else - // Use plain direct output to codec. - vortex_connection_mix_adb(vortex, en, 0x11, mixers[0], ADB_CODECOUT(0)); - vortex_connection_mix_adb(vortex, en, 0x11, mixers[1], ADB_CODECOUT(1)); -#endif #endif } @@ -2356,20 +2099,6 @@ static void vortex_settimer(vortex_t * v hwwrite(vortex->mmio, VORTEX_IRQ_STAT, period); } -#if 0 -static void vortex_enable_timer_int(vortex_t * card) -{ - hwwrite(card->mmio, VORTEX_IRQ_CTRL, - hwread(card->mmio, VORTEX_IRQ_CTRL) | IRQ_TIMER | 0x60); -} - -static void vortex_disable_timer_int(vortex_t * card) -{ - hwwrite(card->mmio, VORTEX_IRQ_CTRL, - hwread(card->mmio, VORTEX_IRQ_CTRL) & ~IRQ_TIMER); -} - -#endif static void vortex_enable_int(vortex_t * card) { // CAsp4ISR__EnableVortexInt_void_

1 0