Skip to content

Commit

Permalink
ALSA: hdspm - AES32: Use define instead of hardcoded channel count
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Adrian Knoth authored and Takashi Iwai committed Feb 28, 2011
1 parent 8460ae7 commit d2d10a2
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions sound/pci/rme9652/hdspm.c
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
#define AIO_OUT_DS_CHANNELS 12
#define AIO_OUT_QS_CHANNELS 10

#define AES32_CHANNELS 16

/* the size of a substream (1 mono data stream) */
#define HDSPM_CHANNEL_BUFFER_SAMPLES (16*1024)
#define HDSPM_CHANNEL_BUFFER_BYTES (4*HDSPM_CHANNEL_BUFFER_SAMPLES)
Expand Down Expand Up @@ -6449,9 +6451,9 @@ static int __devinit snd_hdspm_create(struct snd_card *card,

switch (hdspm->io_type) {
case AES32:
hdspm->ss_in_channels = hdspm->ss_out_channels = 16;
hdspm->ds_in_channels = hdspm->ds_out_channels = 16;
hdspm->qs_in_channels = hdspm->qs_out_channels = 16;
hdspm->ss_in_channels = hdspm->ss_out_channels = AES32_CHANNELS;
hdspm->ds_in_channels = hdspm->ds_out_channels = AES32_CHANNELS;
hdspm->qs_in_channels = hdspm->qs_out_channels = AES32_CHANNELS;

hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
channel_map_aes32;
Expand All @@ -6466,7 +6468,8 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
hdspm->port_names_in_qs = hdspm->port_names_out_qs =
texts_ports_aes32;

hdspm->max_channels_out = hdspm->max_channels_in = 16;
hdspm->max_channels_out = hdspm->max_channels_in =
AES32_CHANNELS;
hdspm->port_names_in = hdspm->port_names_out =
texts_ports_aes32;
hdspm->channel_map_in = hdspm->channel_map_out =
Expand Down

0 comments on commit d2d10a2

Please sign in to comment.