diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-09-04 16:04:49 -0400 |
|---|---|---|
| committer | Clemens Ladisch <clemens@ladisch.de> | 2013-10-17 15:18:32 -0400 |
| commit | 82fbb4f7b47683077e0716474d4f1ce65a2146cb (patch) | |
| tree | 46dd007994f8e15bee2473e10ef6ef0e007e8fc7 /include/uapi/sound | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
ALSA: add DICE driver
As a start point for further development, this is an incomplete driver
for DICE devices:
- only playback (so no clock source except the bus clock)
- only 44.1 kHz
- no MIDI
- recovery after bus reset is slow
- hwdep device is created, but not actually implemented
Contains compilation fixes by Stefan Richter.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'include/uapi/sound')
| -rw-r--r-- | include/uapi/sound/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/sound/asound.h | 3 | ||||
| -rw-r--r-- | include/uapi/sound/firewire.h | 51 |
3 files changed, 54 insertions, 1 deletions
diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild index 0f7d279ebde3..a7f27704f980 100644 --- a/include/uapi/sound/Kbuild +++ b/include/uapi/sound/Kbuild | |||
| @@ -5,6 +5,7 @@ header-y += asound_fm.h | |||
| 5 | header-y += compress_offload.h | 5 | header-y += compress_offload.h |
| 6 | header-y += compress_params.h | 6 | header-y += compress_params.h |
| 7 | header-y += emu10k1.h | 7 | header-y += emu10k1.h |
| 8 | header-y += firewire.h | ||
| 8 | header-y += hdsp.h | 9 | header-y += hdsp.h |
| 9 | header-y += hdspm.h | 10 | header-y += hdspm.h |
| 10 | header-y += sb16_csp.h | 11 | header-y += sb16_csp.h |
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 041203f20f6d..9fc6219d3848 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h | |||
| @@ -93,9 +93,10 @@ enum { | |||
| 93 | SNDRV_HWDEP_IFACE_SB_RC, /* SB Extigy/Audigy2NX remote control */ | 93 | SNDRV_HWDEP_IFACE_SB_RC, /* SB Extigy/Audigy2NX remote control */ |
| 94 | SNDRV_HWDEP_IFACE_HDA, /* HD-audio */ | 94 | SNDRV_HWDEP_IFACE_HDA, /* HD-audio */ |
| 95 | SNDRV_HWDEP_IFACE_USB_STREAM, /* direct access to usb stream */ | 95 | SNDRV_HWDEP_IFACE_USB_STREAM, /* direct access to usb stream */ |
| 96 | SNDRV_HWDEP_IFACE_FW_DICE, /* TC DICE FireWire device */ | ||
| 96 | 97 | ||
| 97 | /* Don't forget to change the following: */ | 98 | /* Don't forget to change the following: */ |
| 98 | SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM | 99 | SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_DICE |
| 99 | }; | 100 | }; |
| 100 | 101 | ||
| 101 | struct snd_hwdep_info { | 102 | struct snd_hwdep_info { |
diff --git a/include/uapi/sound/firewire.h b/include/uapi/sound/firewire.h new file mode 100644 index 000000000000..e86131ca49e5 --- /dev/null +++ b/include/uapi/sound/firewire.h | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | #ifndef UAPI_SOUND_FIREWIRE_H_INCLUDED | ||
| 2 | #define UAPI_SOUND_FIREWIRE_H_INCLUDED | ||
| 3 | |||
| 4 | #include <linux/ioctl.h> | ||
| 5 | |||
| 6 | /* events can be read() from the hwdep device */ | ||
| 7 | |||
| 8 | #define SNDRV_FIREWIRE_EVENT_LOCK_STATUS 0x000010cc | ||
| 9 | #define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION 0xd1ce004e | ||
| 10 | |||
| 11 | struct snd_firewire_event_common { | ||
| 12 | unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */ | ||
| 13 | }; | ||
| 14 | |||
| 15 | struct snd_firewire_event_lock_status { | ||
| 16 | unsigned int type; | ||
| 17 | unsigned int status; /* 0/1 = unlocked/locked */ | ||
| 18 | }; | ||
| 19 | |||
| 20 | struct snd_firewire_event_dice_notification { | ||
| 21 | unsigned int type; | ||
| 22 | unsigned int notification; /* DICE-specific bits */ | ||
| 23 | }; | ||
| 24 | |||
| 25 | union snd_firewire_event { | ||
| 26 | struct snd_firewire_event_common common; | ||
| 27 | struct snd_firewire_event_lock_status lock_status; | ||
| 28 | struct snd_firewire_event_dice_notification dice_notification; | ||
| 29 | }; | ||
| 30 | |||
| 31 | |||
| 32 | #define SNDRV_FIREWIRE_IOCTL_GET_INFO _IOR('H', 0xf8, struct snd_firewire_get_info) | ||
| 33 | #define SNDRV_FIREWIRE_IOCTL_LOCK _IO('H', 0xf9) | ||
| 34 | #define SNDRV_FIREWIRE_IOCTL_UNLOCK _IO('H', 0xfa) | ||
| 35 | |||
| 36 | #define SNDRV_FIREWIRE_TYPE_DICE 1 | ||
| 37 | /* Fireworks, AV/C, RME, MOTU, ... */ | ||
| 38 | |||
| 39 | struct snd_firewire_get_info { | ||
| 40 | unsigned int type; /* SNDRV_FIREWIRE_TYPE_xxx */ | ||
| 41 | unsigned int card; /* same as fw_cdev_get_info.card */ | ||
| 42 | unsigned char guid[8]; | ||
| 43 | char device_name[16]; /* device node in /dev */ | ||
| 44 | }; | ||
| 45 | |||
| 46 | /* | ||
| 47 | * SNDRV_FIREWIRE_IOCTL_LOCK prevents the driver from streaming. | ||
| 48 | * Returns -EBUSY if the driver is already streaming. | ||
| 49 | */ | ||
| 50 | |||
| 51 | #endif | ||
