adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'topic/hdsp' into for-linus

Browse source 
* topic/hdsp:
  ALSA: hdsp - Add a comment about external firmwares for hdsp
  ALSA: hdsp: allow firmware loading from inside the kernel
This commit is contained in:
Takashi Iwai 2009-06-10 07:26:32 +02:00
commit 3c2fcf36d7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/pci/Kconfig
View file

@ -542,6 +542,9 @@ config SND_HDSP
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-hdsp. will be called snd-hdsp.
comment "Don't forget to add built-in firmwares for HDSP driver"
depends on SND_HDSP=y
config SND_HDSPM config SND_HDSPM
tristate "RME Hammerfall DSP MADI" tristate "RME Hammerfall DSP MADI"
select SND_HWDEP select SND_HWDEP

4
sound/pci/rme9652/hdsp.c
View file

@ -403,9 +403,9 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
#define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES) #define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES)
#define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024) #define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024)
/* use hotplug firmeare loader? */ /* use hotplug firmware loader? */
#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP) #if !defined(HDSP_USE_HWDEP_LOADER)
#define HDSP_FW_LOADER #define HDSP_FW_LOADER
#endif #endif
#endif #endif