aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAdrian Knoth <adi@drcomp.erfurt.thur.de>2011-02-28 09:14:47 -0500
committerTakashi Iwai <tiwai@suse.de>2011-02-28 09:56:29 -0500
commitd2d10a213294d6719d41aab5a111bce1168914a6 (patch)
treec409cae9b09412def482d397c6cc5ab482bf0b77 /sound
parent8460ae70bb6bf1729bd247465c02b7a8c986c61d (diff)
ALSA: hdspm - AES32: Use define instead of hardcoded channel count
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/rme9652/hdspm.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 5dbf620a32c2..7ce492947583 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -506,6 +506,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
506#define AIO_OUT_DS_CHANNELS 12 506#define AIO_OUT_DS_CHANNELS 12
507#define AIO_OUT_QS_CHANNELS 10 507#define AIO_OUT_QS_CHANNELS 10
508 508
509#define AES32_CHANNELS 16
510
509/* the size of a substream (1 mono data stream) */ 511/* the size of a substream (1 mono data stream) */
510#define HDSPM_CHANNEL_BUFFER_SAMPLES (16*1024) 512#define HDSPM_CHANNEL_BUFFER_SAMPLES (16*1024)
511#define HDSPM_CHANNEL_BUFFER_BYTES (4*HDSPM_CHANNEL_BUFFER_SAMPLES) 513#define HDSPM_CHANNEL_BUFFER_BYTES (4*HDSPM_CHANNEL_BUFFER_SAMPLES)
@@ -6449,9 +6451,9 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
6449 6451
6450 switch (hdspm->io_type) { 6452 switch (hdspm->io_type) {
6451 case AES32: 6453 case AES32:
6452 hdspm->ss_in_channels = hdspm->ss_out_channels = 16; 6454 hdspm->ss_in_channels = hdspm->ss_out_channels = AES32_CHANNELS;
6453 hdspm->ds_in_channels = hdspm->ds_out_channels = 16; 6455 hdspm->ds_in_channels = hdspm->ds_out_channels = AES32_CHANNELS;
6454 hdspm->qs_in_channels = hdspm->qs_out_channels = 16; 6456 hdspm->qs_in_channels = hdspm->qs_out_channels = AES32_CHANNELS;
6455 6457
6456 hdspm->channel_map_in_ss = hdspm->channel_map_out_ss = 6458 hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
6457 channel_map_aes32; 6459 channel_map_aes32;
@@ -6466,7 +6468,8 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
6466 hdspm->port_names_in_qs = hdspm->port_names_out_qs = 6468 hdspm->port_names_in_qs = hdspm->port_names_out_qs =
6467 texts_ports_aes32; 6469 texts_ports_aes32;
6468 6470
6469 hdspm->max_channels_out = hdspm->max_channels_in = 16; 6471 hdspm->max_channels_out = hdspm->max_channels_in =
6472 AES32_CHANNELS;
6470 hdspm->port_names_in = hdspm->port_names_out = 6473 hdspm->port_names_in = hdspm->port_names_out =
6471 texts_ports_aes32; 6474 texts_ports_aes32;
6472 hdspm->channel_map_in = hdspm->channel_map_out = 6475 hdspm->channel_map_in = hdspm->channel_map_out =