/*
* ALSA driver for RME Digi32, Digi32/8 and Digi32 PRO audio interfaces
*
- * Copyright (c) 2002, 2003 Martin Langer <martin-langer@gmx.de>
+ * Copyright (c) 2002-2004 Martin Langer <martin-langer@gmx.de>,
+ * Pilo Chambert <pilo.c@wanadoo.fr>
*
* Thanks to : Anders Torger <torger@ludd.luth.se>,
* Henk Hesselink <henk@anda.nl>
* patch would be welcome!
*
* ****************************************************************************
+ *
+ * "The story after the long seeking" -- tiwai
+ *
+ * Ok, the situation regarding the full duplex is now improved a bit.
+ * In the fullduplex mode (given by the module parameter), the hardware buffer
+ * is split to halves for read and write directions at the DMA pointer.
+ * That is, the half above the current DMA pointer is used for write, and
+ * the half below is used for read. To mangle this strange behavior, an
+ * software intermediate buffer is introduced. This is, of course, not good
+ * from the viewpoint of the data transfer efficiency. However, this allows
+ * you to use arbitrary buffer sizes, instead of the fixed I/O buffer size.
+ *
+ * ****************************************************************************
*/
#include <sound/control.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
+#include <sound/pcm-indirect.h>
#include <sound/asoundef.h>
#include <sound/initval.h>
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
+static int fullduplex[SNDRV_CARDS]; // = {[0 ... (SNDRV_CARDS - 1)] = 1};
static int boot_devs;
module_param_array(index, int, boot_devs, 0444);
MODULE_PARM_DESC(index, "Index value for RME Digi32 soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
module_param_array(id, charp, boot_devs, 0444);
MODULE_PARM_DESC(id, "ID string for RME Digi32 soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
module_param_array(enable, bool, boot_devs, 0444);
MODULE_PARM_DESC(enable, "Enable RME Digi32 soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-MODULE_AUTHOR("Martin Langer <martin-langer@gmx.de>");
+module_param_array(fullduplex, bool, boot_devs, 0444);
+MODULE_PARM_DESC(fullduplex, "Support full-duplex mode.");
+MODULE_AUTHOR("Martin Langer <martin-langer@gmx.de>, Pilo Chambert <pilo.c@wanadoo.fr>");
MODULE_DESCRIPTION("RME Digi32, Digi32/8, Digi32 PRO");
MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{RME,Digi32}," "{RME,Digi32/8}," "{RME,Digi32 PRO}}");
+MODULE_SUPPORTED_DEVICE("{{RME,Digi32}," "{RME,Digi32/8}," "{RME,Digi32 PRO}}");
/* Defines for RME Digi32 series */
#define RME32_SPDIF_NCHANNELS 2
#define RME32_WCR_BITPOS_INP_1 7
/* Read control register bits */
-#define RME32_RCR_AUDIO_ADDR_MASK 0x10001
+#define RME32_RCR_AUDIO_ADDR_MASK 0x1ffff
#define RME32_RCR_LOCK (1 << 23) /* 1=locked, 0=not locked */
#define RME32_RCR_ERF (1 << 26) /* 1=Error, 0=no Error */
#define RME32_RCR_FREQ_0 (1 << 27) /* CS841x frequency (record) */
/* Block sizes in bytes */
#define RME32_BLOCK_SIZE 8192
+/* Software intermediate buffer (max) size */
+#define RME32_MID_BUFFER_SIZE (1024*1024)
+
/* Hardware revisions */
#define RME32_32_REVISION 192
#define RME32_328_REVISION_OLD 100
spinlock_t lock;
int irq;
unsigned long port;
- struct resource *res_port;
unsigned long iobase;
u32 wcreg; /* cached write control register value */
size_t playback_periodsize; /* in bytes, zero if not used */
size_t capture_periodsize; /* in bytes, zero if not used */
- snd_pcm_uframes_t playback_last_appl_ptr;
- size_t playback_ptr;
- size_t capture_ptr;
+ unsigned int fullduplex_mode;
+ int running;
+
+ snd_pcm_indirect_t playback_pcm;
+ snd_pcm_indirect_t capture_pcm;
snd_card_t *card;
snd_pcm_t *spdif_pcm;
static int snd_rme32_capture_prepare(snd_pcm_substream_t * substream);
-static int
-snd_rme32_playback_trigger(snd_pcm_substream_t * substream, int cmd);
-
-static int
-snd_rme32_capture_trigger(snd_pcm_substream_t * substream, int cmd);
-
-static snd_pcm_uframes_t
-snd_rme32_playback_pointer(snd_pcm_substream_t * substream);
-
-static snd_pcm_uframes_t
-snd_rme32_capture_pointer(snd_pcm_substream_t * substream);
+static int snd_rme32_pcm_trigger(snd_pcm_substream_t * substream, int cmd);
static void snd_rme32_proc_init(rme32_t * rme32);
static int snd_rme32_create_switches(snd_card_t * card, rme32_t * rme32);
-static inline unsigned int snd_rme32_playback_ptr(rme32_t * rme32)
-{
-
- return (readl(rme32->iobase + RME32_IO_GET_POS)
- & RME32_RCR_AUDIO_ADDR_MASK) >> rme32->playback_frlog;
-}
-
-static inline unsigned int snd_rme32_capture_ptr(rme32_t * rme32)
+static inline unsigned int snd_rme32_pcm_byteptr(rme32_t * rme32)
{
return (readl(rme32->iobase + RME32_IO_GET_POS)
- & RME32_RCR_AUDIO_ADDR_MASK) >> rme32->capture_frlog;
+ & RME32_RCR_AUDIO_ADDR_MASK);
}
static int snd_rme32_ratecode(int rate)
return 0;
}
+/* silence callback for halfduplex mode */
static int snd_rme32_playback_silence(snd_pcm_substream_t * substream, int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
snd_pcm_uframes_t count)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
count <<= rme32->playback_frlog;
pos <<= rme32->playback_frlog;
memset_io(rme32->iobase + RME32_IO_DATA_BUFFER + pos, 0, count);
return 0;
}
+/* copy callback for halfduplex mode */
static int snd_rme32_playback_copy(snd_pcm_substream_t * substream, int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *src, snd_pcm_uframes_t count)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
count <<= rme32->playback_frlog;
pos <<= rme32->playback_frlog;
if (copy_from_user_toio(rme32->iobase + RME32_IO_DATA_BUFFER + pos,
return 0;
}
+/* copy callback for halfduplex mode */
static int snd_rme32_capture_copy(snd_pcm_substream_t * substream, int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *dst, snd_pcm_uframes_t count)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
count <<= rme32->capture_frlog;
pos <<= rme32->capture_frlog;
if (copy_to_user_fromio(dst,
}
/*
- * Digital output capabilites (S/PDIF)
+ * SPDIF I/O capabilites (half-duplex mode)
*/
-static snd_pcm_hardware_t snd_rme32_playback_spdif_info = {
- .info = (SNDRV_PCM_INFO_MMAP |
+static snd_pcm_hardware_t snd_rme32_spdif_info = {
+ .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_PAUSE),
+ SNDRV_PCM_INFO_PAUSE |
+ SNDRV_PCM_INFO_SYNC_START),
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE),
.rates = (SNDRV_PCM_RATE_32000 |
};
/*
- * Digital input capabilites (S/PDIF)
+ * ADAT I/O capabilites (half-duplex mode)
+ */
+static snd_pcm_hardware_t snd_rme32_adat_info =
+{
+ .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
+ SNDRV_PCM_INFO_MMAP_VALID |
+ SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_PAUSE |
+ SNDRV_PCM_INFO_SYNC_START),
+ .formats= SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = (SNDRV_PCM_RATE_44100 |
+ SNDRV_PCM_RATE_48000),
+ .rate_min = 44100,
+ .rate_max = 48000,
+ .channels_min = 8,
+ .channels_max = 8,
+ .buffer_bytes_max = RME32_BUFFER_SIZE,
+ .period_bytes_min = RME32_BLOCK_SIZE,
+ .period_bytes_max = RME32_BLOCK_SIZE,
+ .periods_min = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
+ .periods_max = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
+ .fifo_size = 0,
+};
+
+/*
+ * SPDIF I/O capabilites (full-duplex mode)
*/
-static snd_pcm_hardware_t snd_rme32_capture_spdif_info = {
+static snd_pcm_hardware_t snd_rme32_spdif_fd_info = {
.info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_PAUSE),
+ SNDRV_PCM_INFO_PAUSE |
+ SNDRV_PCM_INFO_SYNC_START),
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE),
.rates = (SNDRV_PCM_RATE_32000 |
.rate_max = 48000,
.channels_min = 2,
.channels_max = 2,
- .buffer_bytes_max = RME32_BUFFER_SIZE,
+ .buffer_bytes_max = RME32_MID_BUFFER_SIZE,
.period_bytes_min = RME32_BLOCK_SIZE,
.period_bytes_max = RME32_BLOCK_SIZE,
- .periods_min = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
- .periods_max = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
+ .periods_min = 2,
+ .periods_max = RME32_MID_BUFFER_SIZE / RME32_BLOCK_SIZE,
.fifo_size = 0,
};
/*
- * Digital output capabilites (ADAT)
+ * ADAT I/O capabilites (full-duplex mode)
*/
-static snd_pcm_hardware_t snd_rme32_playback_adat_info =
+static snd_pcm_hardware_t snd_rme32_adat_fd_info =
{
.info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_PAUSE),
+ SNDRV_PCM_INFO_PAUSE |
+ SNDRV_PCM_INFO_SYNC_START),
.formats= SNDRV_PCM_FMTBIT_S16_LE,
.rates = (SNDRV_PCM_RATE_44100 |
SNDRV_PCM_RATE_48000),
.rate_max = 48000,
.channels_min = 8,
.channels_max = 8,
- .buffer_bytes_max = RME32_BUFFER_SIZE,
+ .buffer_bytes_max = RME32_MID_BUFFER_SIZE,
.period_bytes_min = RME32_BLOCK_SIZE,
.period_bytes_max = RME32_BLOCK_SIZE,
- .periods_min = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
- .periods_max = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
+ .periods_min = 2,
+ .periods_max = RME32_MID_BUFFER_SIZE / RME32_BLOCK_SIZE,
.fifo_size = 0,
};
-/*
- * Digital input capabilites (ADAT)
- */
-static snd_pcm_hardware_t snd_rme32_capture_adat_info =
-{
- .info = (SNDRV_PCM_INFO_MMAP |
- SNDRV_PCM_INFO_MMAP_VALID |
- SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_PAUSE),
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
- .rates = (SNDRV_PCM_RATE_44100 |
- SNDRV_PCM_RATE_48000),
- .rate_min = 44100,
- .rate_max = 48000,
- .channels_min = 8,
- .channels_max = 8,
- .buffer_bytes_max = RME32_BUFFER_SIZE,
- .period_bytes_min = RME32_BLOCK_SIZE,
- .period_bytes_max = RME32_BLOCK_SIZE,
- .periods_min = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
- .periods_max = RME32_BUFFER_SIZE / RME32_BLOCK_SIZE,
- .fifo_size = 0,
-};
-
static void snd_rme32_reset_dac(rme32_t *rme32)
{
writel(rme32->wcreg | RME32_WCR_PD,
snd_pcm_hw_params_t * params)
{
int err, rate, dummy;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ snd_pcm_runtime_t *runtime = substream->runtime;
+
+ if (rme32->fullduplex_mode) {
+ err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+ if (err < 0)
+ return err;
+ } else {
+ runtime->dma_area = (void *)(rme32->iobase + RME32_IO_DATA_BUFFER);
+ runtime->dma_addr = rme32->port + RME32_IO_DATA_BUFFER;
+ runtime->dma_bytes = RME32_BUFFER_SIZE;
+ }
- if ((err = snd_pcm_lib_malloc_pages(substream,
- params_buffer_bytes(params))) < 0)
- return err;
spin_lock_irq(&rme32->lock);
if ((rme32->rcreg & RME32_RCR_KMODE) &&
(rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {
return 0;
}
-static int snd_rme32_playback_hw_free(snd_pcm_substream_t * substream)
-{
- snd_pcm_lib_free_pages(substream);
- return 0;
-}
-
static int
snd_rme32_capture_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * params)
{
- unsigned long flags;
int err, isadat, rate;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- if ((err = snd_pcm_lib_malloc_pages(substream,
- params_buffer_bytes(params))) < 0)
- return err;
- spin_lock_irqsave(&rme32->lock, flags);
+ if (rme32->fullduplex_mode) {
+ err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+ if (err < 0)
+ return err;
+ } else {
+ runtime->dma_area = (void *)rme32->iobase + RME32_IO_DATA_BUFFER;
+ runtime->dma_addr = rme32->port + RME32_IO_DATA_BUFFER;
+ runtime->dma_bytes = RME32_BUFFER_SIZE;
+ }
+
+ spin_lock_irq(&rme32->lock);
/* enable AutoSync for record-preparing */
rme32->wcreg |= RME32_WCR_AUTOSYNC;
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
if ((err = snd_rme32_setformat(rme32, params_format(params))) < 0) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return err;
}
if ((err = snd_rme32_playback_setrate(rme32, params_rate(params))) < 0) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return err;
}
if ((rate = snd_rme32_capture_getrate(rme32, &isadat)) > 0) {
if ((int)params_rate(params) != rate) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EIO;
}
if ((isadat && runtime->hw.channels_min == 2) ||
(!isadat && runtime->hw.channels_min == 8)) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EIO;
}
}
if (rme32->playback_periodsize != 0) {
if (params_period_size(params) << rme32->capture_frlog !=
rme32->playback_periodsize) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EBUSY;
}
}
rme32->capture_periodsize =
params_period_size(params) << rme32->capture_frlog;
- spin_unlock_irqrestore(&rme32->lock, flags);
-
- return 0;
-}
+ spin_unlock_irq(&rme32->lock);
-static int snd_rme32_capture_hw_free(snd_pcm_substream_t * substream)
-{
- snd_pcm_lib_free_pages(substream);
return 0;
}
-static void snd_rme32_playback_start(rme32_t * rme32, int from_pause)
+static int snd_rme32_pcm_hw_free(snd_pcm_substream_t * substream)
{
- if (!from_pause) {
- writel(0, rme32->iobase + RME32_IO_RESET_POS);
- rme32->playback_last_appl_ptr = 0;
- rme32->playback_ptr = 0;
- }
-
- rme32->wcreg |= RME32_WCR_START;
- writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ if (! rme32->fullduplex_mode)
+ return 0;
+ return snd_pcm_lib_free_pages(substream);
}
-static void snd_rme32_capture_start(rme32_t * rme32, int from_pause)
+static void snd_rme32_pcm_start(rme32_t * rme32, int from_pause)
{
if (!from_pause) {
writel(0, rme32->iobase + RME32_IO_RESET_POS);
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
}
-static void snd_rme32_playback_stop(rme32_t * rme32)
+static void snd_rme32_pcm_stop(rme32_t * rme32, int to_pause)
{
/*
* Check if there is an unconfirmed IRQ, if so confirm it, or else
if (rme32->wcreg & RME32_WCR_SEL)
rme32->wcreg |= RME32_WCR_MUTE;
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
-}
-
-static void snd_rme32_capture_stop(rme32_t * rme32)
-{
- rme32->rcreg = readl(rme32->iobase + RME32_IO_CONTROL_REGISTER);
- if (rme32->rcreg & RME32_RCR_IRQ) {
- writel(0, rme32->iobase + RME32_IO_CONFIRM_ACTION_IRQ);
- }
- rme32->wcreg &= ~RME32_WCR_START;
- writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
+ if (! to_pause)
+ writel(0, rme32->iobase + RME32_IO_RESET_POS);
}
static irqreturn_t
static unsigned int period_bytes[] = { RME32_BLOCK_SIZE };
-#define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0])
-
static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = {
- .count = PERIOD_BYTES,
+ .count = ARRAY_SIZE(period_bytes),
.list = period_bytes,
.mask = 0
};
+static void snd_rme32_set_buffer_constraint(rme32_t *rme32, snd_pcm_runtime_t *runtime)
+{
+ if (! rme32->fullduplex_mode) {
+ snd_pcm_hw_constraint_minmax(runtime,
+ SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+ RME32_BUFFER_SIZE, RME32_BUFFER_SIZE);
+ snd_pcm_hw_constraint_list(runtime, 0,
+ SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
+ &hw_constraints_period_bytes);
+ }
+}
+
static int snd_rme32_playback_spdif_open(snd_pcm_substream_t * substream)
{
- unsigned long flags;
int rate, dummy;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_set_sync(substream);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
if (rme32->playback_substream != NULL) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EBUSY;
}
rme32->wcreg &= ~RME32_WCR_ADAT;
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
rme32->playback_substream = substream;
- rme32->playback_last_appl_ptr = 0;
- rme32->playback_ptr = 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
- runtime->hw = snd_rme32_playback_spdif_info;
+ if (rme32->fullduplex_mode)
+ runtime->hw = snd_rme32_spdif_fd_info;
+ else
+ runtime->hw = snd_rme32_spdif_info;
if (rme32->pci->device == PCI_DEVICE_ID_DIGI32_PRO) {
runtime->hw.rates |= SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000;
runtime->hw.rate_max = 96000;
runtime->hw.rate_min = rate;
runtime->hw.rate_max = rate;
}
- snd_pcm_hw_constraint_minmax(runtime,
- SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
- RME32_BUFFER_SIZE, RME32_BUFFER_SIZE);
- snd_pcm_hw_constraint_list(runtime, 0,
- SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
- &hw_constraints_period_bytes);
+
+ snd_rme32_set_buffer_constraint(rme32, runtime);
rme32->wcreg_spdif_stream = rme32->wcreg_spdif;
rme32->spdif_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
static int snd_rme32_capture_spdif_open(snd_pcm_substream_t * substream)
{
- unsigned long flags;
int isadat, rate;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_set_sync(substream);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
if (rme32->capture_substream != NULL) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EBUSY;
}
rme32->capture_substream = substream;
- rme32->capture_ptr = 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
- runtime->hw = snd_rme32_capture_spdif_info;
+ if (rme32->fullduplex_mode)
+ runtime->hw = snd_rme32_spdif_fd_info;
+ else
+ runtime->hw = snd_rme32_spdif_info;
if (RME32_PRO_WITH_8414(rme32)) {
runtime->hw.rates |= SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000;
runtime->hw.rate_max = 96000;
runtime->hw.rate_max = rate;
}
- snd_pcm_hw_constraint_minmax(runtime,
- SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
- RME32_BUFFER_SIZE, RME32_BUFFER_SIZE);
- snd_pcm_hw_constraint_list(runtime, 0,
- SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
- &hw_constraints_period_bytes);
+ snd_rme32_set_buffer_constraint(rme32, runtime);
return 0;
}
static int
snd_rme32_playback_adat_open(snd_pcm_substream_t *substream)
{
- unsigned long flags;
int rate, dummy;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_set_sync(substream);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
if (rme32->playback_substream != NULL) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EBUSY;
}
rme32->wcreg |= RME32_WCR_ADAT;
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
rme32->playback_substream = substream;
- rme32->playback_last_appl_ptr = 0;
- rme32->playback_ptr = 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
- runtime->hw = snd_rme32_playback_adat_info;
+ if (rme32->fullduplex_mode)
+ runtime->hw = snd_rme32_adat_fd_info;
+ else
+ runtime->hw = snd_rme32_adat_info;
if ((rme32->rcreg & RME32_RCR_KMODE) &&
(rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {
/* AutoSync */
runtime->hw.rate_min = rate;
runtime->hw.rate_max = rate;
}
- snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
- RME32_BUFFER_SIZE, RME32_BUFFER_SIZE);
- snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
- &hw_constraints_period_bytes);
+
+ snd_rme32_set_buffer_constraint(rme32, runtime);
return 0;
}
static int
snd_rme32_capture_adat_open(snd_pcm_substream_t *substream)
{
- unsigned long flags;
int isadat, rate;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
- runtime->hw = snd_rme32_capture_adat_info;
+ if (rme32->fullduplex_mode)
+ runtime->hw = snd_rme32_adat_fd_info;
+ else
+ runtime->hw = snd_rme32_adat_info;
if ((rate = snd_rme32_capture_getrate(rme32, &isadat)) > 0) {
if (!isadat) {
return -EIO;
snd_pcm_set_sync(substream);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
if (rme32->capture_substream != NULL) {
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return -EBUSY;
}
rme32->capture_substream = substream;
- rme32->capture_ptr = 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
- snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
- RME32_BUFFER_SIZE, RME32_BUFFER_SIZE);
- snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
- &hw_constraints_period_bytes);
+ snd_rme32_set_buffer_constraint(rme32, runtime);
return 0;
}
static int snd_rme32_playback_close(snd_pcm_substream_t * substream)
{
- unsigned long flags;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
int spdif = 0;
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
rme32->playback_substream = NULL;
rme32->playback_periodsize = 0;
spdif = (rme32->wcreg & RME32_WCR_ADAT) == 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
if (spdif) {
rme32->spdif_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
snd_ctl_notify(rme32->card, SNDRV_CTL_EVENT_MASK_VALUE |
static int snd_rme32_capture_close(snd_pcm_substream_t * substream)
{
- unsigned long flags;
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
rme32->capture_substream = NULL;
rme32->capture_periodsize = 0;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock(&rme32->lock);
return 0;
}
static int snd_rme32_playback_prepare(snd_pcm_substream_t * substream)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
- unsigned long flags;
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
- spin_lock_irqsave(&rme32->lock, flags);
- if (RME32_ISWORKING(rme32)) {
- snd_rme32_playback_stop(rme32);
+ spin_lock_irq(&rme32->lock);
+ if (rme32->fullduplex_mode) {
+ memset(&rme32->playback_pcm, 0, sizeof(rme32->playback_pcm));
+ rme32->playback_pcm.hw_buffer_size = RME32_BUFFER_SIZE;
+ rme32->playback_pcm.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);
+ } else {
+ writel(0, rme32->iobase + RME32_IO_RESET_POS);
}
- writel(0, rme32->iobase + RME32_IO_RESET_POS);
if (rme32->wcreg & RME32_WCR_SEL)
rme32->wcreg &= ~RME32_WCR_MUTE;
writel(rme32->wcreg, rme32->iobase + RME32_IO_CONTROL_REGISTER);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return 0;
}
static int snd_rme32_capture_prepare(snd_pcm_substream_t * substream)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
- unsigned long flags;
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
- spin_lock_irqsave(&rme32->lock, flags);
- if (RME32_ISWORKING(rme32)) {
- snd_rme32_capture_stop(rme32);
+ spin_lock_irq(&rme32->lock);
+ if (rme32->fullduplex_mode) {
+ memset(&rme32->capture_pcm, 0, sizeof(rme32->capture_pcm));
+ rme32->capture_pcm.hw_buffer_size = RME32_BUFFER_SIZE;
+ rme32->capture_pcm.hw_queue_size = RME32_BUFFER_SIZE / 2;
+ rme32->capture_pcm.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);
+ } else {
+ writel(0, rme32->iobase + RME32_IO_RESET_POS);
}
- writel(0, rme32->iobase + RME32_IO_RESET_POS);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return 0;
}
static int
-snd_rme32_playback_trigger(snd_pcm_substream_t * substream, int cmd)
-{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
- switch (cmd) {
- case SNDRV_PCM_TRIGGER_START:
- if (!RME32_ISWORKING(rme32)) {
- if (substream != rme32->playback_substream) {
- return -EBUSY;
+snd_rme32_pcm_trigger(snd_pcm_substream_t * substream, int cmd)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ struct list_head *pos;
+ snd_pcm_substream_t *s;
+
+ spin_lock(&rme32->lock);
+ snd_pcm_group_for_each(pos, substream) {
+ s = snd_pcm_group_substream_entry(pos);
+ if (s != rme32->playback_substream &&
+ s != rme32->capture_substream)
+ continue;
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ rme32->running |= (1 << s->stream);
+ if (rme32->fullduplex_mode) {
+ /* remember the current DMA position */
+ if (s == rme32->playback_substream) {
+ rme32->playback_pcm.hw_io =
+ rme32->playback_pcm.hw_data = snd_rme32_pcm_byteptr(rme32);
+ } else {
+ rme32->capture_pcm.hw_io =
+ rme32->capture_pcm.hw_data = snd_rme32_pcm_byteptr(rme32);
+ }
}
- snd_rme32_playback_start(rme32, 0);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
+ rme32->running &= ~(1 << s->stream);
+ break;
}
- break;
-
- case SNDRV_PCM_TRIGGER_STOP:
- if (RME32_ISWORKING(rme32)) {
- if (substream != rme32->playback_substream) {
- return -EBUSY;
+ snd_pcm_trigger_done(s, substream);
+ }
+
+ /* prefill playback buffer */
+ if (cmd == SNDRV_PCM_TRIGGER_START) {
+ snd_pcm_group_for_each(pos, substream) {
+ s = snd_pcm_group_substream_entry(pos);
+ if (s == rme32->playback_substream) {
+ s->ops->ack(s);
+ break;
}
- snd_rme32_playback_stop(rme32);
}
- break;
+ }
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ if (rme32->running && ! RME32_ISWORKING(rme32))
+ snd_rme32_pcm_start(rme32, 0);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
+ if (! rme32->running && RME32_ISWORKING(rme32))
+ snd_rme32_pcm_stop(rme32, 0);
+ break;
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- if (RME32_ISWORKING(rme32)) {
- snd_rme32_playback_stop(rme32);
- }
+ if (rme32->running && RME32_ISWORKING(rme32))
+ snd_rme32_pcm_stop(rme32, 1);
break;
-
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- if (!RME32_ISWORKING(rme32)) {
- snd_rme32_playback_start(rme32, 1);
- }
+ if (rme32->running && ! RME32_ISWORKING(rme32))
+ snd_rme32_pcm_start(rme32, 1);
break;
-
- default:
- return -EINVAL;
}
+ spin_unlock(&rme32->lock);
return 0;
}
-static int
-snd_rme32_capture_trigger(snd_pcm_substream_t * substream, int cmd)
+/* pointer callback for halfduplex mode */
+static snd_pcm_uframes_t
+snd_rme32_playback_pointer(snd_pcm_substream_t * substream)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
-
- switch (cmd) {
- case SNDRV_PCM_TRIGGER_START:
- if (!RME32_ISWORKING(rme32)) {
- if (substream != rme32->capture_substream) {
- return -EBUSY;
- }
- snd_rme32_capture_start(rme32, 0);
- }
- break;
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ return snd_rme32_pcm_byteptr(rme32) >> rme32->playback_frlog;
+}
- case SNDRV_PCM_TRIGGER_STOP:
- if (RME32_ISWORKING(rme32)) {
- if (substream != rme32->capture_substream) {
- return -EBUSY;
- }
- snd_rme32_capture_stop(rme32);
- }
- break;
+static snd_pcm_uframes_t
+snd_rme32_capture_pointer(snd_pcm_substream_t * substream)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ return snd_rme32_pcm_byteptr(rme32) >> rme32->capture_frlog;
+}
- case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- if (RME32_ISWORKING(rme32)) {
- snd_rme32_capture_stop(rme32);
- }
- break;
- case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- if (!RME32_ISWORKING(rme32)) {
- snd_rme32_capture_start(rme32, 1);
- }
- break;
+/* ack and pointer callbacks for fullduplex mode */
+static void snd_rme32_pb_trans_copy(snd_pcm_substream_t *substream,
+ snd_pcm_indirect_t *rec, size_t bytes)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ memcpy_toio(rme32->iobase + RME32_IO_DATA_BUFFER + rec->hw_data,
+ substream->runtime->dma_area + rec->sw_data, bytes);
+}
- default:
- return -EINVAL;
- }
+static int snd_rme32_playback_fd_ack(snd_pcm_substream_t *substream)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ snd_pcm_indirect_t *rec, *cprec;
+ unsigned long flags;
+ rec = &rme32->playback_pcm;
+ cprec = &rme32->capture_pcm;
+ spin_lock_irqsave(&rme32->lock, flags);
+ rec->hw_queue_size = RME32_BUFFER_SIZE;
+ if (rme32->running & (1 << SNDRV_PCM_STREAM_CAPTURE))
+ rec->hw_queue_size -= cprec->hw_ready;
+ spin_unlock_irqrestore(&rme32->lock, flags);
+ snd_pcm_indirect_playback_transfer(substream, rec,
+ snd_rme32_pb_trans_copy);
return 0;
}
-static snd_pcm_uframes_t
-snd_rme32_playback_pointer(snd_pcm_substream_t * substream)
+static void snd_rme32_cp_trans_copy(snd_pcm_substream_t *substream,
+ snd_pcm_indirect_t *rec, size_t bytes)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
- snd_pcm_runtime_t *runtime = substream->runtime;
- snd_pcm_sframes_t diff;
- size_t bytes;
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ memcpy_fromio(substream->runtime->dma_area + rec->sw_data,
+ rme32->iobase + RME32_IO_DATA_BUFFER + rec->hw_data,
+ bytes);
+}
+static int snd_rme32_capture_fd_ack(snd_pcm_substream_t *substream)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm,
+ snd_rme32_cp_trans_copy);
+ return 0;
+}
- if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
- diff = runtime->control->appl_ptr -
- rme32->playback_last_appl_ptr;
- rme32->playback_last_appl_ptr = runtime->control->appl_ptr;
- if (diff != 0 && diff < -(snd_pcm_sframes_t) (runtime->boundary >> 1)) {
- diff += runtime->boundary;
- }
- bytes = diff << rme32->playback_frlog;
- if (bytes > RME32_BUFFER_SIZE - rme32->playback_ptr) {
- memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER + rme32->playback_ptr),
- runtime->dma_area + rme32->playback_ptr,
- RME32_BUFFER_SIZE - rme32->playback_ptr);
- bytes -= RME32_BUFFER_SIZE - rme32->playback_ptr;
- if (bytes > RME32_BUFFER_SIZE) {
- bytes = RME32_BUFFER_SIZE;
- }
- memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER),
- runtime->dma_area, bytes);
- rme32->playback_ptr = bytes;
- } else if (bytes != 0) {
- memcpy_toio((void *)(rme32->iobase + RME32_IO_DATA_BUFFER + rme32->playback_ptr),
- runtime->dma_area + rme32->playback_ptr, bytes);
- rme32->playback_ptr += bytes;
- }
- }
- return snd_rme32_playback_ptr(rme32);
+static snd_pcm_uframes_t
+snd_rme32_playback_fd_pointer(snd_pcm_substream_t * substream)
+{
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ return snd_pcm_indirect_playback_pointer(substream, &rme32->playback_pcm,
+ snd_rme32_pcm_byteptr(rme32));
}
static snd_pcm_uframes_t
-snd_rme32_capture_pointer(snd_pcm_substream_t * substream)
+snd_rme32_capture_fd_pointer(snd_pcm_substream_t * substream)
{
- rme32_t *rme32 = _snd_pcm_substream_chip(substream);
- snd_pcm_runtime_t *runtime = substream->runtime;
- snd_pcm_uframes_t frameptr;
- size_t ptr;
-
- frameptr = snd_rme32_capture_ptr(rme32);
- if (runtime->access == SNDRV_PCM_ACCESS_MMAP_INTERLEAVED) {
- ptr = frameptr << rme32->capture_frlog;
- if (ptr > rme32->capture_ptr) {
- memcpy_fromio(runtime->dma_area + rme32->capture_ptr,
- (void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
- rme32->capture_ptr),
- ptr - rme32->capture_ptr);
- rme32->capture_ptr += ptr - rme32->capture_ptr;
- } else if (ptr < rme32->capture_ptr) {
- memcpy_fromio(runtime->dma_area + rme32->capture_ptr,
- (void *)(rme32->iobase + RME32_IO_DATA_BUFFER +
- rme32->capture_ptr),
- RME32_BUFFER_SIZE - rme32->capture_ptr);
- memcpy_fromio(runtime->dma_area,
- (void *)(rme32->iobase + RME32_IO_DATA_BUFFER),
- ptr);
- rme32->capture_ptr = ptr;
- }
- }
- return frameptr;
+ rme32_t *rme32 = snd_pcm_substream_chip(substream);
+ return snd_pcm_indirect_capture_pointer(substream, &rme32->capture_pcm,
+ snd_rme32_pcm_byteptr(rme32));
}
+/* for halfduplex mode */
static snd_pcm_ops_t snd_rme32_playback_spdif_ops = {
.open = snd_rme32_playback_spdif_open,
.close = snd_rme32_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_rme32_playback_hw_params,
- .hw_free = snd_rme32_playback_hw_free,
+ .hw_free = snd_rme32_pcm_hw_free,
.prepare = snd_rme32_playback_prepare,
- .trigger = snd_rme32_playback_trigger,
+ .trigger = snd_rme32_pcm_trigger,
.pointer = snd_rme32_playback_pointer,
.copy = snd_rme32_playback_copy,
.silence = snd_rme32_playback_silence,
+ .mmap = snd_pcm_lib_mmap_iomem,
};
static snd_pcm_ops_t snd_rme32_capture_spdif_ops = {
.close = snd_rme32_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_rme32_capture_hw_params,
- .hw_free = snd_rme32_capture_hw_free,
+ .hw_free = snd_rme32_pcm_hw_free,
.prepare = snd_rme32_capture_prepare,
- .trigger = snd_rme32_capture_trigger,
+ .trigger = snd_rme32_pcm_trigger,
.pointer = snd_rme32_capture_pointer,
.copy = snd_rme32_capture_copy,
+ .mmap = snd_pcm_lib_mmap_iomem,
};
static snd_pcm_ops_t snd_rme32_playback_adat_ops = {
.close = snd_rme32_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_rme32_playback_hw_params,
- .hw_free = snd_rme32_playback_hw_free,
.prepare = snd_rme32_playback_prepare,
- .trigger = snd_rme32_playback_trigger,
+ .trigger = snd_rme32_pcm_trigger,
.pointer = snd_rme32_playback_pointer,
.copy = snd_rme32_playback_copy,
.silence = snd_rme32_playback_silence,
+ .mmap = snd_pcm_lib_mmap_iomem,
};
static snd_pcm_ops_t snd_rme32_capture_adat_ops = {
.close = snd_rme32_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = snd_rme32_capture_hw_params,
- .hw_free = snd_rme32_capture_hw_free,
.prepare = snd_rme32_capture_prepare,
- .trigger = snd_rme32_capture_trigger,
+ .trigger = snd_rme32_pcm_trigger,
.pointer = snd_rme32_capture_pointer,
.copy = snd_rme32_capture_copy,
+ .mmap = snd_pcm_lib_mmap_iomem,
+};
+
+/* for fullduplex mode */
+static snd_pcm_ops_t snd_rme32_playback_spdif_fd_ops = {
+ .open = snd_rme32_playback_spdif_open,
+ .close = snd_rme32_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_rme32_playback_hw_params,
+ .hw_free = snd_rme32_pcm_hw_free,
+ .prepare = snd_rme32_playback_prepare,
+ .trigger = snd_rme32_pcm_trigger,
+ .pointer = snd_rme32_playback_fd_pointer,
+ .ack = snd_rme32_playback_fd_ack,
+};
+
+static snd_pcm_ops_t snd_rme32_capture_spdif_fd_ops = {
+ .open = snd_rme32_capture_spdif_open,
+ .close = snd_rme32_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_rme32_capture_hw_params,
+ .hw_free = snd_rme32_pcm_hw_free,
+ .prepare = snd_rme32_capture_prepare,
+ .trigger = snd_rme32_pcm_trigger,
+ .pointer = snd_rme32_capture_fd_pointer,
+ .ack = snd_rme32_capture_fd_ack,
+};
+
+static snd_pcm_ops_t snd_rme32_playback_adat_fd_ops = {
+ .open = snd_rme32_playback_adat_open,
+ .close = snd_rme32_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_rme32_playback_hw_params,
+ .prepare = snd_rme32_playback_prepare,
+ .trigger = snd_rme32_pcm_trigger,
+ .pointer = snd_rme32_playback_fd_pointer,
+ .ack = snd_rme32_playback_fd_ack,
+};
+
+static snd_pcm_ops_t snd_rme32_capture_adat_fd_ops = {
+ .open = snd_rme32_capture_adat_open,
+ .close = snd_rme32_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_rme32_capture_hw_params,
+ .prepare = snd_rme32_capture_prepare,
+ .trigger = snd_rme32_pcm_trigger,
+ .pointer = snd_rme32_capture_fd_pointer,
+ .ack = snd_rme32_capture_fd_ack,
};
static void snd_rme32_free(void *private_data)
return;
}
if (rme32->irq >= 0) {
- snd_rme32_playback_stop(rme32);
- snd_rme32_capture_stop(rme32);
+ snd_rme32_pcm_stop(rme32, 0);
free_irq(rme32->irq, (void *) rme32);
rme32->irq = -1;
}
iounmap((void *) rme32->iobase);
rme32->iobase = 0;
}
- if (rme32->res_port != NULL) {
- release_resource(rme32->res_port);
- rme32->res_port = NULL;
+ if (rme32->port) {
+ pci_release_regions(rme32->pci);
+ rme32->port = 0;
}
}
{
rme32_t *rme32 = (rme32_t *) pcm->private_data;
rme32->spdif_pcm = NULL;
- snd_pcm_lib_preallocate_free_for_all(pcm);
}
static void
{
rme32_t *rme32 = (rme32_t *) pcm->private_data;
rme32->adat_pcm = NULL;
- snd_pcm_lib_preallocate_free_for_all(pcm);
}
static int __devinit snd_rme32_create(rme32_t * rme32)
int err;
rme32->irq = -1;
+ spin_lock_init(&rme32->lock);
if ((err = pci_enable_device(pci)) < 0)
return err;
+ if ((err = pci_request_regions(pci, "RME32")) < 0)
+ return err;
rme32->port = pci_resource_start(rme32->pci, 0);
- if ((rme32->res_port = request_mem_region(rme32->port, RME32_IO_SIZE, "RME32")) == NULL) {
- snd_printk("unable to grab memory region 0x%lx-0x%lx\n",
- rme32->port, rme32->port + RME32_IO_SIZE - 1);
- return -EBUSY;
- }
-
if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {
snd_printk("unable to grab IRQ %d\n", pci->irq);
return -EBUSY;
}
rme32->irq = pci->irq;
- spin_lock_init(&rme32->lock);
if ((rme32->iobase = (unsigned long) ioremap_nocache(rme32->port, RME32_IO_SIZE)) == 0) {
snd_printk("unable to remap memory region 0x%lx-0x%lx\n",
rme32->port, rme32->port + RME32_IO_SIZE - 1);
rme32->spdif_pcm->private_data = rme32;
rme32->spdif_pcm->private_free = snd_rme32_free_spdif_pcm;
strcpy(rme32->spdif_pcm->name, "Digi32 IEC958");
- snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_PLAYBACK,
- &snd_rme32_playback_spdif_ops);
- snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_CAPTURE,
- &snd_rme32_capture_spdif_ops);
-
- rme32->spdif_pcm->info_flags = 0;
-
- snd_pcm_lib_preallocate_pages_for_all(rme32->spdif_pcm,
- SNDRV_DMA_TYPE_CONTINUOUS,
- snd_dma_continuous_data(GFP_KERNEL),
- RME32_BUFFER_SIZE,
- RME32_BUFFER_SIZE);
+ if (rme32->fullduplex_mode) {
+ snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_rme32_playback_spdif_fd_ops);
+ snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_rme32_capture_spdif_fd_ops);
+ snd_pcm_lib_preallocate_pages_for_all(rme32->spdif_pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_dma_continuous_data(GFP_KERNEL),
+ 0, RME32_MID_BUFFER_SIZE);
+ rme32->spdif_pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
+ } else {
+ snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_rme32_playback_spdif_ops);
+ snd_pcm_set_ops(rme32->spdif_pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_rme32_capture_spdif_ops);
+ rme32->spdif_pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
+ }
/* set up ALSA pcm device for ADAT */
if ((pci->device == PCI_DEVICE_ID_DIGI32) ||
rme32->adat_pcm->private_data = rme32;
rme32->adat_pcm->private_free = snd_rme32_free_adat_pcm;
strcpy(rme32->adat_pcm->name, "Digi32 ADAT");
- snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_PLAYBACK,
- &snd_rme32_playback_adat_ops);
- snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_CAPTURE,
- &snd_rme32_capture_adat_ops);
-
- rme32->adat_pcm->info_flags = 0;
-
- snd_pcm_lib_preallocate_pages_for_all(rme32->adat_pcm,
- SNDRV_DMA_TYPE_CONTINUOUS,
- snd_dma_continuous_data(GFP_KERNEL),
- RME32_BUFFER_SIZE,
- RME32_BUFFER_SIZE);
+ if (rme32->fullduplex_mode) {
+ snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_rme32_playback_adat_fd_ops);
+ snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_rme32_capture_adat_fd_ops);
+ snd_pcm_lib_preallocate_pages_for_all(rme32->adat_pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+ snd_dma_continuous_data(GFP_KERNEL),
+ 0, RME32_MID_BUFFER_SIZE);
+ rme32->adat_pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
+ } else {
+ snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_rme32_playback_adat_ops);
+ snd_pcm_set_ops(rme32->adat_pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_rme32_capture_adat_ops);
+ rme32->adat_pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
+ }
}
rme32->capture_periodsize = 0;
/* make sure playback/capture is stopped, if by some reason active */
- snd_rme32_playback_stop(rme32);
- snd_rme32_capture_stop(rme32);
+ snd_rme32_pcm_stop(rme32, 0);
/* reset DAC */
snd_rme32_reset_dac(rme32);
snd_iprintf(buffer, " (index #%d)\n", rme32->card->number + 1);
snd_iprintf(buffer, "\nGeneral settings\n");
+ if (rme32->fullduplex_mode)
+ snd_iprintf(buffer, " Full-duplex mode\n");
+ else
+ snd_iprintf(buffer, " Half-duplex mode\n");
if (RME32_PRO_WITH_8414(rme32)) {
snd_iprintf(buffer, " receiver: CS8414\n");
} else {
snd_rme32_get_loopback_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
ucontrol->value.integer.value[0] =
rme32->wcreg & RME32_WCR_SEL ? 0 : 1;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return 0;
}
static int
snd_rme32_put_loopback_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
unsigned int val;
int change;
val = ucontrol->value.integer.value[0] ? 0 : RME32_WCR_SEL;
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
val = (rme32->wcreg & ~RME32_WCR_SEL) | val;
change = val != rme32->wcreg;
if (ucontrol->value.integer.value[0])
val |= RME32_WCR_MUTE;
writel(rme32->wcreg =
val, rme32->iobase + RME32_IO_CONTROL_REGISTER);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return change;
}
snd_rme32_info_inputtype_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_info_t * uinfo)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
static char *texts[4] = { "Optical", "Coaxial", "Internal", "XLR" };
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
snd_rme32_get_inputtype_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
unsigned int items = 3;
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
ucontrol->value.enumerated.item[0] = snd_rme32_getinputtype(rme32);
switch (rme32->pci->device) {
ucontrol->value.enumerated.item[0] = items - 1;
}
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return 0;
}
static int
snd_rme32_put_inputtype_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
unsigned int val;
int change, items = 3;
}
val = ucontrol->value.enumerated.item[0] % items;
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
change = val != (unsigned int)snd_rme32_getinputtype(rme32);
snd_rme32_setinputtype(rme32, val);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return change;
}
snd_rme32_get_clockmode_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
ucontrol->value.enumerated.item[0] = snd_rme32_getclockmode(rme32);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return 0;
}
static int
snd_rme32_put_clockmode_control(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
unsigned int val;
int change;
val = ucontrol->value.enumerated.item[0] % 3;
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
change = val != (unsigned int)snd_rme32_getclockmode(rme32);
snd_rme32_setclockmode(rme32, val);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return change;
}
static int snd_rme32_control_spdif_get(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
snd_rme32_convert_to_aes(&ucontrol->value.iec958,
rme32->wcreg_spdif);
static int snd_rme32_control_spdif_put(snd_kcontrol_t * kcontrol,
snd_ctl_elem_value_t * ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
int change;
u32 val;
val = snd_rme32_convert_from_aes(&ucontrol->value.iec958);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
change = val != rme32->wcreg_spdif;
rme32->wcreg_spdif = val;
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return change;
}
snd_ctl_elem_value_t *
ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
snd_rme32_convert_to_aes(&ucontrol->value.iec958,
rme32->wcreg_spdif_stream);
snd_ctl_elem_value_t *
ucontrol)
{
- rme32_t *rme32 = _snd_kcontrol_chip(kcontrol);
- unsigned long flags;
+ rme32_t *rme32 = snd_kcontrol_chip(kcontrol);
int change;
u32 val;
val = snd_rme32_convert_from_aes(&ucontrol->value.iec958);
- spin_lock_irqsave(&rme32->lock, flags);
+ spin_lock_irq(&rme32->lock);
change = val != rme32->wcreg_spdif_stream;
rme32->wcreg_spdif_stream = val;
rme32->wcreg &= ~(RME32_WCR_PRO | RME32_WCR_EMP);
writel(rme32->wcreg |= val, rme32->iobase + RME32_IO_CONTROL_REGISTER);
- spin_unlock_irqrestore(&rme32->lock, flags);
+ spin_unlock_irq(&rme32->lock);
return change;
}
int idx, err;
snd_kcontrol_t *kctl;
- for (idx = 0; idx < 7; idx++) {
+ for (idx = 0; idx < (int)ARRAY_SIZE(snd_rme32_controls); idx++) {
if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_rme32_controls[idx], rme32))) < 0)
return err;
if (idx == 1) /* IEC958 (S/PDIF) Stream */
rme32->card = card;
rme32->pci = pci;
snd_card_set_dev(card, &pci->dev);
+ if (fullduplex[dev])
+ rme32->fullduplex_mode = 1;
if ((err = snd_rme32_create(rme32)) < 0) {
snd_card_free(card);
return err;
git://git.onelab.eu / linux-2.6.git / blobdiff