At Wed, 26 Jan 2011 16:58:29 +0100, Adrian Knoth wrote:

diff --git a/include/hdspm.h b/include/hdspm.h index 81990b2..0caf472 100644 --- a/include/hdspm.h +++ b/include/hdspm.h

...

struct hdspm_version {

• uint8_t card_type; /* enum hdspm_io_type */
• char cardname[20];
• unsigned int serial; unsigned short firmware_rev;
• int addons;

};

#define SNDRV_HDSPM_IOCTL_GET_VERSION _IOR('H', 0x43, struct hdspm_version)

Changing the existing ioctl isn't so pretty. If any, I'd vote for changing the ioctl number.

+/* These tables map the ALSA channels 1..N to the channels that we

• need to use in order to find the relevant channel buffer. RME
• refers to this kind of mapping as between "the ADAT channel and
• the DMA channel." We index it using the logical audio channel,
• and the value is the DMA channel (i.e. channel buffer number)
• where the data for that channel can be read/written from/to.

+*/

+static char channel_map_unity_ss[HDSPM_MAX_CHANNELS] = {

• 0, 1, 2, 3, 4, 5, 6, 7,
• 8, 9, 10, 11, 12, 13, 14, 15,
• 16, 17, 18, 19, 20, 21, 22, 23,
• 24, 25, 26, 27, 28, 29, 30, 31,
• 32, 33, 34, 35, 36, 37, 38, 39,
• 40, 41, 42, 43, 44, 45, 46, 47,
• 48, 49, 50, 51, 52, 53, 54, 55,
• 56, 57, 58, 59, 60, 61, 62, 63

+};

Please don't put static arrays in the public header files.

Otherwise it looks OK. It's huge, and maybe there are something to be fixed. But We can fix things after merging.

However, the problem is that this patch isn't applicable cleanly to the latest sound git tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

I can change the patch path easily, but the contents get rejected at this time, and I have no gut to fix manually.

Could you rebase your patch to the git tree above? Or, you can use alsa-driver-snapshot tarball if you don't want to use the whole kernel git tree.

thanks,

Takashi