[alsa-cvslog] CVS: alsa-kernel/pci als4000.c,1.29,1.30 azt3328.c,1.9,1.10 bt87x.c,1.1,1.2 cmipci.c,1.59,1.60 cs4281.c,1.47,1.48 ens1370.c,1.56,1.57 es1938.c,1.31,1.32 fm801.c,1.41,1.42 maestro3.c,1.46,1.47 rme32.c,1.29,1.30 rme96.c,1.31,1.32 sonicvibes.c,1.31,1.32 via82xx.c,1.88,1.89
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci
Modified Files:
als4000.c azt3328.c bt87x.c cmipci.c cs4281.c ens1370.c
es1938.c fm801.c maestro3.c rme32.c rme96.c sonicvibes.c
via82xx.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: als4000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- als4000.c 24 Feb 2004 12:03:51 - 1.29
+++ als4000.c 2 Mar 2004 15:32:37 - 1.30
@@ -523,7 +523,8 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_als4000_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_als4000_capture_ops);
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 64*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI, chip-pci,
+ 64*1024, 64*1024);
chip-pcm = pcm;
Index: azt3328.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azt3328.c 21 Jan 2004 18:32:47 - 1.9
+++ azt3328.c 2 Mar 2004 15:32:37 - 1.10
@@ -1253,7 +1253,8 @@
strcpy(pcm-name, chip-card-shortname);
chip-pcm = pcm;
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 64*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 64*1024);
snd_azf3328_dbgcallleave();
return 0;
Index: bt87x.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/bt87x.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bt87x.c 28 Jan 2004 18:55:20 - 1.1
+++ bt87x.c 2 Mar 2004 15:32:37 - 1.2
@@ -167,8 +167,8 @@
long opened;
snd_pcm_substream_t *substream;
- u32 *risc;
- dma_addr_t risc_dma;
+ struct snd_dma_device dma_dev;
+ struct snd_dma_buffer dma_risc;
unsigned int line_bytes;
unsigned int lines;
@@ -195,13 +195,14 @@
unsigned int i, offset;
u32 *risc;
- if (!chip-risc) {
- chip-risc = (u32*)snd_malloc_pci_pages
- (chip-pci, PAGE_ALIGN(MAX_RISC_SIZE), chip-risc_dma);
- if (!chip-risc)
+ if (chip-dma_risc.area == NULL) {
+ memset(chip-dma_dev, 0, sizeof(chip-dma_dev));
+ chip-dma_dev.type = SNDRV_DMA_TYPE_PCI;
+ chip-dma_dev.dev.pci = chip-pci;
+ if (snd_dma_alloc_pages(chip-dma_dev, PAGE_ALIGN(MAX_RISC_SIZE),
chip-dma_risc) 0)
return -ENOMEM;
}
- risc = chip-risc;
+ risc = (u32 *)chip-dma_risc.area;
offset = 0;
*risc++ = cpu_to_le32(RISC_SYNC | RISC_SYNC_FM1);
*risc++ = cpu_to_le32(0);
@@ -233,7 +234,7 @@
*risc++ = cpu_to_le32(RISC_SYNC | RISC_SYNC_VRO);
*risc++ = cpu_to_le32(0);
*risc++ = cpu_to_le32(RISC_JUMP);
- *risc++ = cpu_to_le32(chip-risc_dma);
+ *risc++ = cpu_to_le32(chip-dma_risc.addr);
chip-line_bytes = period_bytes;
chip-lines = periods;
return 0;
@@ -241,10 +242,9 @@
static void snd_bt87x_free_risc(bt87x_t *chip)
{
- if (chip-risc) {
- snd_free_pci_pages(chip-pci, PAGE_ALIGN(MAX_RISC_SIZE),
- chip-risc, chip-risc_dma);
- chip-risc = NULL;
+ if (chip-dma_risc.area) {
+ snd_dma_free_pages(chip-dma_dev, chip-dma_risc);
+ chip-dma_risc.area = NULL;
}
}
@@ -459,7 +459,7 @@
spin_lock_irqsave(chip-reg_lock, flags);
chip-current_line = 0;
chip-reg_control |= CTL_FIFO_ENABLE | CTL_RISC_ENABLE | CTL_ACAP_EN;
- snd_bt87x_writel(chip, REG_RISC_STRT_ADD, chip-risc_dma);
+ snd_bt87x_writel(chip, REG_RISC_STRT_ADD, chip-dma_risc.addr);
snd_bt87x_writel(chip, REG_PACKET_LEN,
chip-line_bytes | (chip-lines 16));
snd_bt87x_writel(chip, REG_INT_MASK, MY_INTERRUPTS);
@@ -681,7 +681,9 @@
pcm-private_data = chip;
strcpy(pcm-name, name);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_bt87x_pcm_ops);
- return snd_pcm_lib_preallocate_sg_pages_for_all(chip-pci, pcm,
+ return
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_main.c,1.53,1.54 trident_memory.c,1.11,1.12 trident_synth.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/trident
Modified Files:
trident_main.c trident_memory.c trident_synth.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: trident_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- trident_main.c 22 Feb 2004 18:35:01 - 1.53
+++ trident_main.c 2 Mar 2004 15:32:38 - 1.54
@@ -2189,10 +2189,10 @@
if (trident-tlb.entries) {
snd_pcm_substream_t *substream;
for (substream = pcm-streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
substream; substream = substream-next)
- snd_pcm_lib_preallocate_sg_pages(trident-pci, substream,
64*1024, 128*1024);
- snd_pcm_lib_preallocate_pci_pages(trident-pci,
pcm-streams[SNDRV_PCM_STREAM_CAPTURE].substream, 64*1024, 128*1024);
+ snd_pcm_lib_preallocate_pages(substream,
SNDRV_DMA_TYPE_PCI_SG, trident-pci, 64*1024, 128*1024);
+
snd_pcm_lib_preallocate_pages(pcm-streams[SNDRV_PCM_STREAM_CAPTURE].substream,
SNDRV_DMA_TYPE_PCI, trident-pci, 64*1024, 128*1024);
} else {
- snd_pcm_lib_preallocate_pci_pages_for_all(trident-pci, pcm, 64*1024,
128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
trident-pci, 64*1024, 128*1024);
}
if (rpcm)
@@ -2246,9 +2246,9 @@
trident-foldback = foldback;
if (trident-tlb.entries)
- snd_pcm_lib_preallocate_sg_pages_for_all(trident-pci, foldback, 0,
128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(foldback, SNDRV_DMA_TYPE_PCI_SG,
trident-pci, 0, 128*1024);
else
- snd_pcm_lib_preallocate_pci_pages_for_all(trident-pci, foldback,
64*1024, 128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(foldback, SNDRV_DMA_TYPE_PCI,
trident-pci, 64*1024, 128*1024);
if (rpcm)
*rpcm = foldback;
@@ -2287,7 +2287,7 @@
strcpy(spdif-name, Trident 4DWave IEC958);
trident-spdif = spdif;
- snd_pcm_lib_preallocate_pci_pages_for_all(trident-pci, spdif, 64*1024,
128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(spdif, SNDRV_DMA_TYPE_PCI, trident-pci,
64*1024, 128*1024);
if (rpcm)
*rpcm = spdif;
@@ -3348,13 +3348,12 @@
/* TLB array must be aligned to 16kB !!! so we allocate
32kB region and correct offset when necessary */
- trident-tlb.buffer = snd_malloc_pci_pages(trident-pci, 2 *
SNDRV_TRIDENT_MAX_PAGES * 4, trident-tlb.buffer_dmaaddr);
- if (trident-tlb.buffer == NULL) {
+ if (snd_dma_alloc_pages(trident-dma_dev, 2 * SNDRV_TRIDENT_MAX_PAGES * 4,
trident-tlb.buffer) 0) {
snd_printk(KERN_ERR trident: unable to allocate TLB buffer\n);
return -ENOMEM;
}
- trident-tlb.entries = (unsigned int*)(((unsigned long)trident-tlb.buffer +
SNDRV_TRIDENT_MAX_PAGES * 4 - 1) ~(SNDRV_TRIDENT_MAX_PAGES * 4 - 1));
- trident-tlb.entries_dmaaddr = (trident-tlb.buffer_dmaaddr +
SNDRV_TRIDENT_MAX_PAGES * 4 - 1) ~(SNDRV_TRIDENT_MAX_PAGES * 4 - 1);
+ trident-tlb.entries = (unsigned int*)(((unsigned
long)trident-tlb.buffer.area + SNDRV_TRIDENT_MAX_PAGES * 4 - 1)
~(SNDRV_TRIDENT_MAX_PAGES * 4 - 1));
+ trident-tlb.entries_dmaaddr = (trident-tlb.buffer.addr +
SNDRV_TRIDENT_MAX_PAGES * 4 - 1) ~(SNDRV_TRIDENT_MAX_PAGES * 4 - 1);
/* allocate shadow TLB page table (virtual addresses) */
trident-tlb.shadow_entries = (unsigned long
*)vmalloc(SNDRV_TRIDENT_MAX_PAGES*sizeof(unsigned long));
if (trident-tlb.shadow_entries == NULL) {
@@ -3362,15 +3361,14 @@
return -ENOMEM;
}
/* allocate and setup silent page and initialise TLB entries */
- trident-tlb.silent_page = snd_malloc_pci_pages(trident-pci,
SNDRV_TRIDENT_PAGE_SIZE, trident-tlb.silent_page_dmaaddr);
- if (trident-tlb.silent_page == 0UL) {
+ if (snd_dma_alloc_pages(trident-dma_dev, SNDRV_TRIDENT_PAGE_SIZE,
trident-tlb.silent_page) 0) {
snd_printk(KERN_ERR trident: unable to allocate silent page\n);
return -ENOMEM;
}
- memset(trident-tlb.silent_page, 0, SNDRV_TRIDENT_PAGE_SIZE);
+ memset(trident-tlb.silent_page.area, 0, SNDRV_TRIDENT_PAGE_SIZE);
for (i = 0; i SNDRV_TRIDENT_MAX_PAGES; i++) {
-
[alsa-cvslog] CVS: alsa-kernel/pci/mixart mixart.c,1.4,1.5 mixart.h,1.2,1.3 mixart_hwdep.c,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/pci/mixart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/mixart
Modified Files:
mixart.c mixart.h mixart_hwdep.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: mixart.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mixart.c24 Feb 2004 12:08:03 - 1.4
+++ mixart.c2 Mar 2004 15:32:38 - 1.5
@@ -263,6 +263,9 @@
for (i=0; istream_count; i++) {
int j;
+ struct mixart_flowinfo *flowinfo;
+ struct mixart_bufferinfo *bufferinfo;
+
/* we don't yet know the format, so config 16 bit pcm audio
for instance */
streaming_group_req.stream_info[i].size_max_byte_frame = 1024;
streaming_group_req.stream_info[i].size_max_sample_frame = 256;
@@ -274,16 +277,18 @@
streaming_group_req.flow_entry[i] = j;
- chip-mgr-flowinfo_array[j].bufferinfo_array_phy_address =
(u32)chip-mgr-bufferinfo_physaddr + (j * sizeof(mixart_bufferinfo_t));
- chip-mgr-flowinfo_array[j].bufferinfo_count = 1;
/* 1 will set the miXart to ring-buffer mode ! */
-
- chip-mgr-bufferinfo_array[j].buffer_address = 0;
/* buffer is not yet allocated */
- chip-mgr-bufferinfo_array[j].available_length = 0;
/* buffer is not yet allocated */
+ flowinfo = (struct mixart_flowinfo *)chip-mgr-flowinfo.area;
+ flowinfo[j].bufferinfo_array_phy_address =
(u32)chip-mgr-bufferinfo.addr + (j * sizeof(mixart_bufferinfo_t));
+ flowinfo[j].bufferinfo_count = 1; /* 1 will set
the miXart to ring-buffer mode ! */
+
+ bufferinfo = (struct mixart_bufferinfo
*)chip-mgr-bufferinfo.area;
+ bufferinfo[j].buffer_address = 0; /* buffer is
not yet allocated */
+ bufferinfo[j].available_length = 0; /* buffer is
not yet allocated */
/* construct the identifier of the stream buffer received in
the interrupts ! */
- chip-mgr-bufferinfo_array[j].buffer_id = (chip-chip_idx
MIXART_NOTIFY_CARD_OFFSET) + (pcm_number MIXART_NOTIFY_PCM_OFFSET ) + i;
+ bufferinfo[j].buffer_id = (chip-chip_idx
MIXART_NOTIFY_CARD_OFFSET) + (pcm_number MIXART_NOTIFY_PCM_OFFSET ) + i;
if(capture) {
- chip-mgr-bufferinfo_array[j].buffer_id |=
MIXART_NOTIFY_CAPT_MASK;
+ bufferinfo[j].buffer_id |= MIXART_NOTIFY_CAPT_MASK;
}
}
@@ -602,13 +607,16 @@
err = snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw));
if (err 0) {
+ struct mixart_bufferinfo *bufferinfo;
int i = (chip-chip_idx * MIXART_MAX_STREAM_PER_CARD) +
(stream-pcm_number * (MIXART_PLAYBACK_STREAMS+MIXART_CAPTURE_STREAMS)) + subs-number;
if( subs-stream == SNDRV_PCM_STREAM_CAPTURE ) {
i += MIXART_PLAYBACK_STREAMS; /* in array capture is behind
playback */
}
- mgr-bufferinfo_array[i].buffer_address = subs-runtime-dma_addr;
- mgr-bufferinfo_array[i].available_length = subs-runtime-dma_bytes;
- /* mgr-bufferinfo_array[i].buffer_id is already defined */
+
+ bufferinfo = (struct mixart_bufferinfo *)chip-mgr-bufferinfo.area;
+ bufferinfo[i].buffer_address = subs-runtime-dma_addr;
+ bufferinfo[i].available_length = subs-runtime-dma_bytes;
+ /* bufferinfo[i].buffer_id is already defined */
snd_printdd(snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x)
subs-number(%d)\n, i, subs-runtime-dma_addr, subs-runtime-dma_bytes,
subs-number);
}
@@ -902,7 +910,8 @@
subs-stream 8 | (subs-number + 1) |
(chip-chip_idx + 1) 24;
}
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-mgr-pci, pcm, 32*1024,
32*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-mgr-pci, 32*1024, 32*1024);
}
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci_main.c,1.47,1.48
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/ymfpci
Modified Files:
ymfpci_main.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: ymfpci_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ymfpci_main.c 21 Jan 2004 18:32:48 - 1.47
+++ ymfpci_main.c 2 Mar 2004 15:32:38 - 1.48
@@ -541,20 +541,15 @@
static int __devinit snd_ymfpci_ac3_init(ymfpci_t *chip)
{
- unsigned char *ptr;
- dma_addr_t ptr_addr;
-
- if ((ptr = snd_malloc_pci_pages(chip-pci, 4096, ptr_addr)) == NULL)
+ if (snd_dma_alloc_pages(chip-dma_dev, 4096, chip-ac3_tmp_base) 0)
return -ENOMEM;
- chip-ac3_tmp_base = ptr;
- chip-ac3_tmp_base_addr = ptr_addr;
chip-bank_effect[3][0]-base =
- chip-bank_effect[3][1]-base = cpu_to_le32(chip-ac3_tmp_base_addr);
+ chip-bank_effect[3][1]-base = cpu_to_le32(chip-ac3_tmp_base.addr);
chip-bank_effect[3][0]-loop_end =
chip-bank_effect[3][1]-loop_end = cpu_to_le32(1024);
chip-bank_effect[4][0]-base =
- chip-bank_effect[4][1]-base = cpu_to_le32(chip-ac3_tmp_base_addr + 2048);
+ chip-bank_effect[4][1]-base = cpu_to_le32(chip-ac3_tmp_base.addr + 2048);
chip-bank_effect[4][0]-loop_end =
chip-bank_effect[4][1]-loop_end = cpu_to_le32(1024);
@@ -572,9 +567,9 @@
snd_ymfpci_readl(chip, YDSXGR_MAPOFEFFECT) ~(3 3));
spin_unlock_irq(chip-reg_lock);
// snd_ymfpci_irq_wait(chip);
- if (chip-ac3_tmp_base) {
- snd_free_pci_pages(chip-pci, 4096, chip-ac3_tmp_base,
chip-ac3_tmp_base_addr);
- chip-ac3_tmp_base = NULL;
+ if (chip-ac3_tmp_base.area) {
+ snd_dma_free_pages(chip-dma_dev, chip-ac3_tmp_base);
+ chip-ac3_tmp_base.area = NULL;
}
return 0;
}
@@ -1104,7 +1099,8 @@
strcpy(pcm-name, YMFPCI);
chip-pcm = pcm;
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1149,7 +1145,8 @@
chip-device_id == PCI_DEVICE_ID_YAMAHA_754 ? Direct Recording :
AC'97);
chip-pcm2 = pcm;
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1193,7 +1190,8 @@
strcpy(pcm-name, YMFPCI - IEC958);
chip-pcm_spdif = pcm;
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1237,7 +1235,8 @@
strcpy(pcm-name, YMFPCI - Rear PCM);
chip-pcm_4ch = pcm;
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 256*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 256*1024);
if (rpcm)
*rpcm = pcm;
@@ -1976,12 +1975,11 @@
chip-work_size;
/* work_ptr must be aligned to 256 bytes, but it's already
covered with the kernel page allocation mechanism */
- if ((ptr = snd_malloc_pci_pages(chip-pci, size, ptr_addr)) == NULL)
+ if (snd_dma_alloc_pages(chip-dma_dev, size, chip-work_ptr) 0)
return -ENOMEM;
+ ptr = chip-work_ptr.area;
+ ptr_addr = chip-work_ptr.addr;
memset(ptr, 0, size); /* for sure */
- chip-work_ptr = ptr;
- chip-work_ptr_addr = ptr_addr;
- chip-work_ptr_size = size;
chip-bank_base_playback = ptr;
chip-bank_base_playback_addr = ptr_addr;
@@ -2024,7 +2022,7 @@
chip-work_base = ptr;
chip-work_base_addr = ptr_addr;
- snd_assert(ptr + chip-work_size == chip-work_ptr + chip-work_ptr_size, );
+ snd_assert(ptr + chip-work_size == chip-work_ptr.area +
chip-work_ptr.bytes, );
snd_ymfpci_writel(chip, YDSXGR_PLAYCTRLBASE,
[alsa-cvslog] CVS: alsa-driver/acore memalloc.inc,1.2,1.3 memalloc.patch,1.3,1.4 sgbuf.c,1.5,1.6
Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-driver/acore
Modified Files:
memalloc.inc memalloc.patch sgbuf.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: memalloc.inc
===
RCS file: /cvsroot/alsa/alsa-driver/acore/memalloc.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memalloc.inc10 Nov 2003 17:32:37 - 1.2
+++ memalloc.inc2 Mar 2004 15:32:35 - 1.3
@@ -26,3 +26,50 @@
return res;
}
#endif
+
+static LIST_HEAD(snd_pci_devices);
+
+struct snd_pci_device {
+ struct list_head *list;
+ struct device dev;
+ struct pci_dev *pci;
+};
+
+struct device *snd_kdevice_pci(struct pci_dev *pci)
+{
+ struct snd_pci_device *pdev;
+ struct list_head *pos;
+
+ list_for_each(pos, snd_pci_devices) {
+ pdev = list_entry(pos, struct snd_pci_device, list);
+ if (pdev-pci == pci)
+ return pdev-dev;
+ }
+ pdev = kmalloc(sizeof(struct snd_pci_device), GFP_KERNEL);
+ if (pdev == NULL) {
+ printk(KERN_ERR unable to allocate snd_pci_device struct\n);
+ return NULL;
+ }
+ pdev-dev.d.pci = pci;
+ pdev-dev.dma_mask = pci-dma_mask;
+ return pdev-dev;
+}
+EXPORT_SYMBOL(snd_kdevice_pci);
+
+static void snd_kdevice_free_all(void)
+{
+ struct snd_pci_device *pdev;
+ struct list_head *pos, *n;
+
+ list_for_each_safe(pos, n, snd_pci_devices) {
+ pdev = list_entry(pos, struct snd_pci_device, list);
+ kfree(pdev);
+ }
+}
+
+static const char *snd_kdevice_busid(struct device *dev)
+{
+ if (dev-d.pci)
+ return dev-d.pci-slot_name;
+ return ???;
+}
Index: memalloc.patch
===
RCS file: /cvsroot/alsa/alsa-driver/acore/memalloc.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- memalloc.patch 19 Jan 2004 18:38:28 - 1.3
+++ memalloc.patch 2 Mar 2004 15:32:35 - 1.4
@@ -1,81 +1,69 @@
../../alsa-kernel/core/memalloc.c 2004-01-19 12:52:21.856491159 +0100
-+++ memalloc.c 2004-01-19 13:00:09.973519397 +0100
+--- memalloc.c.old 2004-03-02 11:09:58.0 +0100
memalloc.c 2004-03-02 11:09:17.0 +0100
@@ -1,3 +1,4 @@
+#include memalloc.inc
/*
* Copyright (c) by Jaroslav Kysela [EMAIL PROTECTED]
* Takashi Iwai [EMAIL PROTECTED]
-@@ -73,6 +74,7 @@
- #define snd_assert(expr, args...) /**/
+@@ -461,7 +462,7 @@
#endif
-
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 4, 0)
#ifdef CONFIG_PCI
- #if defined(__i386__) || defined(__ppc__) || defined(__x86_64__)
- #define HACK_PCI_ALLOC_CONSISTENT
-@@ -94,19 +96,31 @@
- dma_addr_t *dma_handle)
- {
- void *ret;
-- u64 dma_mask, cdma_mask;
-+ u64 dma_mask;
-+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-+ u64 cdma_mask;
-+#endif
- unsigned long mask;
-
- if (hwdev == NULL)
- return pci_alloc_consistent(hwdev, size, dma_handle);
- dma_mask = hwdev-dma_mask;
-+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
- cdma_mask = hwdev-consistent_dma_mask;
-- mask = (unsigned long)dma_mask (unsigned long)cdma_mask;
-+#endif
-+ mask = (unsigned long)dma_mask;
-+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
-+ mask = (unsigned long)cdma_mask;
-+#endif
- hwdev-dma_mask = 0x; /* do without masking */
-+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
- hwdev-consistent_dma_mask = 0x; /* do without masking */
-+#endif
- ret = pci_alloc_consistent(hwdev, size, dma_handle);
- hwdev-dma_mask = dma_mask; /* restore */
-+#ifdef CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK
- hwdev-consistent_dma_mask = cdma_mask; /* restore */
-+#endif
- if (ret) {
- /* obtained address is out of range? */
- if (((unsigned long)*dma_handle + size - 1) ~mask) {
-@@ -128,6 +142,7 @@
-
- #endif /* arch */
- #endif /* CONFIG_PCI */
-+#endif /* LINUX = 2.4.0 */
-
-
- /*
-@@ -623,7 +638,7 @@
+ case SNDRV_DMA_TYPE_PCI:
+- dmab-area = snd_malloc_dev_pages(dev-dev.pci-dev, size,
dmab-addr);
++ dmab-area = snd_malloc_dev_pages(snd_kdevice_pci(dev-dev.pci), size,
dmab-addr);
+ break;
+ #endif
+ case SNDRV_DMA_TYPE_DEV:
+@@ -522,7 +523,7 @@
+ #endif
+ #ifdef CONFIG_PCI
+ case SNDRV_DMA_TYPE_PCI
[alsa-cvslog] CVS: alsa-kernel/arm sa11xx-uda1341.c,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/arm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/arm Modified Files: sa11xx-uda1341.c Log Message: Big DMA cleanup originated by Russell King [EMAIL PROTECTED] * Russel - introduced 'struct device' support for 2.6 dma_alloc_coherent() * Jaroslav - removed all bus-specific allocation functions - extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types - recoded all (or almost all) device drivers - sgbuf functions are bus independent now Index: sa11xx-uda1341.c === RCS file: /cvsroot/alsa/alsa-kernel/arm/sa11xx-uda1341.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sa11xx-uda1341.c13 Aug 2003 13:14:31 - 1.12 +++ sa11xx-uda1341.c2 Mar 2004 15:32:35 - 1.13 @@ -840,7 +840,9 @@ * isa works but I'm not sure why (or if) it's the right choice * this may be too large, trying it for now */ - snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 64*1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, + snd_pcm_dma_flags(0), + 64*1024, 64*1024); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_card_sa11xx_uda1341_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_card_sa11xx_uda1341_capture_ops); --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/ad1816a ad1816a_lib.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/isa/ad1816a In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/isa/ad1816a Modified Files: ad1816a_lib.c Log Message: Big DMA cleanup originated by Russell King [EMAIL PROTECTED] * Russel - introduced 'struct device' support for 2.6 dma_alloc_coherent() * Jaroslav - removed all bus-specific allocation functions - extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types - recoded all (or almost all) device drivers - sgbuf functions are bus independent now Index: ad1816a_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1816a/ad1816a_lib.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ad1816a_lib.c 13 Jan 2004 17:11:26 - 1.19 +++ ad1816a_lib.c 2 Mar 2004 15:32:36 - 1.20 @@ -684,7 +684,9 @@ strcpy(pcm-name, snd_ad1816a_chip_id(chip)); snd_ad1816a_init(chip); - snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip-dma1 3 || chip-dma2 3 ? 128*1024 : 64*1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, + snd_pcm_isa_flags(0), + 64*1024, chip-dma1 3 || chip-dma2 3 ? 128*1024 : 64*1024); chip-pcm = pcm; if (rpcm) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/au88x0 au88x0_pcm.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-driver/pci/au88x0
Modified Files:
au88x0_pcm.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: au88x0_pcm.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_pcm.c6 Oct 2003 14:01:05 - 1.1
+++ au88x0_pcm.c2 Mar 2004 15:32:35 - 1.2
@@ -403,7 +403,8 @@
if (idx == VORTEX_PCM_ADB)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_vortex_playback_ops);
/* pre-allocation of buffers */
-snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci_dev, pcm, 0x1, 0x1);
+snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci_dev, 0x1, 0x1);
if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) {
snd_kcontrol_t *kcontrol;
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_pcm.c,1.18,1.19
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/isa/gus
Modified Files:
gus_pcm.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: gus_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_pcm.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gus_pcm.c 20 Dec 2003 09:31:32 - 1.18
+++ gus_pcm.c 2 Mar 2004 15:32:36 - 1.19
@@ -874,7 +874,9 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_gf1_pcm_playback_ops);
for (substream = pcm-streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream;
substream = substream-next)
- snd_pcm_lib_preallocate_isa_pages(substream, 64*1024, gus-gf1.dma1
3 ? 128*1024 : 64*1024);
+ snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_ISA,
+ snd_pcm_isa_flags(0),
+ 64*1024, gus-gf1.dma1 3 ? 128*1024 :
64*1024);
pcm-info_flags = 0;
pcm-dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
@@ -882,7 +884,9 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
snd_gf1_pcm_capture_ops);
if (gus-gf1.dma2 == gus-gf1.dma1)
pcm-info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;
-
snd_pcm_lib_preallocate_isa_pages(pcm-streams[SNDRV_PCM_STREAM_CAPTURE].substream,
64*1024, gus-gf1.dma2 3 ? 128*1024 : 64*1024);
+
snd_pcm_lib_preallocate_pages(pcm-streams[SNDRV_PCM_STREAM_CAPTURE].substream,
+ SNDRV_DMA_TYPE_ISA, snd_pcm_isa_flags(0),
+ 64*1024, gus-gf1.dma2 3 ? 128*1024 :
64*1024);
}
strcpy(pcm-name, pcm-id);
if (gus-interwave) {
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ali5451 ali5451.c,1.41,1.42
Update of /cvsroot/alsa/alsa-kernel/pci/ali5451 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/ali5451 Modified Files: ali5451.c Log Message: Big DMA cleanup originated by Russell King [EMAIL PROTECTED] * Russel - introduced 'struct device' support for 2.6 dma_alloc_coherent() * Jaroslav - removed all bus-specific allocation functions - extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types - recoded all (or almost all) device drivers - sgbuf functions are bus independent now Index: ali5451.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ali5451/ali5451.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ali5451.c 19 Jan 2004 18:37:35 - 1.41 +++ ali5451.c 2 Mar 2004 15:32:37 - 1.42 @@ -1742,7 +1742,8 @@ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_ali_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_ali_capture_ops); - snd_pcm_lib_preallocate_pci_pages_for_all(codec-pci, pcm, 64*1024, 128*1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI, + codec-pci, 64*1024, 128*1024); pcm-info_flags = 0; pcm-dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.52,1.53 rme9652.c,1.40,1.41
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/rme9652
Modified Files:
hdsp.c rme9652.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- hdsp.c 22 Feb 2004 18:41:55 - 1.52
+++ hdsp.c 2 Mar 2004 15:32:38 - 1.53
@@ -568,7 +568,10 @@
struct snd_dma_device pdev;
struct snd_dma_buffer dmbuf;
- snd_dma_device_pci(pdev, pci, capture);
+ memset(pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
dmbuf.bytes = 0;
if (! snd_dma_get_reserved(pdev, dmbuf)) {
if (snd_dma_alloc_pages(pdev, size, dmbuf) 0)
@@ -581,9 +584,13 @@
static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr,
dma_addr_t addr, int capture)
{
- struct snd_dma_device dev;
- snd_dma_device_pci(dev, pci, capture);
- snd_dma_free_reserved(dev);
+ struct snd_dma_device pdev;
+
+ memset(pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
+ snd_dma_free_reserved(pdev);
}
#else
Index: rme9652.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rme9652.c 21 Jan 2004 18:32:48 - 1.40
+++ rme9652.c 2 Mar 2004 15:32:38 - 1.41
@@ -314,7 +314,10 @@
struct snd_dma_device pdev;
struct snd_dma_buffer dmbuf;
- snd_dma_device_pci(pdev, pci, capture);
+ memset(pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
dmbuf.bytes = 0;
if (! snd_dma_get_reserved(pdev, dmbuf)) {
if (snd_dma_alloc_pages(pdev, size, dmbuf) 0)
@@ -327,9 +330,13 @@
static void snd_hammerfall_free_buffer(struct pci_dev *pci, size_t size, void *ptr,
dma_addr_t addr, int capture)
{
- struct snd_dma_device dev;
- snd_dma_device_pci(dev, pci, capture);
- snd_dma_free_reserved(dev);
+ struct snd_dma_device pdev;
+
+ memset(pdev, 0, sizeof(pdev));
+ pdev.type = SNDRV_DMA_TYPE_PCI;
+ pdev.dev.pci = pci;
+ pdev.id = capture;
+ snd_dma_free_reserved(pdev);
}
#else
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.68,1.69
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/pci/cs46xx
Modified Files:
cs46xx_lib.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- cs46xx_lib.c21 Jan 2004 18:32:47 - 1.68
+++ cs46xx_lib.c2 Mar 2004 15:32:37 - 1.69
@@ -699,7 +699,7 @@
bytes = hw_to_end;
if (sw_to_end bytes)
bytes = sw_to_end;
- memcpy(cpcm-hw_area + cpcm-hw_data,
+ memcpy(cpcm-hw_buf.area + cpcm-hw_data,
runtime-dma_area + cpcm-sw_data,
bytes);
cpcm-hw_data += bytes;
@@ -740,7 +740,7 @@
if (sw_to_end bytes)
bytes = sw_to_end;
memcpy(runtime-dma_area + chip-capt.sw_data,
- chip-capt.hw_area + chip-capt.hw_data,
+ chip-capt.hw_buf.area + chip-capt.hw_data,
bytes);
chip-capt.hw_data += bytes;
if ((int)chip-capt.hw_data == buffer_size)
@@ -766,7 +766,7 @@
#else
ptr = snd_cs46xx_peek(chip, BA1_PBA);
#endif
- ptr -= cpcm-hw_addr;
+ ptr -= cpcm-hw_buf.addr;
return ptr cpcm-shift;
}
@@ -784,7 +784,7 @@
#else
ptr = snd_cs46xx_peek(chip, BA1_PBA);
#endif
- ptr -= cpcm-hw_addr;
+ ptr -= cpcm-hw_buf.addr;
bytes = ptr - cpcm-hw_io;
@@ -802,14 +802,14 @@
static snd_pcm_uframes_t snd_cs46xx_capture_direct_pointer(snd_pcm_substream_t *
substream)
{
cs46xx_t *chip = snd_pcm_substream_chip(substream);
- size_t ptr = snd_cs46xx_peek(chip, BA1_CBA) - chip-capt.hw_addr;
+ size_t ptr = snd_cs46xx_peek(chip, BA1_CBA) - chip-capt.hw_buf.addr;
return ptr chip-capt.shift;
}
static snd_pcm_uframes_t snd_cs46xx_capture_indirect_pointer(snd_pcm_substream_t *
substream)
{
cs46xx_t *chip = snd_pcm_substream_chip(substream);
- size_t ptr = snd_cs46xx_peek(chip, BA1_CBA) - chip-capt.hw_addr;
+ size_t ptr = snd_cs46xx_peek(chip, BA1_CBA) - chip-capt.hw_buf.addr;
ssize_t bytes = ptr - chip-capt.hw_io;
int buffer_size = substream-runtime-period_size * CS46XX_FRAGS
chip-capt.shift;
@@ -933,7 +933,7 @@
/* If PCMReaderSCB and SrcTaskSCB not created yet ... */
if ( cpcm-pcm_channel == NULL) {
cpcm-pcm_channel = cs46xx_dsp_create_pcm_channel (chip, sample_rate,
- cpcm,
cpcm-hw_addr,cpcm-pcm_channel_id);
+ cpcm,
cpcm-hw_buf.addr,cpcm-pcm_channel_id);
if (cpcm-pcm_channel == NULL) {
snd_printk(KERN_ERR cs46xx: failed to create virtual PCM
channel\n);
return -ENOMEM;
@@ -946,7 +946,7 @@
cs46xx_dsp_destroy_pcm_channel (chip,cpcm-pcm_channel);
if ( (cpcm-pcm_channel = cs46xx_dsp_create_pcm_channel (chip,
sample_rate, cpcm,
-cpcm-hw_addr,
+
cpcm-hw_buf.addr,
cpcm-pcm_channel_id)) == NULL) {
snd_printk(KERN_ERR cs46xx: failed to re-create virtual PCM
channel\n);
return -ENOMEM;
@@ -1002,11 +1002,11 @@
#endif
if (params_periods(hw_params) == CS46XX_FRAGS) {
- if (runtime-dma_area != cpcm-hw_area)
+ if (runtime-dma_area != cpcm-hw_buf.area)
snd_pcm_lib_free_pages(substream);
- runtime-dma_area = cpcm-hw_area;
- runtime-dma_addr = cpcm-hw_addr;
- runtime-dma_bytes = cpcm-hw_size;
+ runtime-dma_area = cpcm-hw_buf.area;
+ runtime-dma_addr = cpcm-hw_buf.addr;
+ runtime-dma_bytes = cpcm-hw_buf.bytes;
#ifdef CONFIG_SND_CS46XX_NEW_DSP
@@ -1026,7 +1026,7 @@
#endif
} else {
- if (runtime-dma_area == cpcm-hw_area) {
+ if (runtime-dma_area == cpcm-hw_buf.area) {
runtime-dma_area = NULL;
runtime-dma_addr = 0;
[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.71,1.72
Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-driver/include
Modified Files:
adriver.h
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- adriver.h 24 Feb 2004 09:17:30 - 1.71
+++ adriver.h 2 Mar 2004 15:32:35 - 1.72
@@ -437,4 +437,31 @@
#define snd_card_set_dev(card,dev) /* no struct device */
#endif
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0)
+
+struct device {
+ struct {
+#ifdef CONFIG_PCI
+ struct pci_dev *pci;
+#endif
+ } d;
+ u64 *dma_mask;
+};
+
+struct device *snd_kdevice_pci(struct pci_dev *pci);
+
+void *dma_alloc_coherent(struct device *dev, size_t size,
+dma_addr_t *dma_handle, int flag);
+void dma_free_coherent(struct device *dev, size_t size,
+ void *vaddr, dma_addr_t dma_handle);
+
+#else
+
+static inline struct device *snd_kdevice_pci(struct pci_dev *pci)
+{
+ return pci-dev;
+}
+
+#endif
+
#endif /* __SOUND_LOCAL_DRIVER_H */
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci atiixp.c,1.1,1.2 hdspm.c,1.1,1.2 intel8x0m.c,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-driver/pci
Modified Files:
atiixp.c hdspm.c intel8x0m.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/atiixp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- atiixp.c24 Feb 2004 15:23:10 - 1.1
+++ atiixp.c2 Mar 2004 15:32:35 - 1.2
@@ -220,7 +220,6 @@
u32 next; /* address of the next packet descriptor */
} atiixp_dma_desc_t;
-
/*
* stream enum
*/
@@ -242,8 +241,8 @@
*/
struct snd_atiixp_dma {
const atiixp_dma_ops_t *ops;
- atiixp_dma_desc_t *desc;/* packets buffer */
- dma_addr_t desc_addr; /* physical address of packets buffer */
+ struct snd_dma_device desc_dev;
+ struct snd_dma_buffer desc_buf;
snd_pcm_substream_t *substream; /* assigned PCM substream */
unsigned int buf_addr, buf_bytes; /* DMA buffer address, bytes */
unsigned int period_bytes, periods;
@@ -359,9 +358,11 @@
if (periods ATI_MAX_DESCRIPTORS)
return -ENOMEM;
- if (! dma-desc) {
- dma-desc = snd_malloc_pci_pages(chip-pci, ATI_DESC_LIST_SIZE,
dma-desc_addr);
- if (! dma-desc)
+ if (dma-desc_buf.area == NULL) {
+ memset(dma-desc_dev, 0, sizeof(dma-desc_dev));
+ dma-desc_dev.type = SNDRV_DMA_TYPE_PCI;
+ dma-desc_dev.dev.pci = chip-pci;
+ if (snd_dma_alloc_pages(dma-desc_dev, ATI_DESC_LIST_SIZE,
dma-desc_buf) 0)
return -ENOMEM;
dma-period_bytes = dma-periods = 0; /* clear */
}
@@ -378,20 +379,21 @@
/* fill the entries */
addr = (u32)substream-runtime-dma_addr;
- desc_addr = (u32)dma-desc_addr;
+ desc_addr = (u32)dma-desc_buf.addr;
for (i = 0; i periods; i++) {
- dma-desc[i].addr = cpu_to_le32(addr);
- dma-desc[i].status = 0;
- dma-desc[i].size = period_bytes 2; /* in dwords */
+ atiixp_dma_desc_t *desc = ((atiixp_dma_desc_t
*)dma-desc_buf.area)[i];
+ desc-addr = cpu_to_le32(addr);
+ desc-status = 0;
+ desc-size = period_bytes 2; /* in dwords */
desc_addr += sizeof(atiixp_dma_desc_t);
if (i == periods - 1)
- dma-desc[i].next = cpu_to_le32((u32)dma-desc_addr);
+ desc-next = cpu_to_le32((u32)dma-desc_buf.addr);
else
- dma-desc[i].next = cpu_to_le32(desc_addr);
+ desc-next = cpu_to_le32(desc_addr);
addr += period_bytes;
}
- writel(cpu_to_le32((u32)dma-desc_addr | ATI_REG_LINKPTR_EN),
+ writel(cpu_to_le32((u32)dma-desc_buf.addr | ATI_REG_LINKPTR_EN),
chip-remap_addr + dma-ops-llp_offset);
dma-period_bytes = period_bytes;
@@ -405,10 +407,10 @@
*/
static void atiixp_clear_dma_packets(atiixp_t *chip, atiixp_dma_t *dma,
snd_pcm_substream_t *substream)
{
- if (dma-desc) {
+ if (dma-desc_buf.area) {
writel(0, chip-remap_addr + dma-ops-llp_offset);
- snd_free_pci_pages(chip-pci, ATI_DESC_LIST_SIZE, dma-desc,
dma-desc_addr);
- dma-desc = NULL;
+ snd_dma_free_pages(dma-desc_dev, dma-desc_buf);
+ dma-desc_buf.area = NULL;
}
}
@@ -1219,7 +1221,8 @@
pcm-private_data = chip;
strcpy(pcm-name, ATI IXP AC97);
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
+ chip-pci, 64*1024, 128*1024);
/* no SPDIF support on codec? */
if (chip-dmas[ATI_DMA_SPDIF].pcm ! chip-dmas[ATI_DMA_SPDIF].pcm-rates)
@@ -1233,7 +1236,8 @@
pcm-private_data = chip;
strcpy(pcm-name, ATI IXP IEC958);
- snd_pcm_lib_preallocate_pci_pages_for_all(chip-pci, pcm, 64*1024, 128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI, chip-pci,
+ 64*1024, 128*1024);
/* pre-select AC97 SPDIF slots 10/11 */
for (i = 0; i 3; i++) {
Index: hdspm.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/hdspm.c,v
retrieving revision 1.1
[alsa-cvslog] CVS: alsa-kernel/isa cmi8330.c,1.25,1.26 es18xx.c,1.40,1.41 sscape.c,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/isa
Modified Files:
cmi8330.c es18xx.c sscape.c
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: cmi8330.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cmi8330.c 21 Jan 2004 18:32:46 - 1.25
+++ cmi8330.c 2 Mar 2004 15:32:36 - 1.26
@@ -438,7 +438,9 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
chip-streams[SNDRV_PCM_STREAM_PLAYBACK].ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
chip-streams[SNDRV_PCM_STREAM_CAPTURE].ops);
- snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 128*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA,
+ snd_pcm_isa_flags(0),
+ 64*1024, 128*1024);
chip-pcm = pcm;
return 0;
Index: es18xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- es18xx.c26 Jan 2004 14:27:13 - 1.40
+++ es18xx.c2 Mar 2004 15:32:36 - 1.41
@@ -1598,7 +1598,10 @@
sprintf(pcm-name, ESS AudioDrive ES%x, chip-version);
chip-pcm = pcm;
- snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip-dma1 3 ||
chip-dma2 3 ? 128*1024 : 64*1024);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA,
+ snd_pcm_isa_flags(0),
+ 64*1024,
+ chip-dma1 3 || chip-dma2 3 ?
128*1024 : 64*1024);
if (rpcm)
*rpcm = pcm;
Index: sscape.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sscape.c21 Jan 2004 18:32:46 - 1.9
+++ sscape.c2 Mar 2004 15:32:36 - 1.10
@@ -168,23 +168,20 @@
}
-struct dmabuf {
- size_t size;
- unsigned char *data;
- dma_addr_t addr;
-};
-
/*
* Allocates some kernel memory that we can use for DMA.
* I think this means that the memory has to map to
* contiguous pages of physical memory.
*/
-static struct dmabuf *get_dmabuf(struct dmabuf *buf, unsigned long s)
+static struct snd_dma_buffer *get_dmabuf(struct snd_dma_buffer *buf, unsigned long
size)
{
if (buf) {
- buf-data = snd_malloc_isa_pages_fallback(s, buf-addr, buf-size);
- if (!buf-data) {
- snd_printk(KERN_ERR sscape: Failed to allocate %lu bytes for
DMA\n, s);
+ struct snd_dma_device dev;
+ memset(dev, 0, sizeof(dev));
+ dev.type = SNDRV_DMA_TYPE_ISA;
+ dev.dev.flags = GFP_DMA|GFP_ATOMIC;
+ if (snd_dma_alloc_pages_fallback(dev, size, buf) 0) {
+ snd_printk(KERN_ERR sscape: Failed to allocate %lu bytes for
DMA\n, size);
return NULL;
}
}
@@ -195,10 +192,15 @@
/*
* Release the DMA-able kernel memory ...
*/
-static void free_dmabuf(struct dmabuf *buf)
+static void free_dmabuf(struct snd_dma_buffer *buf)
{
- if (buf buf-data)
- snd_free_isa_pages(buf-size, buf-data, buf-addr);
+ if (buf buf-area) {
+ struct snd_dma_device dev;
+ memset(dev, 0, sizeof(dev));
+ dev.type = SNDRV_DMA_TYPE_ISA;
+ dev.dev.flags = GFP_DMA|GFP_ATOMIC;
+ snd_dma_free_pages(dev, buf);
+ }
}
@@ -456,7 +458,7 @@
size_t size)
{
unsigned long flags;
- struct dmabuf dma;
+ struct snd_dma_buffer dma;
int ret;
if (!get_dmabuf(dma, PAGE_ALIGN(size)))
@@ -500,8 +502,8 @@
* comes from USERSPACE. We have already verified
* the userspace pointer ...
*/
- len = min(size, dma.size);
- __copy_from_user(dma.data, data, len);
+ len = min(size, dma.bytes);
+ __copy_from_user(dma.area, data, len);
data += len;
size -= len;
---
SF.Net is sponsored by: Speed Start Your
[alsa-cvslog] CVS: alsa-kernel/include cs46xx.h,1.17,1.18 emu10k1.h,1.37,1.38 memalloc.h,1.2,1.3 pcm.h,1.37,1.38 trident.h,1.15,1.16 ymfpci.h,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/include
Modified Files:
cs46xx.h emu10k1.h memalloc.h pcm.h trident.h ymfpci.h
Log Message:
Big DMA cleanup originated by Russell King [EMAIL PROTECTED]
* Russel
- introduced 'struct device' support for 2.6 dma_alloc_coherent()
* Jaroslav
- removed all bus-specific allocation functions
- extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types
- recoded all (or almost all) device drivers
- sgbuf functions are bus independent now
Index: cs46xx.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/cs46xx.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cs46xx.h23 Oct 2003 14:34:52 - 1.17
+++ cs46xx.h2 Mar 2004 15:32:36 - 1.18
@@ -1646,9 +1646,7 @@
typedef struct _snd_cs46xx cs46xx_t;
typedef struct _snd_cs46xx_pcm_t {
- unsigned char *hw_area;
- dma_addr_t hw_addr; /* PCI bus address, not accessible */
- unsigned long hw_size;
+ struct snd_dma_buffer hw_buf;
unsigned int ctl;
unsigned int shift; /* Shift count to trasform frames in bytes */
@@ -1693,9 +1691,7 @@
unsigned int mode;
struct {
- unsigned char *hw_area;
- dma_addr_t hw_addr; /* PCI bus address, not accessible */
- unsigned long hw_size;
+ struct snd_dma_buffer hw_buf;
unsigned int ctl;
unsigned int shift; /* Shift count to trasform frames in bytes */
@@ -1727,6 +1723,8 @@
unsigned int midcr;
unsigned int uartm;
+ struct snd_dma_device dma_dev;
+
int amplifier;
void (*amplifier_ctrl)(cs46xx_t *, int);
void (*active_ctrl)(cs46xx_t *, int);
Index: emu10k1.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- emu10k1.h 25 Feb 2004 07:32:11 - 1.37
+++ emu10k1.h 2 Mar 2004 15:32:36 - 1.38
@@ -901,9 +901,7 @@
unsigned short extout_mask; /* used external outputs (bitmask) */
unsigned short pad1;
unsigned int itram_size;/* internal TRAM size in samples */
- unsigned int etram_size;/* external TRAM size in samples */
- void *etram_pages; /* allocated pages for external TRAM */
- dma_addr_t etram_pages_dmaaddr;
+ struct snd_dma_buffer etram_pages; /* external TRAM pages and size */
unsigned int dbg; /* FX debugger register */
unsigned char name[128];
int gpr_size; /* size of allocated GPR controls */
@@ -947,11 +945,10 @@
unsigned int card_type; /* EMU10K1_CARD_* */
unsigned int ecard_ctrl;/* ecard control bits */
unsigned long dma_mask; /* PCI DMA mask */
+ struct snd_dma_device dma_dev; /* DMA device description */
int max_cache_pages;/* max memory size / PAGE_SIZE */
- void *silent_page; /* silent page */
- dma_addr_t silent_page_dmaaddr;
- volatile u32 *ptb_pages;/* page table pages */
- dma_addr_t ptb_pages_dmaaddr;
+ struct snd_dma_buffer silent_page; /* silent page */
+ struct snd_dma_buffer ptb_pages;/* page table pages */
snd_util_memhdr_t *memhdr; /* page allocation list */
emu10k1_memblk_t *reserved_page;/* reserved page */
Index: memalloc.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/memalloc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memalloc.h 8 Apr 2003 15:36:30 - 1.2
+++ memalloc.h 2 Mar 2004 15:32:36 - 1.3
@@ -29,13 +29,17 @@
#include asm/sbus.h
#endif
+struct device;
+
/*
* buffer device info
*/
struct snd_dma_device {
int type; /* SNDRV_MEM_TYPE_XXX */
union {
- struct pci_dev *pci;/* for PCI and PCI-SG types */
+ void *data;
+ struct device *dev; /* generic device */
+ struct pci_dev *pci;/* PCI device */
unsigned int flags; /* GFP_XXX for continous and ISA types */
#ifdef CONFIG_SBUS
struct sbus_dev *sbus; /* for SBUS type */
@@ -51,22 +55,10 @@
#define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */
#define SNDRV_DMA_TYPE_ISA 2 /* ISA continuous */
#define SNDRV_DMA_TYPE_PCI 3 /* PCI continuous */
-#define SNDRV_DMA_TYPE_SBUS4 /* SBUS continuous */
-#define
[alsa-cvslog] CVS: alsa-kernel/isa/es1688 es1688_lib.c,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/isa/es1688 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/isa/es1688 Modified Files: es1688_lib.c Log Message: Big DMA cleanup originated by Russell King [EMAIL PROTECTED] * Russel - introduced 'struct device' support for 2.6 dma_alloc_coherent() * Jaroslav - removed all bus-specific allocation functions - extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types - recoded all (or almost all) device drivers - sgbuf functions are bus independent now Index: es1688_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688_lib.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- es1688_lib.c13 Jan 2004 17:11:26 - 1.20 +++ es1688_lib.c2 Mar 2004 15:32:36 - 1.21 @@ -752,7 +752,9 @@ sprintf(pcm-name, snd_es1688_chip_id(chip)); chip-pcm = pcm; - snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, 64*1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, + snd_pcm_isa_flags(0), + 64*1024, 64*1024); if (rpcm) *rpcm = pcm; --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848_lib.c,1.31,1.32
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18820/alsa-kernel/isa/ad1848 Modified Files: ad1848_lib.c Log Message: Big DMA cleanup originated by Russell King [EMAIL PROTECTED] * Russel - introduced 'struct device' support for 2.6 dma_alloc_coherent() * Jaroslav - removed all bus-specific allocation functions - extended snd_dma_alloc_pages/snd_dma_free_pages to handle all bus types - recoded all (or almost all) device drivers - sgbuf functions are bus independent now Index: ad1848_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848_lib.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ad1848_lib.c13 Jan 2004 17:11:26 - 1.31 +++ ad1848_lib.c2 Mar 2004 15:32:36 - 1.32 @@ -1043,7 +1043,9 @@ pcm-info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; strcpy(pcm-name, snd_ad1848_chip_id(chip)); - snd_pcm_lib_preallocate_isa_pages_for_all(pcm, 64*1024, chip-dma 3 ? 128*1024 : 64*1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, + snd_pcm_isa_flags(0), + 64*1024, chip-dma 3 ? 128*1024 : 64*1024); chip-pcm = pcm; if (rpcm) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/ad1816a ad1816a_lib.c,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/isa/ad1816a In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa/ad1816a Modified Files: ad1816a_lib.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: ad1816a_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1816a/ad1816a_lib.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ad1816a_lib.c 2 Mar 2004 15:32:36 - 1.20 +++ ad1816a_lib.c 2 Mar 2004 15:38:14 - 1.21 @@ -685,7 +685,7 @@ snd_ad1816a_init(chip); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, chip-dma1 3 || chip-dma2 3 ? 128*1024 : 64*1024); chip-pcm = pcm; --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_pcm.c,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa/gus Modified Files: gus_pcm.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: gus_pcm.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_pcm.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gus_pcm.c 2 Mar 2004 15:32:36 - 1.19 +++ gus_pcm.c 2 Mar 2004 15:38:14 - 1.20 @@ -875,7 +875,7 @@ for (substream = pcm-streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream-next) snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, gus-gf1.dma1 3 ? 128*1024 : 64*1024); pcm-info_flags = 0; @@ -885,7 +885,7 @@ if (gus-gf1.dma2 == gus-gf1.dma1) pcm-info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX; snd_pcm_lib_preallocate_pages(pcm-streams[SNDRV_PCM_STREAM_CAPTURE].substream, - SNDRV_DMA_TYPE_ISA, snd_pcm_isa_flags(0), + SNDRV_DMA_TYPE_ISA, snd_pcm_dma_flags(0), 64*1024, gus-gf1.dma2 3 ? 128*1024 : 64*1024); } strcpy(pcm-name, pcm-id); --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/sb sb16_main.c,1.18,1.19 sb8_main.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/isa/sb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa/sb Modified Files: sb16_main.c sb8_main.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: sb16_main.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sb16_main.c 2 Mar 2004 15:32:37 - 1.18 +++ sb16_main.c 2 Mar 2004 15:38:14 - 1.19 @@ -882,7 +882,7 @@ pcm-info_flags = SNDRV_PCM_INFO_HALF_DUPLEX; snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, 128*1024); if (rpcm) Index: sb8_main.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8_main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sb8_main.c 2 Mar 2004 15:32:37 - 1.13 +++ sb8_main.c 2 Mar 2004 15:38:14 - 1.14 @@ -536,7 +536,7 @@ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_sb8_capture_ops); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, 64*1024); if (rpcm) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4231_lib.c,1.35,1.36
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa/cs423x Modified Files: cs4231_lib.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: cs4231_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231_lib.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- cs4231_lib.c2 Mar 2004 15:32:36 - 1.35 +++ cs4231_lib.c2 Mar 2004 15:38:14 - 1.36 @@ -1654,7 +1654,7 @@ #ifdef LEGACY_SUPPORT snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, chip-dma1 3 || chip-dma2 3 ? 128*1024 : 64*1024); #else # ifdef EBUS_SUPPORT --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa cmi8330.c,1.26,1.27 es18xx.c,1.41,1.42
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa Modified Files: cmi8330.c es18xx.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: cmi8330.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- cmi8330.c 2 Mar 2004 15:32:36 - 1.26 +++ cmi8330.c 2 Mar 2004 15:38:14 - 1.27 @@ -439,7 +439,7 @@ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, chip-streams[SNDRV_PCM_STREAM_CAPTURE].ops); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, 128*1024); chip-pcm = pcm; Index: es18xx.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- es18xx.c2 Mar 2004 15:32:36 - 1.41 +++ es18xx.c2 Mar 2004 15:38:14 - 1.42 @@ -1599,7 +1599,7 @@ chip-pcm = pcm; snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, chip-dma1 3 || chip-dma2 3 ? 128*1024 : 64*1024); --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa/es1688 es1688_lib.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/isa/es1688 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20972/isa/es1688 Modified Files: es1688_lib.c Log Message: Fixed old function name (snd_pcm_isa_flags - snd_pcm_dma_flags) Index: es1688_lib.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688_lib.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- es1688_lib.c2 Mar 2004 15:32:36 - 1.21 +++ es1688_lib.c2 Mar 2004 15:38:14 - 1.22 @@ -753,7 +753,7 @@ chip-pcm = pcm; snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_ISA, - snd_pcm_isa_flags(0), + snd_pcm_dma_flags(0), 64*1024, 64*1024); if (rpcm) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core Kconfig,1.2,1.3 Makefile,1.49,1.50
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2295/core Modified Files: Kconfig Makefile Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/core/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Kconfig 10 Jun 2003 14:07:20 - 1.2 +++ Kconfig 2 Mar 2004 16:42:36 - 1.3 @@ -3,9 +3,23 @@ tristate Emulation for 32-bit applications depends on SND (SPARC64 || PPC64 || X86_64 IA32_EMULATION) +config SND_TIMER + tristate + +config SND_PCM + tristate + select SND_TIMER + +config SND_HWDEP + tristate + +config SND_RAWMIDI + tristate + config SND_SEQUENCER tristate Sequencer support depends on SND + select SND_TIMER help Say 'Y' or 'M' to enable MIDI sequencer and router support. This feature allows routing and enqueing MIDI events. Events can be processed at given @@ -20,26 +34,27 @@ immediately. config SND_OSSEMUL - bool OSS API emulation - depends on SND - help - Say 'Y' to enable OSS (Open Sound System) API emulation code. + bool config SND_MIXER_OSS tristate OSS Mixer API - depends on SND_OSSEMUL SND + depends on SND + select SND_OSSEMUL help Say 'Y' or 'M' to enable mixer OSS API emulation (/dev/mixer*). config SND_PCM_OSS tristate OSS PCM (digital audio) API - depends on SND_OSSEMUL SND + depends on SND + select SND_OSSEMUL + select SND_PCM help Say 'Y' or 'M' to enable digital audio (PCM) OSS API emulation (/dev/dsp*). config SND_SEQUENCER_OSS bool OSS Sequencer API - depends on SND_OSSEMUL SND_SEQUENCER + depends on SND_SEQUENCER + select SND_OSSEMUL help Say 'Y' to enable OSS sequencer emulation (both /dev/sequencer and /dev/music interfaces). @@ -47,6 +62,7 @@ config SND_RTCTIMER tristate RTC Timer support depends on SND RTC + select SND_TIMER help Say 'Y' or 'M' to enable RTC timer support for ALSA. ALSA code uses RTC timer as precise timing source and maps the RTC timer to the ALSA's timer Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- Makefile2 Mar 2004 15:32:35 - 1.49 +++ Makefile2 Mar 2004 16:42:36 - 1.50 @@ -23,15 +23,14 @@ snd-hwdep-objs:= hwdep.o obj-$(CONFIG_SND) += snd.o -ifeq ($(subst m,y,$(CONFIG_RTC)),y) - obj-$(CONFIG_SND_RTCTIMER) += snd-timer.o - obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o -endif -obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o +obj-$(CONFIG_SND_HWDEP)+= snd-hwdep.o +obj-$(CONFIG_SND_TIMER)+= snd-timer.o +obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o +obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o +obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o -obj-$(CONFIG_SND_MIXER_OSS) += oss/ -obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o snd-timer.o snd-page-alloc.o oss/ -obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o seq/ +obj-$(CONFIG_SND_OSSEMUL) += oss/ +obj-$(CONFIG_SND_SEQUENCER)+= seq/ obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/ # Toplevel Module Dependency --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/arm Kconfig,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/arm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/arm Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/arm/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Kconfig 31 Oct 2002 13:44:20 - 1.1 +++ Kconfig 2 Mar 2004 19:22:23 - 1.2 @@ -6,6 +6,7 @@ config SND_SA11XX_UDA1341 tristate SA11xx UDA1341TS driver (H3600) depends on ARCH_SA1100 SND L3 + select SND_PCM help Say Y or M if you have a Compaq iPaq H3x00 handheld computer and want to use its Philips UDA 1341 audio chip. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers Kconfig,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/drivers Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/drivers/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Kconfig 31 Oct 2002 13:44:21 - 1.1 +++ Kconfig 2 Mar 2004 19:22:24 - 1.2 @@ -6,6 +6,7 @@ config SND_DUMMY tristate Dummy (/dev/null) soundcard depends on SND + select SND_PCM help Say 'Y' or 'M' to include dummy driver. This driver does nothing, but emulates various mixer controls and PCM devices. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/usb Kconfig,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/usb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/usb Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/usb/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Kconfig 10 Dec 2002 15:22:07 - 1.2 +++ Kconfig 2 Mar 2004 19:22:24 - 1.3 @@ -6,6 +6,7 @@ config SND_USB_AUDIO tristate USB Audio/MIDI driver depends on SND USB + select SND_PCM help Say 'Y' or 'M' to include support for USB audio and USB MIDI devices. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core Makefile,1.50,1.51
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/core Modified Files: Makefile Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- Makefile2 Mar 2004 16:42:36 - 1.50 +++ Makefile2 Mar 2004 19:22:24 - 1.51 @@ -22,7 +22,7 @@ snd-rtctimer-objs := rtctimer.o snd-hwdep-objs:= hwdep.o -obj-$(CONFIG_SND) += snd.o +obj-$(CONFIG_SND) += snd.o obj-$(CONFIG_SND_HWDEP)+= snd-hwdep.o obj-$(CONFIG_SND_TIMER)+= snd-timer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o @@ -34,76 +34,58 @@ obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/ # Toplevel Module Dependency -obj-$(CONFIG_SND_DUMMY) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o -obj-$(CONFIG_SND_VIRMIDI) += snd-rawmidi.o snd.o snd-timer.o -obj-$(CONFIG_SND_SERIAL_U16550) += snd-rawmidi.o snd.o snd-timer.o -obj-$(CONFIG_SND_MTPAV) += snd-rawmidi.o snd.o snd-timer.o -obj-$(CONFIG_SND_MPU401) += snd-rawmidi.o snd.o snd-timer.o -obj-$(CONFIG_SND_ALS100) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AZT2320) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AZT3328) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CMI8330) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o -obj-$(CONFIG_SND_DT019X) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES18XX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPL3SA2) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SGALAXY) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o -obj-$(CONFIG_SND_AD1816A) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AD1848) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o -obj-$(CONFIG_SND_CS4231) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_CS4232) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CS4236) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES1688) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_GUSCLASSIC) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_GUSMAX) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_GUSEXTREME) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_INTERWAVE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_INTERWAVE_STB) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPTI93X) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SB8) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SB16) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SBAWE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES968) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_WAVEFRONT) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SSCAPE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ALS4000) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CMIPCI) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CS4281) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ENS1370) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_ENS1371) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o -obj-$(CONFIG_SND_ES1938) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o
[alsa-cvslog] CVS: alsa-kernel/parisc Kconfig,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/parisc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/parisc Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/parisc/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Kconfig 23 May 2003 10:07:28 - 1.1 +++ Kconfig 2 Mar 2004 19:22:24 - 1.2 @@ -6,6 +6,7 @@ config SND_HARMONY tristate Harmony/Vivace sound chip depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Harmony/Vivace soundchip on HP712s, 715/new and many other GSC based machines. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/pci Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Kconfig 1 Mar 2004 08:14:46 - 1.16 +++ Kconfig 2 Mar 2004 19:22:24 - 1.17 @@ -6,18 +6,21 @@ config SND_ALI5451 tristate ALi PCI Audio M5451 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core. config SND_AZT3328 tristate Aztech AZF3328 / PCI168 (EXPERIMENTAL) depends on SND EXPERIMENTAL + select SND_PCM help Say 'Y' or 'M' to include support for Aztech AZF3328 (PCI168) soundcards. config SND_BT87X tristate Bt87x Audio Capture depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for recording audio from TV cards based on Brooktree Bt878/Bt879 chips. @@ -25,6 +28,7 @@ config SND_CS46XX tristate Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x depends on SND + select SND_PCM select GAMEPORT help Say 'Y' or 'M' to include support for Cirrus Logic CS4610 / CS4612 / @@ -39,12 +43,14 @@ config SND_CS4281 tristate Cirrus Logic (Sound Fusion) CS4281 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Cirrus Logic CS4281. config SND_EMU10K1 tristate EMU10K1 (SB Live! Audigy, E-mu APS) depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Sound Blaster PCI 512, Live!, Audigy and E-mu APS (partially supported). @@ -52,24 +58,28 @@ config SND_KORG1212 tristate Korg 1212 IO depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Korg 1212IO. config SND_MIXART tristate Digigram miXart depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Digigram miXart soundcard. config SND_NM256 tristate NeoMagic NM256AV/ZX depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for NeoMagic NM256AV/ZX chips. config SND_RME32 tristate RME Digi32, 32/8, 32 PRO depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for RME Digi32, Digi32 PRO and Digi32/8 (Sek'd Prodif32, Prodif96 and Prodif Gold) audio devices. @@ -77,6 +87,7 @@ config SND_RME96 tristate RME Digi96, 96/8, 96/8 PRO depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for RME Digi96, Digi96/8 and Digi96/8 PRO/PAD/PST. @@ -84,6 +95,7 @@ config SND_RME9652 tristate RME Digi9652 (Hammerfall) depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for RME Hammerfall (RME Digi9652 / Digi9636) soundcards. @@ -91,6 +103,7 @@ config SND_HDSP tristate RME Hammerfall DSP Audio depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for RME Hammerfall DSP Audio soundcards. @@ -98,6 +111,7 @@ config SND_TRIDENT tristate Trident 4D-Wave DX/NX; SiS 7018 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and SiS 7018 soundcards. @@ -105,6 +119,7 @@ config SND_YMFPCI tristate Yamaha YMF724/740/744/754 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Yamaha PCI audio chips - YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754. @@ -112,12 +127,14 @@ config SND_ALS4000 tristate Avance Logic ALS4000 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for Avance Logic ALS4000. config SND_CMIPCI tristate C-Media 8738, 8338 depends on SND + select SND_PCM help Say 'Y' or 'M' to include support for C-Media CMI8338 and 8738 PCI soundcards. @@ -125,12 +142,14 @@ config
[alsa-cvslog] CVS: alsa-kernel/ppc Kconfig,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/ppc Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/ppc/Kconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Kconfig 31 Oct 2002 13:44:21 - 1.1 +++ Kconfig 2 Mar 2004 19:22:24 - 1.2 @@ -6,6 +6,7 @@ config SND_POWERMAC tristate PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest) depends on SND + select SND_PCM endmenu --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia Kconfig,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/pcmcia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7304/pcmcia Modified Files: Kconfig Log Message: This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add select SND_PCM statements to appropriate Kconfig entries for drivers whose configuration symbol is used to build snd-pcm, snd-timer, and snd-page-alloc. - Remove snd-pcm, snd-timer and snd-page-alloc from these in sound/core/Makefile. - Remove snd from these entries as well - all SND_xxx configuration symbols depend on CONFIG_SND, so we won't even consider building any of these drivers unless SND is already set to 'y' or 'm'. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Kconfig 23 Feb 2004 19:10:23 - 1.3 +++ Kconfig 2 Mar 2004 19:22:24 - 1.4 @@ -6,12 +6,14 @@ config SND_VXPOCKET tristate Digigram VXpocket depends on SND PCMCIA ISA + select SND_PCM help Say 'Y' or 'M' to include support for Digigram VXpocket soundcard. config SND_VXP440 tristate Digigram VXpocket 440 depends on SND PCMCIA ISA + select SND_PCM help Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/pci Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_RAWMIDI for drivers which use the snd-rawmidi module. - Remove snd-rawmidi from these drivers entries in sound/core/Makefile - Remove any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Kconfig 2 Mar 2004 19:22:24 - 1.17 +++ Kconfig 2 Mar 2004 19:26:13 - 1.18 @@ -6,6 +6,7 @@ config SND_ALI5451 tristate ALi PCI Audio M5451 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core. @@ -13,6 +14,7 @@ config SND_AZT3328 tristate Aztech AZF3328 / PCI168 (EXPERIMENTAL) depends on SND EXPERIMENTAL + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Aztech AZF3328 (PCI168) soundcards. @@ -28,6 +30,7 @@ config SND_CS46XX tristate Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x depends on SND + select SND_RAWMIDI select SND_PCM select GAMEPORT help @@ -43,6 +46,7 @@ config SND_CS4281 tristate Cirrus Logic (Sound Fusion) CS4281 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Cirrus Logic CS4281. @@ -50,6 +54,7 @@ config SND_EMU10K1 tristate EMU10K1 (SB Live! Audigy, E-mu APS) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Sound Blaster PCI 512, Live!, @@ -103,6 +108,7 @@ config SND_HDSP tristate RME Hammerfall DSP Audio depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for RME Hammerfall DSP Audio @@ -111,6 +117,7 @@ config SND_TRIDENT tristate Trident 4D-Wave DX/NX; SiS 7018 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and @@ -119,6 +126,7 @@ config SND_YMFPCI tristate Yamaha YMF724/740/744/754 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Yamaha PCI audio chips - @@ -127,6 +135,7 @@ config SND_ALS4000 tristate Avance Logic ALS4000 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Avance Logic ALS4000. @@ -134,6 +143,7 @@ config SND_CMIPCI tristate C-Media 8738, 8338 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for C-Media CMI8338 and 8738 PCI @@ -142,6 +152,7 @@ config SND_ENS1370 tristate (Creative) Ensoniq AudioPCI 1370 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1370. @@ -149,6 +160,7 @@ config SND_ENS1371 tristate (Creative) Ensoniq AudioPCI 1371/1373 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1371 and @@ -157,6 +169,7 @@ config SND_ES1938 tristate ESS ES1938/1946/1969 (Solo-1) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969) @@ -165,6 +178,7 @@ config SND_ES1968 tristate ESS ES1968/1978 (Maestro-1/2/2E) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ESS Maestro 1/2/2E. @@ -179,6 +193,7 @@ config SND_FM801 tristate ForteMedia FM801 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ForteMedia FM801 based soundcards. @@ -194,6 +209,7 @@ config SND_ICE1712 tristate ICEnsemble ICE1712 (Envy24) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ICE1712 (Envy24) based soundcards. @@ -204,6 +220,7 @@ config SND_ICE1724 tristate ICE/VT1724 (Envy24HT) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ICE/VT1724 (Envy24HT) based @@ -214,6 +231,7 @@ config SND_INTEL8X0
[alsa-cvslog] CVS: alsa-kernel/isa Kconfig,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/isa Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_RAWMIDI for drivers which use the snd-rawmidi module. - Remove snd-rawmidi from these drivers entries in sound/core/Makefile - Remove any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/isa/Kconfig,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Kconfig 2 Mar 2004 19:22:24 - 1.7 +++ Kconfig 2 Mar 2004 19:26:13 - 1.8 @@ -6,6 +6,7 @@ config SND_AD1816A tristate Analog Devices SoundPort AD1816A depends on SND ISAPNP + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Analog Devices SoundPort AD1816A or @@ -23,6 +24,7 @@ config SND_CS4231 tristate Generic Cirrus Logic CS4231 driver depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for CS4231 chips from Cirrus Logic - @@ -31,6 +33,7 @@ config SND_CS4232 tristate Generic Cirrus Logic CS4232 driver depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for CS4232 chips from Cirrus Logic - @@ -39,6 +42,7 @@ config SND_CS4236 tristate Generic Cirrus Logic CS4236+ driver depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239 @@ -47,6 +51,7 @@ config SND_PC98_CS4232 tristate NEC PC9800 CS4232 driver depends on SND X86_PC9800 + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for NEC PC-9801/PC-9821 on-board @@ -55,6 +60,7 @@ config SND_ES968 tristate Generic ESS ES968 driver depends on SND ISAPNP + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES968 chip. @@ -62,6 +68,7 @@ config SND_ES1688 tristate Generic ESS ES688/ES1688 driver depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES688 or ES1688 chips. @@ -69,6 +76,7 @@ config SND_ES18XX tristate Generic ESS ES18xx driver depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES18xx chips. @@ -76,6 +84,7 @@ config SND_GUSCLASSIC tristate Gravis UltraSound Classic depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Gravis UltraSound Classic soundcard. @@ -83,6 +92,7 @@ config SND_GUSEXTREME tristate Gravis UltraSound Extreme depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Gravis UltraSound Extreme soundcard. @@ -90,6 +100,7 @@ config SND_GUSMAX tristate Gravis UltraSound MAX depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Gravis UltraSound MAX soundcard. @@ -97,6 +108,7 @@ config SND_INTERWAVE tristate AMD InterWave, Gravis UltraSound PnP depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for AMD InterWave based soundcards @@ -106,6 +118,7 @@ config SND_INTERWAVE_STB tristate AMD InterWave + TEA6330T (UltraSound 32-Pro) depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for AMD InterWave based soundcards @@ -114,6 +127,7 @@ config SND_OPTI92X_AD1848 tristate OPTi 82C92x - AD1848 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Opti92x soundcards equiped with @@ -122,6 +136,7 @@ config SND_OPTI92X_CS4231 tristate OPTi 82C92x - CS4231 depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Opti92x soundcards equiped with @@ -130,6 +145,7 @@ config SND_OPTI93X tristate OPTi 82C93x depends on SND + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for Opti93x soundcards. @@ -137,6 +153,7 @@ config SND_SB8 tristate Sound Blaster 1.0/2.0/Pro (8-bit) depends on SND + select SND_RAWMIDI select SND_PCM
[alsa-cvslog] CVS: alsa-kernel/core Makefile,1.51,1.52
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/core Modified Files: Makefile Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_RAWMIDI for drivers which use the snd-rawmidi module. - Remove snd-rawmidi from these drivers entries in sound/core/Makefile - Remove any sound/core/Makefile entries which are left empty. Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- Makefile2 Mar 2004 19:22:24 - 1.51 +++ Makefile2 Mar 2004 19:26:13 - 1.52 @@ -34,55 +34,39 @@ obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/ # Toplevel Module Dependency -obj-$(CONFIG_SND_VIRMIDI) += snd-rawmidi.o snd-timer.o -obj-$(CONFIG_SND_SERIAL_U16550) += snd-rawmidi.o snd-timer.o -obj-$(CONFIG_SND_MTPAV) += snd-rawmidi.o snd-timer.o -obj-$(CONFIG_SND_MPU401) += snd-rawmidi.o snd-timer.o -obj-$(CONFIG_SND_ALS100) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AZT2320) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AZT3328) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_DT019X) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES18XX) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPL3SA2) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_AD1816A) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CS4231) += snd-rawmidi.o -obj-$(CONFIG_SND_CS4232) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CS4236) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES1688) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_GUSCLASSIC) += snd-rawmidi.o -obj-$(CONFIG_SND_GUSMAX) += snd-rawmidi.o -obj-$(CONFIG_SND_GUSEXTREME) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_INTERWAVE) += snd-rawmidi.o -obj-$(CONFIG_SND_INTERWAVE_STB) += snd-rawmidi.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_OPTI93X) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SB8) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SB16) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SBAWE) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ES968) += snd-rawmidi.o -obj-$(CONFIG_SND_WAVEFRONT) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_SSCAPE) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ALS4000) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CMIPCI) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_CS4281) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ENS1370) += snd-rawmidi.o -obj-$(CONFIG_SND_ENS1371) += snd-rawmidi.o -obj-$(CONFIG_SND_ES1938) += snd-hwdep.o snd-rawmidi.o -obj-$(CONFIG_SND_ES1968) += snd-rawmidi.o -obj-$(CONFIG_SND_FM801) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_ICE1712) += snd-rawmidi.o -obj-$(CONFIG_SND_ICE1724) += snd-rawmidi.o -obj-$(CONFIG_SND_INTEL8X0) += snd-rawmidi.o -obj-$(CONFIG_SND_SONICVIBES) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_VIA82XX) += snd-rawmidi.o -obj-$(CONFIG_SND_CS46XX) += snd-rawmidi.o -obj-$(CONFIG_SND_EMU10K1) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_HDSP) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_TRIDENT) += snd-rawmidi.o -obj-$(CONFIG_SND_YMFPCI) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_PC98_CS4232) += snd-rawmidi.o snd-hwdep.o -obj-$(CONFIG_SND_USB_AUDIO) += snd-rawmidi.o +obj-$(CONFIG_SND_VIRMIDI) += snd-timer.o +obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o +obj-$(CONFIG_SND_MTPAV) += snd-timer.o +obj-$(CONFIG_SND_MPU401) += snd-timer.o +obj-$(CONFIG_SND_ALS100) += snd-hwdep.o +obj-$(CONFIG_SND_AZT2320) += snd-hwdep.o +obj-$(CONFIG_SND_AZT3328) += snd-hwdep.o +obj-$(CONFIG_SND_DT019X) += snd-hwdep.o +obj-$(CONFIG_SND_ES18XX) += snd-hwdep.o +obj-$(CONFIG_SND_OPL3SA2) += snd-hwdep.o +obj-$(CONFIG_SND_AD1816A) += snd-hwdep.o +obj-$(CONFIG_SND_CS4232) += snd-hwdep.o +obj-$(CONFIG_SND_CS4236) += snd-hwdep.o +obj-$(CONFIG_SND_ES1688) += snd-hwdep.o +obj-$(CONFIG_SND_GUSEXTREME) += snd-hwdep.o +obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-hwdep.o +obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-hwdep.o +obj-$(CONFIG_SND_OPTI93X) += snd-hwdep.o +obj-$(CONFIG_SND_SB8) += snd-hwdep.o +obj-$(CONFIG_SND_SB16) += snd-hwdep.o +obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o +obj-$(CONFIG_SND_WAVEFRONT) += snd-hwdep.o +obj-$(CONFIG_SND_SSCAPE) += snd-hwdep.o +obj-$(CONFIG_SND_ALS4000) += snd-hwdep.o +obj-$(CONFIG_SND_CMIPCI) += snd-hwdep.o +obj-$(CONFIG_SND_CS4281) += snd-hwdep.o +obj-$(CONFIG_SND_ES1938) += snd-hwdep.o +obj-$(CONFIG_SND_FM801) += snd-hwdep.o +obj-$(CONFIG_SND_SONICVIBES) += snd-hwdep.o +obj-$(CONFIG_SND_EMU10K1) += snd-hwdep.o +obj-$(CONFIG_SND_HDSP) += snd-hwdep.o +obj-$(CONFIG_SND_YMFPCI) += snd-hwdep.o +obj-$(CONFIG_SND_PC98_CS4232) += snd-hwdep.o obj-$(CONFIG_SND_VXPOCKET) += snd-hwdep.o obj-$(CONFIG_SND_VXP440) += snd-hwdep.o obj-$(CONFIG_SND_VX222) += snd-hwdep.o
[alsa-cvslog] CVS: alsa-kernel/drivers Kconfig,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/drivers Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_RAWMIDI for drivers which use the snd-rawmidi module. - Remove snd-rawmidi from these drivers entries in sound/core/Makefile - Remove any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/drivers/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Kconfig 2 Mar 2004 19:22:24 - 1.2 +++ Kconfig 2 Mar 2004 19:26:13 - 1.3 @@ -15,6 +15,7 @@ config SND_VIRMIDI tristate Virtual MIDI soundcard depends on SND_SEQUENCER + select SND_RAWMIDI help Say 'Y' or 'M' to include virtual MIDI driver. This driver allows to connect applications using raw MIDI devices to sequencer. @@ -22,6 +23,7 @@ config SND_MTPAV tristate MOTU MidiTimePiece AV multiport MIDI depends on SND + select SND_RAWMIDI help Say 'Y' or 'M' to include support for MOTU MidiTimePiece AV multiport MIDI adapter. @@ -29,6 +31,7 @@ config SND_SERIAL_U16550 tristate UART16550 - MIDI only driver depends on SND + select SND_RAWMIDI help Say 'Y' or 'M' to include support for MIDI serial port driver. It works with serial UARTs 16550 and better. @@ -36,6 +39,7 @@ config SND_MPU401 tristate Generic MPU-401 UART driver depends on SND + select SND_RAWMIDI help Say 'Y' or 'M' to include support for MPU401 hardware using UART access. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/usb Kconfig,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/usb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/usb Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_RAWMIDI for drivers which use the snd-rawmidi module. - Remove snd-rawmidi from these drivers entries in sound/core/Makefile - Remove any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/usb/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Kconfig 2 Mar 2004 19:22:24 - 1.3 +++ Kconfig 2 Mar 2004 19:26:13 - 1.4 @@ -6,6 +6,7 @@ config SND_USB_AUDIO tristate USB Audio/MIDI driver depends on SND USB + select SND_RAWMIDI select SND_PCM help Say 'Y' or 'M' to include support for USB audio and USB MIDI devices. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa Kconfig,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/isa Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_HWDEP for drivers which use the snd-hwdep module. - Remove snd-hwdep from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/isa/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Kconfig 2 Mar 2004 19:26:13 - 1.8 +++ Kconfig 2 Mar 2004 19:28:14 - 1.9 @@ -6,6 +6,7 @@ config SND_AD1816A tristate Analog Devices SoundPort AD1816A depends on SND ISAPNP + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -33,6 +34,7 @@ config SND_CS4232 tristate Generic Cirrus Logic CS4232 driver depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -42,6 +44,7 @@ config SND_CS4236 tristate Generic Cirrus Logic CS4236+ driver depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -51,6 +54,7 @@ config SND_PC98_CS4232 tristate NEC PC9800 CS4232 driver depends on SND X86_PC9800 + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -68,6 +72,7 @@ config SND_ES1688 tristate Generic ESS ES688/ES1688 driver depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -76,6 +81,7 @@ config SND_ES18XX tristate Generic ESS ES18xx driver depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -92,6 +98,7 @@ config SND_GUSEXTREME tristate Gravis UltraSound Extreme depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -127,6 +134,7 @@ config SND_OPTI92X_AD1848 tristate OPTi 82C92x - AD1848 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -136,6 +144,7 @@ config SND_OPTI92X_CS4231 tristate OPTi 82C92x - CS4231 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -145,6 +154,7 @@ config SND_OPTI93X tristate OPTi 82C93x depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -153,6 +163,7 @@ config SND_SB8 tristate Sound Blaster 1.0/2.0/Pro (8-bit) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -162,6 +173,7 @@ config SND_SB16 tristate Sound Blaster 16 (PnP) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -171,6 +183,7 @@ config SND_SBAWE tristate Sound Blaster AWE (32,64) (PnP) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -188,6 +201,7 @@ config SND_WAVEFRONT tristate Turtle Beach Maui,Tropez,Tropez+ (Wavefront) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -197,6 +211,7 @@ config SND_ALS100 tristate Avance Logic ALS100/ALS120 depends on SND ISAPNP + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -206,6 +221,7 @@ config SND_AZT2320 tristate Aztech Systems AZT2320 depends on SND ISAPNP + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -221,6 +237,7 @@ config SND_DT019X tristate Diamond Technologies DT-019X, Avance Logic ALS-007 depends on SND ISAPNP + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -230,6 +247,7 @@ config SND_OPL3SA2 tristate Yamaha OPL3-SA2/SA3 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -245,6 +263,7 @@ config SND_SSCAPE tristate Ensoniq SoundScape PnP driver depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia Kconfig,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/pcmcia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/pcmcia Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_HWDEP for drivers which use the snd-hwdep module. - Remove snd-hwdep from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Kconfig 2 Mar 2004 19:22:24 - 1.4 +++ Kconfig 2 Mar 2004 19:28:14 - 1.5 @@ -6,6 +6,7 @@ config SND_VXPOCKET tristate Digigram VXpocket depends on SND PCMCIA ISA + select SND_HWDEP select SND_PCM help Say 'Y' or 'M' to include support for Digigram VXpocket soundcard. @@ -13,6 +14,7 @@ config SND_VXP440 tristate Digigram VXpocket 440 depends on SND PCMCIA ISA + select SND_HWDEP select SND_PCM help Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers Kconfig,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9046/drivers Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_TIMER for drivers which use the snd-timer module. - Remove snd-timer from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. - Since the top level module dependency lists are now gone, remove the comment. - Also, since we only mention objects once, remove the sorting of obj-m Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/drivers/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Kconfig 2 Mar 2004 19:26:13 - 1.3 +++ Kconfig 2 Mar 2004 19:28:59 - 1.4 @@ -15,6 +15,7 @@ config SND_VIRMIDI tristate Virtual MIDI soundcard depends on SND_SEQUENCER + select SND_TIMER select SND_RAWMIDI help Say 'Y' or 'M' to include virtual MIDI driver. This driver allows to @@ -23,6 +24,7 @@ config SND_MTPAV tristate MOTU MidiTimePiece AV multiport MIDI depends on SND + select SND_TIMER select SND_RAWMIDI help Say 'Y' or 'M' to include support for MOTU MidiTimePiece AV multiport @@ -31,6 +33,7 @@ config SND_SERIAL_U16550 tristate UART16550 - MIDI only driver depends on SND + select SND_TIMER select SND_RAWMIDI help Say 'Y' or 'M' to include support for MIDI serial port driver. It works @@ -39,6 +42,7 @@ config SND_MPU401 tristate Generic MPU-401 UART driver depends on SND + select SND_TIMER select SND_RAWMIDI help Say 'Y' or 'M' to include support for MPU401 hardware using UART access. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core Makefile,1.52,1.53
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/core Modified Files: Makefile Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_HWDEP for drivers which use the snd-hwdep module. - Remove snd-hwdep from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- Makefile2 Mar 2004 19:26:13 - 1.52 +++ Makefile2 Mar 2004 19:28:14 - 1.53 @@ -38,38 +38,5 @@ obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o obj-$(CONFIG_SND_MTPAV) += snd-timer.o obj-$(CONFIG_SND_MPU401) += snd-timer.o -obj-$(CONFIG_SND_ALS100) += snd-hwdep.o -obj-$(CONFIG_SND_AZT2320) += snd-hwdep.o -obj-$(CONFIG_SND_AZT3328) += snd-hwdep.o -obj-$(CONFIG_SND_DT019X) += snd-hwdep.o -obj-$(CONFIG_SND_ES18XX) += snd-hwdep.o -obj-$(CONFIG_SND_OPL3SA2) += snd-hwdep.o -obj-$(CONFIG_SND_AD1816A) += snd-hwdep.o -obj-$(CONFIG_SND_CS4232) += snd-hwdep.o -obj-$(CONFIG_SND_CS4236) += snd-hwdep.o -obj-$(CONFIG_SND_ES1688) += snd-hwdep.o -obj-$(CONFIG_SND_GUSEXTREME) += snd-hwdep.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-hwdep.o -obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-hwdep.o -obj-$(CONFIG_SND_OPTI93X) += snd-hwdep.o -obj-$(CONFIG_SND_SB8) += snd-hwdep.o -obj-$(CONFIG_SND_SB16) += snd-hwdep.o -obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o -obj-$(CONFIG_SND_WAVEFRONT) += snd-hwdep.o -obj-$(CONFIG_SND_SSCAPE) += snd-hwdep.o -obj-$(CONFIG_SND_ALS4000) += snd-hwdep.o -obj-$(CONFIG_SND_CMIPCI) += snd-hwdep.o -obj-$(CONFIG_SND_CS4281) += snd-hwdep.o -obj-$(CONFIG_SND_ES1938) += snd-hwdep.o -obj-$(CONFIG_SND_FM801) += snd-hwdep.o -obj-$(CONFIG_SND_SONICVIBES) += snd-hwdep.o -obj-$(CONFIG_SND_EMU10K1) += snd-hwdep.o -obj-$(CONFIG_SND_HDSP) += snd-hwdep.o -obj-$(CONFIG_SND_YMFPCI) += snd-hwdep.o -obj-$(CONFIG_SND_PC98_CS4232) += snd-hwdep.o -obj-$(CONFIG_SND_VXPOCKET) += snd-hwdep.o -obj-$(CONFIG_SND_VXP440) += snd-hwdep.o -obj-$(CONFIG_SND_VX222) += snd-hwdep.o -obj-$(CONFIG_SND_MIXART) += snd-hwdep.o obj-m := $(sort $(obj-m)) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core Makefile,1.53,1.54
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9046/core Modified Files: Makefile Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_TIMER for drivers which use the snd-timer module. - Remove snd-timer from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. - Since the top level module dependency lists are now gone, remove the comment. - Also, since we only mention objects once, remove the sorting of obj-m Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- Makefile2 Mar 2004 19:28:14 - 1.53 +++ Makefile2 Mar 2004 19:28:59 - 1.54 @@ -32,11 +32,3 @@ obj-$(CONFIG_SND_OSSEMUL) += oss/ obj-$(CONFIG_SND_SEQUENCER)+= seq/ obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/ - -# Toplevel Module Dependency -obj-$(CONFIG_SND_VIRMIDI) += snd-timer.o -obj-$(CONFIG_SND_SERIAL_U16550) += snd-timer.o -obj-$(CONFIG_SND_MTPAV) += snd-timer.o -obj-$(CONFIG_SND_MPU401) += snd-timer.o - -obj-m := $(sort $(obj-m)) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.18,1.19
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/pci Modified Files: Kconfig Log Message: Russell King [EMAIL PROTECTED] This is part of a patch series to clean up sound/core/Makefile in Linux 2.6.4-rc1. - Add SND_HWDEP for drivers which use the snd-hwdep module. - Remove snd-hwdep from these drivers entries in sound/core/Makefile, removing any sound/core/Makefile entries which are left empty. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Kconfig 2 Mar 2004 19:26:13 - 1.18 +++ Kconfig 2 Mar 2004 19:28:14 - 1.19 @@ -14,6 +14,7 @@ config SND_AZT3328 tristate Aztech AZF3328 / PCI168 (EXPERIMENTAL) depends on SND EXPERIMENTAL + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -46,6 +47,7 @@ config SND_CS4281 tristate Cirrus Logic (Sound Fusion) CS4281 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -54,6 +56,7 @@ config SND_EMU10K1 tristate EMU10K1 (SB Live! Audigy, E-mu APS) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -108,6 +111,7 @@ config SND_HDSP tristate RME Hammerfall DSP Audio depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -126,6 +130,7 @@ config SND_YMFPCI tristate Yamaha YMF724/740/744/754 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -135,6 +140,7 @@ config SND_ALS4000 tristate Avance Logic ALS4000 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -143,6 +149,7 @@ config SND_CMIPCI tristate C-Media 8738, 8338 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -169,6 +176,7 @@ config SND_ES1938 tristate ESS ES1938/1946/1969 (Solo-1) depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -193,6 +201,7 @@ config SND_FM801 tristate ForteMedia FM801 depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -240,6 +249,7 @@ config SND_SONICVIBES tristate S3 SonicVibes depends on SND + select SND_HWDEP select SND_RAWMIDI select SND_PCM help @@ -256,6 +266,7 @@ config SND_VX222 tristate Digigram VX222 depends on SND + select SND_HWDEP select SND_PCM help Say 'Y' or 'M' to include support for Digigram VX222 soundcards. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/isa Kconfig,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/isa Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/isa/Kconfig,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Kconfig 2 Mar 2004 19:28:14 - 1.9 +++ Kconfig 2 Mar 2004 19:51:31 - 1.10 @@ -6,8 +6,8 @@ config SND_AD1816A tristate Analog Devices SoundPort AD1816A depends on SND ISAPNP - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Analog Devices SoundPort AD1816A or @@ -25,7 +25,7 @@ config SND_CS4231 tristate Generic Cirrus Logic CS4231 driver depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for CS4231 chips from Cirrus Logic - @@ -34,8 +34,8 @@ config SND_CS4232 tristate Generic Cirrus Logic CS4232 driver depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for CS4232 chips from Cirrus Logic - @@ -44,8 +44,8 @@ config SND_CS4236 tristate Generic Cirrus Logic CS4236+ driver depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239 @@ -54,8 +54,8 @@ config SND_PC98_CS4232 tristate NEC PC9800 CS4232 driver depends on SND X86_PC9800 - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for NEC PC-9801/PC-9821 on-board @@ -64,7 +64,7 @@ config SND_ES968 tristate Generic ESS ES968 driver depends on SND ISAPNP - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES968 chip. @@ -72,8 +72,8 @@ config SND_ES1688 tristate Generic ESS ES688/ES1688 driver depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES688 or ES1688 chips. @@ -81,8 +81,8 @@ config SND_ES18XX tristate Generic ESS ES18xx driver depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ESS AudioDrive ES18xx chips. @@ -99,7 +99,7 @@ tristate Gravis UltraSound Extreme depends on SND select SND_HWDEP - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Gravis UltraSound Extreme soundcard. @@ -134,8 +134,9 @@ config SND_OPTI92X_AD1848 tristate OPTi 82C92x - AD1848 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_OPL4_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Opti92x soundcards equiped with @@ -144,8 +145,9 @@ config SND_OPTI92X_CS4231 tristate OPTi 82C92x - CS4231 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_OPL4_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Opti92x soundcards equiped with @@ -154,8 +156,8 @@ config SND_OPTI93X tristate OPTi 82C93x depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Opti93x soundcards. @@ -163,7 +165,7 @@ config SND_SB8 tristate Sound Blaster 1.0/2.0/Pro (8-bit) depends on SND - select SND_HWDEP + select SND_OPL3_LIB select SND_RAWMIDI select SND_PCM help @@ -173,8 +175,8 @@ config SND_SB16 tristate Sound Blaster 16 (PnP) depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART
[alsa-cvslog] CVS: alsa-kernel/drivers/opl4 Makefile,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/drivers/opl4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/drivers/opl4 Modified Files: Makefile Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile29 Feb 2004 10:03:19 - 1.2 +++ Makefile2 Mar 2004 19:51:30 - 1.3 @@ -6,9 +6,6 @@ snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o -OPL4_OBJS := snd-opl4-lib.o -OPL4_SYNTH_OBJS := snd-opl4-synth.o - # # this function returns: # m - CONFIG_SND_SEQUENCER is m @@ -17,9 +14,5 @@ # sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) -obj-$(CONFIG_SND_OPTI92X_AD1848) += $(OPL4_OBJS) -obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += $(OPL4_SYNTH_OBJS) -obj-$(CONFIG_SND_OPTI92X_CS4231) += $(OPL4_OBJS) -obj-$(call sequencer,$CONFIG_SND_OPTI92X_CS4231)) += $(OPL4_SYNTH_OBJS) - -obj-m := $(sort $(obj-m)) +obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o +obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-opl4-synth.o \ No newline at end of file --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.19,1.20
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/pci Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Kconfig 2 Mar 2004 19:28:14 - 1.19 +++ Kconfig 2 Mar 2004 19:51:31 - 1.20 @@ -6,7 +6,7 @@ config SND_ALI5451 tristate ALi PCI Audio M5451 depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core. @@ -14,8 +14,8 @@ config SND_AZT3328 tristate Aztech AZF3328 / PCI168 (EXPERIMENTAL) depends on SND EXPERIMENTAL - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Aztech AZF3328 (PCI168) soundcards. @@ -47,7 +47,7 @@ config SND_CS4281 tristate Cirrus Logic (Sound Fusion) CS4281 depends on SND - select SND_HWDEP + select SND_OPL3_LIB select SND_RAWMIDI select SND_PCM help @@ -121,7 +121,7 @@ config SND_TRIDENT tristate Trident 4D-Wave DX/NX; SiS 7018 depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and @@ -130,8 +130,8 @@ config SND_YMFPCI tristate Yamaha YMF724/740/744/754 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Yamaha PCI audio chips - @@ -140,8 +140,8 @@ config SND_ALS4000 tristate Avance Logic ALS4000 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Avance Logic ALS4000. @@ -149,8 +149,8 @@ config SND_CMIPCI tristate C-Media 8738, 8338 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for C-Media CMI8338 and 8738 PCI @@ -176,8 +176,8 @@ config SND_ES1938 tristate ESS ES1938/1946/1969 (Solo-1) depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969) @@ -186,7 +186,7 @@ config SND_ES1968 tristate ESS ES1968/1978 (Maestro-1/2/2E) depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ESS Maestro 1/2/2E. @@ -201,8 +201,8 @@ config SND_FM801 tristate ForteMedia FM801 depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ForteMedia FM801 based soundcards. @@ -218,7 +218,7 @@ config SND_ICE1712 tristate ICEnsemble ICE1712 (Envy24) depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ICE1712 (Envy24) based soundcards. @@ -229,7 +229,7 @@ config SND_ICE1724 tristate ICE/VT1724 (Envy24HT) depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for ICE/VT1724 (Envy24HT) based @@ -240,7 +240,7 @@ config SND_INTEL8X0 tristate Intel i8x0/MX440, SiS 7012; Ali 5455; NForce Audio; AMD768/8111 depends on SND - select SND_RAWMIDI + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for Intel8x0 based soundcards, @@ -249,8 +249,8 @@ config SND_SONICVIBES tristate S3 SonicVibes depends on SND - select SND_HWDEP - select SND_RAWMIDI + select SND_OPL3_LIB + select SND_MPU401_UART select SND_PCM help Say 'Y' or 'M' to include support for S3 SonicVibes based soundcards. @@ -258,7 +258,7 @@ config SND_VIA82XX tristate VIA 82C686A/B, 8233 South Bridge depends on SND - select
[alsa-cvslog] CVS: alsa-kernel/drivers Kconfig,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/drivers Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/drivers/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Kconfig 2 Mar 2004 19:28:59 - 1.4 +++ Kconfig 2 Mar 2004 19:51:30 - 1.5 @@ -3,6 +3,21 @@ menu Generic devices depends on SND!=n +config SND_MPU401_UART +tristate + select SND_TIMER +select SND_RAWMIDI + +config SND_OPL3_LIB + tristate + select SND_TIMER + select SND_HWDEP + +config SND_OPL4_LIB + tristate + select SND_TIMER + select SND_HWDEP + config SND_DUMMY tristate Dummy (/dev/null) soundcard depends on SND @@ -42,8 +57,7 @@ config SND_MPU401 tristate Generic MPU-401 UART driver depends on SND - select SND_TIMER - select SND_RAWMIDI + select SND_MPU401_UART help Say 'Y' or 'M' to include support for MPU401 hardware using UART access. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/opl3 Makefile,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/drivers/opl3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/drivers/opl3 Modified Files: Makefile Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Makefile29 Feb 2004 10:03:19 - 1.21 +++ Makefile2 Mar 2004 19:51:30 - 1.22 @@ -9,9 +9,6 @@ snd-opl3-synth-objs += opl3_oss.o endif -OPL3_OBJS = snd-opl3-lib.o -OPL3_SYNTH_OBJS = snd-opl3-synth.o - # # this function returns: # m - CONFIG_SND_SEQUENCER is m @@ -20,56 +17,5 @@ # sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) -# Toplevel Module Dependency -obj-$(CONFIG_SND_ALS100) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_ALS100)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_AZT2320) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_AZT2320)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_AZT3328) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_AZT3328)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_DT019X) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_DT019X)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_ES18XX) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_ES18XX)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_OPL3SA2) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_OPL3SA2)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_AD1816A) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_AD1816A)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_CS4232) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_CS4232)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_PC98_CS4232) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_PC98_CS4232)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_CS4236) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_CS4236)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_ES1688) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_GUSEXTREME)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_OPTI92X_AD1848) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_OPTI92X_CS4231) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_OPTI92X_CS4231)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_OPTI93X) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_OPTI93X)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_SB8) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_SB8)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_SB16) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_SB16)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_SBAWE) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_WAVEFRONT) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_WAVEFRONT)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_ALS4000) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_ALS4000)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_CMIPCI) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_CMIPCI)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_CS4281) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_CS4281)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_ES1938) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_ES1938)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_FM801) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_FM801)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_SONICVIBES) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_SONICVIBES)) += $(OPL3_SYNTH_OBJS) -obj-$(CONFIG_SND_YMFPCI) += $(OPL3_OBJS) -obj-$(call sequencer,$(CONFIG_SND_YMFPCI)) += $(OPL3_SYNTH_OBJS) - -obj-m := $(sort $(obj-m)) +obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o +obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-opl3-synth.o --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/mpu401 Makefile,1.18,1.19
Update of /cvsroot/alsa/alsa-kernel/drivers/mpu401 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432/drivers/mpu401 Modified Files: Makefile Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_MP401_UART tristate - added SND_OPL3_LIB tristate - added SND_OPL4_LIB tristate Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/drivers/mpu401/Makefile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- Makefile2 Jun 2003 12:59:40 - 1.18 +++ Makefile2 Mar 2004 19:51:30 - 1.19 @@ -6,40 +6,7 @@ snd-mpu401-objs := mpu401.o snd-mpu401-uart-objs := mpu401_uart.o -# Toplevel Module Dependency -obj-$(CONFIG_SND_MPU401) += snd-mpu401.o snd-mpu401-uart.o -obj-$(CONFIG_SND_ALS100) += snd-mpu401-uart.o -obj-$(CONFIG_SND_AZT2320) += snd-mpu401-uart.o -obj-$(CONFIG_SND_AZT3328) += snd-mpu401-uart.o -obj-$(CONFIG_SND_DT019X) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ES18XX) += snd-mpu401-uart.o -obj-$(CONFIG_SND_OPL3SA2) += snd-mpu401-uart.o -obj-$(CONFIG_SND_AD1816A) += snd-mpu401-uart.o -obj-$(CONFIG_SND_CS4231) += snd-mpu401-uart.o -obj-$(CONFIG_SND_CS4232) += snd-mpu401-uart.o -obj-$(CONFIG_SND_CS4236) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ES1688) += snd-mpu401-uart.o -obj-$(CONFIG_SND_GUSEXTREME) += snd-mpu401-uart.o -obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-mpu401-uart.o -obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-mpu401-uart.o -obj-$(CONFIG_SND_OPTI93X) += snd-mpu401-uart.o -obj-$(CONFIG_SND_SB16) += snd-mpu401-uart.o -obj-$(CONFIG_SND_SBAWE) += snd-mpu401-uart.o -obj-$(CONFIG_SND_WAVEFRONT) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ALS4000) += snd-mpu401-uart.o -obj-$(CONFIG_SND_CMIPCI) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ES1938) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ES1968) += snd-mpu401-uart.o -obj-$(CONFIG_SND_FM801) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ICE1712) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ICE1724) += snd-mpu401-uart.o -obj-$(CONFIG_SND_INTEL8X0) += snd-mpu401-uart.o -obj-$(CONFIG_SND_SONICVIBES) += snd-mpu401-uart.o -obj-$(CONFIG_SND_VIA82XX) += snd-mpu401-uart.o -obj-$(CONFIG_SND_ALI5451) += snd-mpu401-uart.o -obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o -obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o -obj-$(CONFIG_SND_PC98_CS4232) += snd-mpu401-uart.o -obj-$(CONFIG_SND_SSCAPE) += snd-mpu401-uart.o +obj-$(CONFIG_SND_MPU401_UART) += snd-mpu401-uart.o -obj-m := $(sort $(obj-m)) +# Toplevel Module Dependency +obj-$(CONFIG_SND_MPU401) += snd-mpu401.o --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers Kconfig,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16636/drivers Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_VX_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/drivers/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Kconfig 2 Mar 2004 19:51:30 - 1.5 +++ Kconfig 2 Mar 2004 19:55:49 - 1.6 @@ -3,6 +3,7 @@ menu Generic devices depends on SND!=n + config SND_MPU401_UART tristate select SND_TIMER @@ -18,6 +19,12 @@ select SND_TIMER select SND_HWDEP +config SND_VX_LIB + tristate + select SND_HWDEP + select SND_PCM + + config SND_DUMMY tristate Dummy (/dev/null) soundcard depends on SND @@ -25,7 +32,6 @@ help Say 'Y' or 'M' to include dummy driver. This driver does nothing, but emulates various mixer controls and PCM devices. - config SND_VIRMIDI tristate Virtual MIDI soundcard @@ -62,4 +68,3 @@ Say 'Y' or 'M' to include support for MPU401 hardware using UART access. endmenu - --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16636/pci Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_VX_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- Kconfig 2 Mar 2004 19:51:31 - 1.20 +++ Kconfig 2 Mar 2004 19:55:49 - 1.21 @@ -266,8 +266,7 @@ config SND_VX222 tristate Digigram VX222 depends on SND - select SND_HWDEP - select SND_PCM + select SND_VX_LIB help Say 'Y' or 'M' to include support for Digigram VX222 soundcards. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia Kconfig,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/pcmcia In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16636/pcmcia Modified Files: Kconfig Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_VX_LIB tristate Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Kconfig 2 Mar 2004 19:28:14 - 1.5 +++ Kconfig 2 Mar 2004 19:55:49 - 1.6 @@ -6,16 +6,14 @@ config SND_VXPOCKET tristate Digigram VXpocket depends on SND PCMCIA ISA - select SND_HWDEP - select SND_PCM + select SND_VX_LIB help Say 'Y' or 'M' to include support for Digigram VXpocket soundcard. config SND_VXP440 tristate Digigram VXpocket 440 depends on SND PCMCIA ISA - select SND_HWDEP - select SND_PCM + select SND_VX_LIB help Say 'Y' or 'M' to include support for Digigram VXpocket 440 soundcard. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/vx Makefile,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/drivers/vx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16636/drivers/vx Modified Files: Makefile Log Message: More Kconfig and Makefile cleanups following Russel's direction: - added SND_VX_LIB tristate Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile23 May 2003 16:00:43 - 1.1 +++ Makefile2 Mar 2004 19:55:49 - 1.2 @@ -5,7 +5,4 @@ snd-vx-lib-objs := vx_core.o vx_hwdep.o vx_pcm.o vx_mixer.o vx_cmd.o vx_uer.o -obj-$(CONFIG_SND_VXPOCKET) += snd-vx-lib.o -obj-$(CONFIG_SND_VXP440) += snd-vx-lib.o -obj-$(CONFIG_SND_VX222) += snd-vx-lib.o - +obj-$(CONFIG_SND_VX_LIB) += snd-vx-lib.o --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.230,1.231
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18833
Modified Files:
configure.in
Log Message:
One more fix for compiler detection
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- configure.in29 Feb 2004 14:18:28 - 1.230
+++ configure.in1 Mar 2004 08:49:00 - 1.231
@@ -160,6 +160,7 @@
[AC_TRY_RUN([
#include stdio.h
#include ctype.h
+#include string.h
#include $CONFIG_SND_KERNELDIR/include/linux/compile.h
int main()
{
@@ -182,6 +183,8 @@
*dptr = *ptr;
*dptr = '\t';
*dptr = '\0';
+ if (!strcmp(compiler, ))
+ compiler[0] = '\0';
fprintf(f,%s\n,compiler);
fclose(f);
}
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.13,1.14
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19346
Modified Files:
pcm.c
Log Message:
Cleanup
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pcm.c 29 Feb 2004 19:33:54 - 1.13
+++ pcm.c 1 Mar 2004 08:51:07 - 1.14
@@ -1418,7 +1418,7 @@
if ((fmode O_ACCMODE) == O_WRONLY snd_pcm_stream(pcm) ==
SND_PCM_STREAM_CAPTURE)
continue;
if (str-mmap_buffer)
- set_oss_mmap_avail_min(dsp-streams[k], k, pcm);
+ set_oss_mmap_avail_min(str, k, pcm);
count = snd_pcm_poll_descriptors_count(pcm);
if (count 0) {
errno = -count;
@@ -1557,7 +1557,7 @@
if ((fmode O_ACCMODE) == O_WRONLY snd_pcm_stream(pcm) ==
SND_PCM_STREAM_CAPTURE)
continue;
if (str-mmap_buffer)
- set_oss_mmap_avail_min(dsp-streams[k], k, pcm);
+ set_oss_mmap_avail_min(str, k, pcm);
count = snd_pcm_poll_descriptors_count(pcm);
if (count 0) {
errno = -count;
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.271,1.272
Update of /cvsroot/alsa/alsa-lib/src/pcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19814 Modified Files: pcm.c Log Message: Fixed return comment for *near() functions Index: pcm.c === RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- pcm.c 23 Feb 2004 10:34:17 - 1.271 +++ pcm.c 1 Mar 2004 08:53:50 - 1.272 @@ -3418,7 +3418,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val target channels count, returned chosen channels count - * \return chosen channels count + * \return 0 otherwise a negative error code if configuration space would become empty */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_channels_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) @@ -3598,7 +3598,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target rate / returned approximate set rate - * \return approximate chosen rate + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -3787,7 +3787,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target period duration in us / returned chosen approximate target period duration - * \return approximate chosen period duration in us + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -3999,7 +3999,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target period size in frames / returned chosen approximate target period size - * \return 0 otherwise a negative error code + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4210,7 +4210,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target periods per buffer / returned chosen approximate target periods per buffer - * \return approximate chosen periods per buffer + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4410,7 +4410,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target buffer duration in us / returned chosen approximate target buffer duration - * \return approximate chosen buffer duration in us + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4619,7 +4619,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target buffer size in frames / returned chosen approximate target buffer size in frames - * \return approximate chosen buffer size in frames + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4813,7 +4813,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target tick duration in us / returned chosen approximate target tick duration in us - * \return approximate chosen tick duration in us + * \return 0 otherwise a negative error code if configuration space would become empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci fm801.c,1.40,1.41
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24664 Modified Files: fm801.c Log Message: tea575x can be module, too Index: fm801.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/fm801.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- fm801.c 30 Jan 2004 11:46:38 - 1.40 +++ fm801.c 1 Mar 2004 15:23:16 - 1.41 @@ -35,7 +35,7 @@ #include asm/io.h -#if defined(CONFIG_SND_FM801_TEA575X) (defined(CONFIG_VIDEO_DEV) || defined(CONFIG_VIDEO_DEV_MODULE)) +#if (defined(CONFIG_SND_FM801_TEA575X) || defined(CONFIG_SND_FM801_TEA575X_MODULE)) (defined(CONFIG_VIDEO_DEV) || defined(CONFIG_VIDEO_DEV_MODULE)) #include sound/tea575x-tuner.h #define TEA575X_RADIO 1 #endif --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.272,1.273
Update of /cvsroot/alsa/alsa-lib/src/pcm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27140 Modified Files: pcm.c Log Message: Correction for explanation of near functions Index: pcm.c === RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- pcm.c 1 Mar 2004 08:53:50 - 1.272 +++ pcm.c 2 Mar 2004 07:51:50 - 1.273 @@ -3418,7 +3418,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val target channels count, returned chosen channels count - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty */ #ifndef DOXYGEN int INTERNAL(snd_pcm_hw_params_set_channels_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) @@ -3598,7 +3598,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target rate / returned approximate set rate - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -3787,7 +3787,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target period duration in us / returned chosen approximate target period duration - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -3999,7 +3999,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target period size in frames / returned chosen approximate target period size - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4210,7 +4210,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target periods per buffer / returned chosen approximate target periods per buffer - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4410,7 +4410,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target buffer duration in us / returned chosen approximate target buffer duration - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4619,7 +4619,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target buffer size in frames / returned chosen approximate target buffer size in frames - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ @@ -4813,7 +4813,7 @@ * \param pcm PCM handle * \param params Configuration space * \param val approximate target tick duration in us / returned chosen approximate target tick duration in us - * \return 0 otherwise a negative error code if configuration space would become empty + * \return 0 otherwise a negative error code if configuration space is empty * * target/chosen exact value is ,=, val following dir (-1,0,1) */ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13566 Modified Files: Kconfig Log Message: Select CONFIG_VIDEO_DEV when CONFIG_SND_FM801_TEA575X is wanted Index: Kconfig === RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Kconfig 9 Feb 2004 17:40:48 - 1.14 +++ Kconfig 29 Feb 2004 08:33:21 - 1.15 @@ -162,7 +162,8 @@ config CONFIG_SND_FM801_TEA575X tristate ForteMedia FM801 + TEA5757 tuner - depends on SND_FM801 CONFIG_VIDEO_DEV + depends on SND_FM801 +select CONFIG_VIDEO_DEV help Say 'Y' or 'M' to include support for ForteMedia FM801 based soundcards with TEA5757 tuner connected to GPIO1-3 pins (Media Forte SF256-PCS-02). --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/synth Makefile,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/synth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26337/synth Modified Files: Makefile Log Message: Fixed sequencer dependency for opl3, opl4 and emux objects. Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/synth/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile9 Feb 2003 18:41:57 - 1.9 +++ Makefile29 Feb 2004 10:03:19 - 1.10 @@ -5,10 +5,16 @@ snd-util-mem-objs := util_mem.o +# +# this function returns: +# m - CONFIG_SND_SEQUENCER is m +# empty string - CONFIG_SND_SEQUENCER is undefined +# otherwise parameter #1 value +# +sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) + # Toplevel Module Dependency obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o obj-$(CONFIG_SND_TRIDENT) += snd-util-mem.o -ifdef CONFIG_SND_SEQUENCER - obj-$(CONFIG_SND_SBAWE) += snd-util-mem.o - obj-$(CONFIG_SND) += emux/ -endif +obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-util-mem.o +obj-$(call sequencer,$(CONFIG_SND)) += emux/ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/opl4 Makefile,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/drivers/opl4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26337/drivers/opl4 Modified Files: Makefile Log Message: Fixed sequencer dependency for opl3, opl4 and emux objects. Index: Makefile === RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile23 May 2003 11:15:12 - 1.1 +++ Makefile29 Feb 2004 10:03:19 - 1.2 @@ -7,9 +7,19 @@ snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o OPL4_OBJS := snd-opl4-lib.o -ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) - OPL4_OBJS += snd-opl4-synth.o -endif +OPL4_SYNTH_OBJS := snd-opl4-synth.o + +# +# this function returns: +# m - CONFIG_SND_SEQUENCER is m +# empty string - CONFIG_SND_SEQUENCER is undefined +# otherwise parameter #1 value +# +sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1))) obj-$(CONFIG_SND_OPTI92X_AD1848) += $(OPL4_OBJS) +obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += $(OPL4_SYNTH_OBJS) obj-$(CONFIG_SND_OPTI92X_CS4231) += $(OPL4_OBJS) +obj-$(call sequencer,$CONFIG_SND_OPTI92X_CS4231)) += $(OPL4_SYNTH_OBJS) + +obj-m := $(sort $(obj-m)) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.11,1.12
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29653
Modified Files:
pcm.c
Log Message:
Fixed typo - compilation error
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pcm.c 28 Feb 2004 20:06:58 - 1.11
+++ pcm.c 29 Feb 2004 10:27:59 - 1.12
@@ -1399,7 +1399,8 @@
return -1;
}
for (k = 0; k 2; ++k) {
- snd_pcm_t *pcm = dsp-streams[k].pcm;
+ oss_dsp_stream_t *str = dsp-streams[k];
+ snd_pcm_t *pcm = str-pcm;
int err, count;
if (!pcm)
continue;
@@ -1407,7 +1408,7 @@
continue;
if ((fmode O_ACCMODE) == O_WRONLY snd_pcm_stream(pcm) ==
SND_PCM_STREAM_CAPTURE)
continue;
- if (dsp-mmap_buffer)
+ if (str-mmap_buffer)
set_oss_mmap_avail_min(dsp-streams[k], k, pcm);
count = snd_pcm_poll_descriptors_count(pcm);
if (count 0) {
@@ -1537,7 +1538,8 @@
return -1;
}
for (k = 0; k 2; ++k) {
- snd_pcm_t *pcm = dsp-streams[k].pcm;
+ oss_dsp_stream_t *str = dsp-streams[k];
+ snd_pcm_t *pcm = str-pcm;
int err, count;
if (!pcm)
continue;
@@ -1545,7 +1547,7 @@
continue;
if ((fmode O_ACCMODE) == O_WRONLY snd_pcm_stream(pcm) ==
SND_PCM_STREAM_CAPTURE)
continue;
- if (dsp-mmap_buffer)
+ if (str-mmap_buffer)
set_oss_mmap_avail_min(dsp-streams[k], k, pcm);
count = snd_pcm_poll_descriptors_count(pcm);
if (count 0) {
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include version.h,1.36,1.37
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-kernel/include Modified Files: version.h Log Message: 1.0.3 release Index: version.h === RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- version.h 4 Feb 2004 06:33:15 - 1.36 +++ version.h 29 Feb 2004 14:18:28 - 1.37 @@ -1,3 +1,3 @@ /* include/version.h. Generated by configure. */ -#define CONFIG_SND_VERSION 1.0.2c +#define CONFIG_SND_VERSION 1.0.3 #define CONFIG_SND_DATE --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/scripts ksync,1.34,1.35
Update of /cvsroot/alsa/alsa-kernel/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-kernel/scripts
Modified Files:
ksync
Log Message:
1.0.3 release
Index: ksync
===
RCS file: /cvsroot/alsa/alsa-kernel/scripts/ksync,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ksync 23 Feb 2004 21:23:40 - 1.34
+++ ksync 29 Feb 2004 14:18:28 - 1.35
@@ -185,6 +185,7 @@
('/sparc' ,'ERROR'),
('/include/emux_synth.h','Common EMU synth'),
('/synth/emux' ,'Common EMU synth'),
+ ('/synth/Makefile' ,'Synth'),
('/pcmcia/vx' ,'Digigram VX Pocket driver'),
('/pcmcia/pdaudiocf','Sound Core PDAudioCF driver'),
('/pcmcia/Kconfig' ,'PCMCIA Kconfig'),
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.229,1.230
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-driver Modified Files: configure.in Log Message: 1.0.3 release Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- configure.in25 Feb 2004 15:35:59 - 1.229 +++ configure.in29 Feb 2004 14:18:28 - 1.230 @@ -4,7 +4,7 @@ AC_INIT(acore/sound.patch) AC_PREFIX_DEFAULT(/usr) -CONFIG_SND_VERSION=1.0.3rc2 +CONFIG_SND_VERSION=1.0.3 dnl Checks for programs. AC_PROG_CC --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils configure.in,1.79,1.80
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-utils Modified Files: configure.in Log Message: 1.0.3 release Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- configure.in25 Feb 2004 15:37:09 - 1.79 +++ configure.in29 Feb 2004 14:18:28 - 1.80 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.3rc2) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.3) dnl Checks for programs. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib configure.in,1.123,1.124
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-lib
Modified Files:
configure.in
Log Message:
1.0.3 release
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- configure.in25 Feb 2004 15:36:40 - 1.123
+++ configure.in29 Feb 2004 14:18:28 - 1.124
@@ -8,7 +8,7 @@
dnl remove API = c+1:0:0
dnl *
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.3rc2)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.3)
eval LIBTOOL_VERSION_INFO=2:0:0
dnl *
AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.37,1.38
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9128/alsa-tools Modified Files: Makefile Log Message: 1.0.3 release Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Makefile25 Feb 2004 15:38:12 - 1.37 +++ Makefile29 Feb 2004 14:18:28 - 1.38 @@ -1,4 +1,4 @@ -VERSION = 1.0.3rc2 +VERSION = 1.0.3 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-firmware configure.in,1.7,1.8
Update of /cvsroot/alsa/alsa-firmware In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16991 Modified Files: configure.in Log Message: 1.0.3 Index: configure.in === RCS file: /cvsroot/alsa/alsa-firmware/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.in26 Jan 2004 19:42:00 - 1.7 +++ configure.in29 Feb 2004 15:01:00 - 1.8 @@ -1,5 +1,5 @@ AC_INIT(hdsploader/tobin.c) -AM_INIT_AUTOMAKE(alsa-firmware, 1.0.2) +AM_INIT_AUTOMAKE(alsa-firmware, 1.0.3) AC_PROG_CC AC_PROG_INSTALL AC_HEADER_STDC --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss configure.in,1.33,1.34
Update of /cvsroot/alsa/alsa-oss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557 Modified Files: configure.in Log Message: - fixed open problem (sw_params allocation) - fixed memory leak (close) - 1.0.3a version Index: configure.in === RCS file: /cvsroot/alsa/alsa-oss/configure.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- configure.in29 Feb 2004 14:18:28 - 1.33 +++ configure.in29 Feb 2004 19:33:54 - 1.34 @@ -1,5 +1,5 @@ AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.3) +AM_INIT_AUTOMAKE(alsa-oss, 1.0.3a) AC_PREFIX_DEFAULT(/usr) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.12,1.13
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/alsa
Modified Files:
pcm.c
Log Message:
- fixed open problem (sw_params allocation)
- fixed memory leak (close)
- 1.0.3a version
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pcm.c 29 Feb 2004 10:27:59 - 1.12
+++ pcm.c 29 Feb 2004 19:33:54 - 1.13
@@ -429,6 +429,11 @@
}
dsp = xfd-dsp;
for (k = 0; k 2; ++k) {
+ oss_dsp_stream_t *str = dsp-streams[k];
+ if (str-sw_params)
+ snd_pcm_sw_params_free(str-sw_params);
+ }
+ for (k = 0; k 2; ++k) {
int err;
oss_dsp_stream_t *str = dsp-streams[k];
if (!str-pcm)
@@ -537,6 +542,10 @@
result = snd_pcm_sw_params_malloc(dsp-streams[k].sw_params);
if (result 0)
goto _error;
+ }
+ for (k = 0; k 2; ++k) {
+ if (!(streams (1 k)))
+ continue;
result = snd_pcm_open(dsp-streams[k].pcm, name, k, pcm_mode);
if (result 0) {
if (k == 1 dsp-streams[0].pcm != NULL) {
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ak4531_codec.c,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/pci/ac97 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13564 Modified Files: ak4531_codec.c Log Message: Aux Input Route - Aux Capture Route renaming Index: ak4531_codec.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ak4531_codec.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ak4531_codec.c 23 Oct 2003 14:34:53 - 1.9 +++ ak4531_codec.c 28 Feb 2004 10:48:23 - 1.10 @@ -285,7 +285,7 @@ AK4531_DOUBLE(Aux Switch, 0, AK4531_LAUXA, AK4531_RAUXA, 7, 7, 1, 1), AK4531_DOUBLE(Aux Volume, 0, AK4531_LAUXA, AK4531_RAUXA, 0, 0, 0x1f, 1), AK4531_DOUBLE(Aux Playback Switch, 0, AK4531_OUT_SW2, AK4531_OUT_SW2, 5, 4, 1, 0), -AK4531_INPUT_SW(Aux Input Route, 0, AK4531_LIN_SW2, AK4531_RIN_SW2, 4, 3), +AK4531_INPUT_SW(Aux Capture Route, 0, AK4531_LIN_SW2, AK4531_RIN_SW2, 4, 3), AK4531_SINGLE(Mono Switch, 0, AK4531_MONO1, 7, 1, 1), AK4531_SINGLE(Mono Volume, 0, AK4531_MONO1, 0, 0x1f, 1), --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.10,1.11
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19238
Modified Files:
pcm.c
Log Message:
- cleanups in open (corrected error paths)
- added mangling of avail_min for select() and poll() and mmap_mode
- added capture code to mmap_update
- fixed xrun handling in mmap_update
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pcm.c 27 Feb 2004 16:16:58 - 1.10
+++ pcm.c 28 Feb 2004 20:06:58 - 1.11
@@ -1,6 +1,7 @@
/*
* OSS - ALSA compatibility layer
- * Copyright (c) by Abramo Bagnara [EMAIL PROTECTED]
+ * Copyright (c) by Abramo Bagnara [EMAIL PROTECTED],
+ * Jaroslav Kysela [EMAIL PROTECTED]
*
*
* This program is free software; you can redistribute it and/or modify
@@ -45,6 +46,7 @@
typedef struct {
snd_pcm_t *pcm;
+ snd_pcm_sw_params_t *sw_params;
size_t frame_bytes;
struct {
snd_pcm_uframes_t period_size;
@@ -344,6 +346,7 @@
str-oss.boundary = (0x3fff / str-oss.buffer_size) *
str-oss.buffer_size;
str-alsa.appl_ptr = 0;
str-alsa.old_hw_ptr = 0;
+ str-mmap_advance = str-oss.period_size;
}
return 0;
}
@@ -358,7 +361,7 @@
int err;
if (!pcm)
continue;
- snd_pcm_sw_params_alloca(sw);
+ sw = str-sw_params;
snd_pcm_sw_params_current(pcm, sw);
snd_pcm_sw_params_set_xfer_align(pcm, sw, 1);
snd_pcm_sw_params_set_start_threshold(pcm, sw,
@@ -520,10 +523,8 @@
}
dsp = calloc(1, sizeof(oss_dsp_t));
if (!dsp) {
- close(fd);
- free(xfd);
- errno = ENOMEM;
- return -1;
+ result = -ENOMEM;
+ goto _error;
}
xfd-dsp = dsp;
dsp-channels = 1;
@@ -533,6 +534,9 @@
for (k = 0; k 2; ++k) {
if (!(streams (1 k)))
continue;
+ result = snd_pcm_sw_params_malloc(dsp-streams[k].sw_params);
+ if (result 0)
+ goto _error;
result = snd_pcm_open(dsp-streams[k].pcm, name, k, pcm_mode);
if (result 0) {
if (k == 1 dsp-streams[0].pcm != NULL) {
@@ -572,7 +576,16 @@
return fd;
_error:
+ for (k = 0; k 2; ++k) {
+ if (dsp-streams[k].pcm)
+ snd_pcm_close(dsp-streams[k].pcm);
+ if (dsp-streams[k].sw_params)
+ snd_pcm_sw_params_free(dsp-streams[k].sw_params);
+ }
close(fd);
+ if (xfd-dsp)
+ free(xfd-dsp);
+ free(xfd);
errno = -result;
return -1;
}
@@ -696,11 +709,15 @@
switch (stream) {
case SND_PCM_STREAM_PLAYBACK:
if (delay 0) {
- snd_pcm_reset(pcm);
str-mmap_advance -= delay;
if (str-mmap_advance dsp-rate / 10)
str-mmap_advance = dsp-rate / 10;
-// fprintf(stderr, mmap_advance=%ld\n, str-mmap_advance);
+ //fprintf(stderr, mmap_advance=%ld\n, str-mmap_advance);
+ err = snd_pcm_forward(pcm, -delay);
+ if (err = 0) {
+ str-alsa.appl_ptr += err;
+ str-alsa.appl_ptr %= str-alsa.boundary;
+ }
}
#if USE_REWIND
err = snd_pcm_rewind(pcm, str-alsa.buffer_size);
@@ -712,8 +729,7 @@
str-alsa.appl_ptr %= str-alsa.boundary;
size = str-mmap_advance;
}
-// fprintf(stderr, delay=%ld rewind=%ld forward=%ld\n,
-// delay, err, size);
+ //fprintf(stderr, delay=%ld rewind=%ld forward=%ld\n, delay, err,
size);
#else
size = str-mmap_advance - delay;
#endif
@@ -724,7 +740,8 @@
if (frames == 0)
break;
// fprintf(stderr, copy %ld %ld %d\n, ofs, frames, dsp-format);
- snd_pcm_areas_copy(areas, ofs, str-mmap_areas, ofs,
+ snd_pcm_areas_copy(areas, ofs, str-mmap_areas,
+ str-alsa.appl_ptr % str-oss.buffer_size,
dsp-channels, frames,
dsp-format);
err = snd_pcm_mmap_commit(pcm, ofs, frames);
@@ -736,6 +753,36 @@
}
break;
case SND_PCM_STREAM_CAPTURE
[alsa-cvslog] CVS: alsa-kernel/include info.h,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10022
Modified Files:
info.h
Log Message:
Fixed snd_info_set_text_ops() wwhen CONFIG_PROC_FS is not defined
Index: info.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/info.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- info.h 23 Oct 2003 14:34:52 - 1.14
+++ info.h 27 Feb 2004 15:51:14 - 1.15
@@ -171,7 +171,7 @@
struct proc_dir_entry *de) { ; }
#define snd_card_proc_new(card,name,entryp) 0 /* always success */
-#define snd_info_set_text_ops(entry,private_data,read) /*NOP*/
+#define snd_info_set_text_ops(entry,private_data,read_size,read) /*NOP*/
#endif
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.9,1.10
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15780
Modified Files:
pcm.c
Log Message:
Added hwset flag and changed mmap_commit check code
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcm.c 26 Feb 2004 15:31:46 - 1.9
+++ pcm.c 27 Feb 2004 16:16:58 - 1.10
@@ -71,6 +71,7 @@
} oss_dsp_stream_t;
typedef struct {
+ int hwset;
unsigned int channels;
unsigned int rate;
unsigned int oss_format;
@@ -391,9 +392,11 @@
static int oss_dsp_params(oss_dsp_t *dsp)
{
int err;
+ dsp-hwset = 0;
err = oss_dsp_hw_params(dsp);
if (err 0)
return err;
+ dsp-hwset = 1;
err = oss_dsp_sw_params(dsp);
if (err 0)
return err;
@@ -725,11 +728,10 @@
dsp-channels, frames,
dsp-format);
err = snd_pcm_mmap_commit(pcm, ofs, frames);
- assert(err == (snd_pcm_sframes_t) frames);
if (err 0)
break;
- size -= frames;
- str-alsa.appl_ptr += frames;
+ size -= err;
+ str-alsa.appl_ptr += err;
str-alsa.appl_ptr %= str-alsa.boundary;
}
break;
@@ -764,6 +766,10 @@
{
int k;
DEBUG(SNDCTL_DSP_RESET)\n);
+ if (!dsp-hwset) {
+ errno = -EIO;
+ return -1;
+ }
result = 0;
for (k = 0; k 2; ++k) {
str = dsp-streams[k];
@@ -787,6 +793,10 @@
{
int k;
DEBUG(SNDCTL_DSP_SYNC)\n);
+ if (!dsp-hwset) {
+ errno = -EIO;
+ return -1;
+ }
result = 0;
for (k = 0; k 2; ++k) {
str = dsp-streams[k];
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia/pdaudiocf pdaudiocf.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20241 Modified Files: pdaudiocf.c Log Message: Fixed pcm-name settings Index: pdaudiocf.c === RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf/pdaudiocf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdaudiocf.c 23 Feb 2004 21:23:40 - 1.2 +++ pdaudiocf.c 27 Feb 2004 16:39:34 - 1.3 @@ -233,15 +233,15 @@ if (err 0) return err; - err = snd_pdacf_pcm_new(pdacf); - if (err 0) - return err; - strcpy(card-driver, PDAudio-CF); sprintf(card-shortname, Core Sound %s, card-driver); sprintf(card-longname, %s at 0x%x, irq %i, card-shortname, port, irq); + err = snd_pdacf_pcm_new(pdacf); + if (err 0) + return err; + #ifdef CONFIG_PM card-power_state_private_data = pdacf; card-set_power_state = snd_pdacf_set_power_state; --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa alsa-local.h,NONE,1.1 alsa-oss-emul.h,1.2,1.3 alsa-oss.c,1.7,1.8 mixer.c,1.2,1.3 pcm.c,1.7,1.8
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28242
Modified Files:
alsa-oss-emul.h alsa-oss.c mixer.c pcm.c
Added Files:
alsa-local.h
Log Message:
Cleanup - the libaoss.so shouldn't depend on libasound.so
--- NEW FILE: alsa-local.h ---
#include alsa-oss-emul.h
#if 1
#define DEBUG_POLL
#define DEBUG_SELECT
#ifdef NEW_MACRO_VARARGS
#define DEBUG(...) do { if (alsa_oss_debug) fprintf(stderr, __VA_ARGS__); } while (0)
#else /* !NEW_MACRO_VARARGS */
#define DEBUG(args...) do { if (alsa_oss_debug) fprintf(stderr, ##args); } while (0)
#endif
#else
#ifdef NEW_MACRO_VARARGS
#define DEBUG(...)
#else /* !NEW_MACRO_VARARGS */
#define DEBUG(args...)
#endif
#endif
extern int alsa_oss_debug;
extern snd_output_t *alsa_oss_debug_out;
Index: alsa-oss-emul.h
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/alsa-oss-emul.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-oss-emul.h 18 Feb 2004 20:17:05 - 1.2
+++ alsa-oss-emul.h 26 Feb 2004 10:52:40 - 1.3
@@ -24,22 +24,6 @@
#define NEW_MACRO_VARARGS
#endif
-#if 1
-#define DEBUG_POLL
-#define DEBUG_SELECT
-#ifdef NEW_MACRO_VARARGS
-#define DEBUG(...) do { if (alsa_oss_debug) fprintf(stderr, __VA_ARGS__); } while (0)
-#else /* !NEW_MACRO_VARARGS */
-#define DEBUG(args...) do { if (alsa_oss_debug) fprintf(stderr, ##args); } while (0)
-#endif
-#else
-#ifdef NEW_MACRO_VARARGS
-#define DEBUG(...)
-#else /* !NEW_MACRO_VARARGS */
-#define DEBUG(args...)
-#endif
-#endif
-
#define OSS_MAJOR 14
#define OSS_DEVICE_MIXER 0
#define OSS_DEVICE_SEQUENCER 1
@@ -78,7 +62,4 @@
extern int lib_oss_mixer_close(int fd);
extern int lib_oss_mixer_ioctl(int fd, unsigned long int request, ...);
-extern int alsa_oss_debug;
-extern snd_output_t *alsa_oss_debug_out;
-
#endif /* __ALSA_OSS_EMUL_H */
Index: alsa-oss.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/alsa-oss.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsa-oss.c 19 Feb 2004 16:02:20 - 1.7
+++ alsa-oss.c 26 Feb 2004 10:52:40 - 1.8
@@ -30,17 +30,38 @@
#include sys/mman.h
#include stdarg.h
#include unistd.h
+#include fcntl.h
#include dlfcn.h
#include stdio.h
-#include fcntl.h
+#include stdlib.h
+#include string.h
#include limits.h
#include errno.h
#include assert.h
-#include linux/soundcard.h
-#include alsa/asoundlib.h
#include alsa-oss-emul.h
+#ifndef ATTRIBUTE_UNUSED
+/** do not print warning (gcc) when function parameter is not used */
+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif
+
+#if 1
+#define DEBUG_POLL
+#define DEBUG_SELECT
+#ifdef NEW_MACRO_VARARGS
+#define DEBUG(...) do { if (oss_wrapper_debug) fprintf(stderr, __VA_ARGS__); } while
(0)
+#else /* !NEW_MACRO_VARARGS */
+#define DEBUG(args...) do { if (oss_wrapper_debug) fprintf(stderr, ##args); } while
(0)
+#endif
+#else
+#ifdef NEW_MACRO_VARARGS
+#define DEBUG(...)
+#else /* !NEW_MACRO_VARARGS */
+#define DEBUG(args...)
+#endif
+#endif
+
int (*_select)(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct
timeval *timeout);
int (*_poll)(struct pollfd *ufds, unsigned int nfds, int timeout);
int (*_open)(const char *file, int oflag, ...);
@@ -76,6 +97,7 @@
void *mmap_area;
} fd_t;
+static int oss_wrapper_debug = 0;
static int open_max;
static int poll_fds_add = 0;
static fd_t **fds;
@@ -407,7 +429,7 @@
if (direct)
return _poll(pfds, nfds, timeout);
#ifdef DEBUG_POLL
- if (alsa_oss_debug) {
+ if (oss_wrapper_debug) {
fprintf(stderr, Orig enter );
dump_poll(pfds, nfds, timeout);
fprintf(stderr, Changed enter );
@@ -450,7 +472,7 @@
count1++;
}
#ifdef DEBUG_POLL
- if (alsa_oss_debug) {
+ if (oss_wrapper_debug) {
fprintf(stderr, Changed exit );
dump_poll(pfds1, nfds1, timeout);
fprintf(stderr, Orig exit );
@@ -529,7 +551,7 @@
if (direct)
return _select(nfds, rfds, wfds, efds, timeout);
#ifdef DEBUG_SELECT
- if (alsa_oss_debug) {
+ if (oss_wrapper_debug) {
fprintf(stderr, Orig enter );
dump_select(nfds, rfds, wfds, efds, timeout);
fprintf(stderr, Changed enter );
@@ -598,7 +620,7 @@
count1++;
}
#ifdef DEBUG_SELECT
- if (alsa_oss_debug) {
+ if (oss_wrapper_debug) {
fprintf(stderr, Changed exit );
dump_select(nfds1, rfds1, wfds1, efds1, timeout);
fprintf(stderr, Orig exit );
@@ -676,7 +698,7 @@
return;
s = getenv(ALSA_OSS_DEBUG);
if (s)
- alsa_oss_debug = 1;
+ oss_wrapper_debug = 1;
open_max =
[alsa-cvslog] CVS: alsa-oss/test testaoss.in,1.2,1.3
Update of /cvsroot/alsa/alsa-oss/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26707/test
Modified Files:
testaoss.in
Log Message:
Removed ALSA_OSS_WRAPPER environment variable
Index: testaoss.in
===
RCS file: /cvsroot/alsa/alsa-oss/test/testaoss.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testaoss.in 21 Feb 2004 19:14:42 - 1.2
+++ testaoss.in 26 Feb 2004 18:34:58 - 1.3
@@ -5,4 +5,4 @@
# testaoss command command options and arguments
[EMAIL PROTECTED]@
-ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec $@
+LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec $@
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa alsa-oss.c,1.8,1.9 aoss.in,1.3,1.4 testaoss.in,1.2,1.3
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26707/alsa
Modified Files:
alsa-oss.c aoss.in testaoss.in
Log Message:
Removed ALSA_OSS_WRAPPER environment variable
Index: alsa-oss.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/alsa-oss.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- alsa-oss.c 26 Feb 2004 10:52:40 - 1.8
+++ alsa-oss.c 26 Feb 2004 18:34:58 - 1.9
@@ -693,10 +693,7 @@
static void initialize()
{
- char *s = getenv(ALSA_OSS_WRAPPER);
- if (s == NULL)
- return;
- s = getenv(ALSA_OSS_DEBUG);
+ char *s = getenv(ALSA_OSS_DEBUG);
if (s)
oss_wrapper_debug = 1;
open_max = sysconf(_SC_OPEN_MAX);
Index: aoss.in
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/aoss.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aoss.in 21 Feb 2004 19:14:42 - 1.3
+++ aoss.in 26 Feb 2004 18:34:58 - 1.4
@@ -6,4 +6,4 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-ALSA_OSS_WRAPPER=1 [EMAIL PROTECTED]@/libaoss.so exec $@
[EMAIL PROTECTED]@/libaoss.so exec $@
Index: testaoss.in
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/testaoss.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testaoss.in 21 Feb 2004 19:14:42 - 1.2
+++ testaoss.in 26 Feb 2004 18:34:58 - 1.3
@@ -5,5 +5,4 @@
# testaoss command command options and arguments
[EMAIL PROTECTED]@
-ALSA_OSS_WRAPPER=1 LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec $@
-
+LD_PRELOAD=${prefix}/alsa/.libs/libaoss.so exec $@
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss configure.in,1.31,1.32
Update of /cvsroot/alsa/alsa-oss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336 Modified Files: configure.in Log Message: 1.0.3rc3 Index: configure.in === RCS file: /cvsroot/alsa/alsa-oss/configure.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- configure.in25 Feb 2004 19:16:10 - 1.31 +++ configure.in26 Feb 2004 18:41:18 - 1.32 @@ -1,5 +1,5 @@ AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.3rc2) +AM_INIT_AUTOMAKE(alsa-oss, 1.0.3rc3) AC_PREFIX_DEFAULT(/usr) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/test .cvsignore,1.3,1.4 osstest.c,1.3,1.4
Update of /cvsroot/alsa/alsa-oss/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18663
Modified Files:
.cvsignore osstest.c
Log Message:
Set format to S16_LE, fixed trigger
Index: .cvsignore
===
RCS file: /cvsroot/alsa/alsa-oss/test/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 Feb 2004 18:52:20 - 1.3
+++ .cvsignore 26 Feb 2004 15:34:50 - 1.4
@@ -5,5 +5,5 @@
*.lo
*.la
testaoss
-mmap_test
+osstest
lmixer
Index: osstest.c
===
RCS file: /cvsroot/alsa/alsa-oss/test/osstest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osstest.c 19 Feb 2004 16:02:21 - 1.3
+++ osstest.c 26 Feb 2004 15:34:50 - 1.4
@@ -14,6 +14,7 @@
//static char data[50];
static int verbose;
static char *device = /dev/dsp;
+static int format = AFMT_S16_LE;
static int rate = 48000;
static int channels = 2;
static int omode = O_RDWR;
@@ -47,6 +48,12 @@
{
int caps;
+ if (oss_pcm_ioctl(fd, SNDCTL_DSP_SETFMT, format) 0) {
+ perror(SNDCTL_DSP_SETFMT\n);
+ exit(EXIT_FAILURE);
+ }
+ printf(Format set to %d\n, format);
+
if (oss_pcm_ioctl(fd, SNDCTL_DSP_SPEED, rate) 0) {
perror(SNDCTL_DSP_SPEED\n);
exit(EXIT_FAILURE);
@@ -127,6 +134,7 @@
{
int tmp;
+ tmp = 0;
if (oss_pcm_ioctl(fd, SNDCTL_DSP_SETTRIGGER, tmp) 0) {
perror(SNDCTL_DSP_SETTRIGGER);
exit(EXIT_FAILURE);
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa pcm.c,1.8,1.9
Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17773
Modified Files:
pcm.c
Log Message:
Update appl_ptr when rewind() is called (mmap)
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcm.c 26 Feb 2004 10:52:40 - 1.8
+++ pcm.c 26 Feb 2004 15:31:46 - 1.9
@@ -705,6 +705,8 @@
/* fallback to not very accurate method */
size = str-mmap_advance - delay;
} else {
+ str-alsa.appl_ptr -= err;
+ str-alsa.appl_ptr %= str-alsa.boundary;
size = str-mmap_advance;
}
// fprintf(stderr, delay=%ld rewind=%ld forward=%ld\n,
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pcmcia/pdaudiocf pdaudiocf_irq.c,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18930 Modified Files: pdaudiocf_irq.c Log Message: [EMAIL PROTECTED] Fix pdaudiocf_irq.c for gcc-3.5 Index: pdaudiocf_irq.c === RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_irq.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdaudiocf_irq.c 23 Feb 2004 19:10:24 - 1.1 +++ pdaudiocf_irq.c 25 Feb 2004 10:39:41 - 1.2 @@ -267,8 +267,8 @@ if (chip-pcm_substream == NULL || chip-pcm_substream-runtime == NULL || !snd_pcm_running(chip-pcm_substream)) return; - (unsigned int)rdp = inw(chip-port + PDAUDIOCF_REG_RDP); - (unsigned int)wdp = inw(chip-port + PDAUDIOCF_REG_WDP); + rdp = inw(chip-port + PDAUDIOCF_REG_RDP); + wdp = inw(chip-port + PDAUDIOCF_REG_WDP); // printk(TASKLET: rdp = %x, wdp = %x\n, rdp, wdp); size = wdp - rdp; if (size 0) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/oss-redir Makefile.am,1.2,1.3
Update of /cvsroot/alsa/alsa-oss/oss-redir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14968/oss-redir
Modified Files:
Makefile.am
Log Message:
Moved oss-redir.h to /usr/include
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-oss/oss-redir/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 12 Feb 2004 17:16:07 - 1.2
+++ Makefile.am 25 Feb 2004 13:10:36 - 1.3
@@ -1,4 +1,4 @@
-ossredirincludedir = ${includedir}/sound
+ossredirincludedir = ${includedir}
ossredirinclude_HEADERS = oss-redir.h
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.227,1.228
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13433 Modified Files: configure.in Log Message: 1.0.3rc1 Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- configure.in24 Feb 2004 09:17:30 - 1.227 +++ configure.in25 Feb 2004 15:35:30 - 1.228 @@ -4,7 +4,7 @@ AC_INIT(acore/sound.patch) AC_PREFIX_DEFAULT(/usr) -CONFIG_SND_VERSION=1.0.2c +CONFIG_SND_VERSION=1.0.3rc1 dnl Checks for programs. AC_PROG_CC --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib configure.in,1.122,1.123
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13645
Modified Files:
configure.in
Log Message:
1.0.3rc2
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- configure.in21 Feb 2004 21:15:06 - 1.122
+++ configure.in25 Feb 2004 15:36:40 - 1.123
@@ -8,7 +8,7 @@
dnl remove API = c+1:0:0
dnl *
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.3rc1)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.3rc2)
eval LIBTOOL_VERSION_INFO=2:0:0
dnl *
AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.228,1.229
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483 Modified Files: configure.in Log Message: 1.0.3rc2 Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- configure.in25 Feb 2004 15:35:30 - 1.228 +++ configure.in25 Feb 2004 15:35:59 - 1.229 @@ -4,7 +4,7 @@ AC_INIT(acore/sound.patch) AC_PREFIX_DEFAULT(/usr) -CONFIG_SND_VERSION=1.0.3rc1 +CONFIG_SND_VERSION=1.0.3rc2 dnl Checks for programs. AC_PROG_CC --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils configure.in,1.78,1.79
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13739 Modified Files: configure.in Log Message: 1.0.3rc2 Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- configure.in25 Feb 2004 11:25:53 - 1.78 +++ configure.in25 Feb 2004 15:37:09 - 1.79 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.2) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.3rc2) dnl Checks for programs. --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.36,1.37
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13895 Modified Files: Makefile Log Message: 1.0.3rc2 Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Makefile26 Jan 2004 19:38:28 - 1.36 +++ Makefile25 Feb 2004 15:38:12 - 1.37 @@ -1,4 +1,4 @@ -VERSION = 1.0.2 +VERSION = 1.0.3rc2 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-oss/alsa Makefile.am,1.8,1.9
Update of /cvsroot/alsa/alsa-oss/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12511 Modified Files: Makefile.am Log Message: One more fix, the libaoss.so doesn't depend directly on libasound.so Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-oss/alsa/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.am 25 Feb 2004 19:45:00 - 1.8 +++ Makefile.am 25 Feb 2004 19:56:06 - 1.9 @@ -5,9 +5,8 @@ noinst_HEADERS = alsa-oss-emul.h -libaoss_la_CFLAGS = @ALSA_CFLAGS@ libaoss_la_SOURCES = alsa-oss.c -libaoss_la_LIBADD = @ALSA_LIBS@ +libaoss_la_LIBADD = libalsatoss.la libalsatoss_la_CFLAGS = @ALSA_CFLAGS@ libalsatoss_la_SOURCES = pcm.c mixer.c --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver configure.in,1.226,1.227
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28189 Modified Files: configure.in Log Message: Added scnprintf detection Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- configure.in4 Feb 2004 16:28:14 - 1.226 +++ configure.in24 Feb 2004 09:17:30 - 1.227 @@ -1074,6 +1074,30 @@ AC_DEFINE(CONFIG_HAVE_SNPRINTF) fi +dnl Check for scnprintf... +AC_MSG_CHECKING(for scnprintf) +scnprintf=0 +ac_save_CFLAGS=$CFLAGS +CFLAGS=-Wall -Werror $CFLAGS $KERNEL_INC $HACK_KERNEL_INC +AC_TRY_COMPILE([ +#define __KERNEL__ +#include $CONFIG_SND_KERNELDIR/include/linux/config.h +#include $CONFIG_SND_KERNELDIR/include/linux/kernel.h +],[ + char buf[128]; + scnprintf(buf, sizeof(buf), abcd); +], +AC_MSG_RESULT(yes);scnprintf=1, +AC_MSG_RESULT(no);scnprintf=0, +AC_MSG_RESULT(unknown);scnprintf=0 +) +CFLAGS=$ac_save_CFLAGS +CONFIG_HAVE_SCNPRINTF=$scnprintf +dnl AC_SUBST(CONFIG_HAVE_SCNPRINTF) +if test $CONFIG_HAVE_SCNPRINTF = 1; then + AC_DEFINE(CONFIG_HAVE_SCNPRINTF) +fi + dnl Check for vmalloc_to_page... AC_MSG_CHECKING(for vmalloc_to_page) vmalloc_to_page=0 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/include/sound asequencer.h,1.3,1.4
Update of /cvsroot/alsa/alsa-lib/include/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31846
Modified Files:
asequencer.h
Log Message:
Sync with alsa-kernel
Index: asequencer.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/sound/asequencer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- asequencer.h7 Jan 2004 14:36:40 - 1.3
+++ asequencer.h24 Feb 2004 09:37:15 - 1.4
@@ -594,6 +594,7 @@
#define SNDRV_SEQ_PORT_TYPE_MIDI_GS(13) /* GS compatible device */
#define SNDRV_SEQ_PORT_TYPE_MIDI_XG(14) /* XG compatible device */
#define SNDRV_SEQ_PORT_TYPE_MIDI_MT32 (15) /* MT-32 compatible device */
+#define SNDRV_SEQ_PORT_TYPE_MIDI_GM2 (16) /* General MIDI 2 compatible device */
/* other standards...*/
#define SNDRV_SEQ_PORT_TYPE_SYNTH (110) /* Synth device (no MIDI compatible -
direct wavetable) */
@@ -605,7 +606,7 @@
/* misc. conditioning flags */
#define SNDRV_SEQ_PORT_FLG_GIVEN_PORT (10)
#define SNDRV_SEQ_PORT_FLG_TIMESTAMP (11)
-#define SNDRV_SEQ_PORT_FLG_TIME_REAL (11)
+#define SNDRV_SEQ_PORT_FLG_TIME_REAL (12)
struct sndrv_seq_port_info {
struct sndrv_seq_addr addr; /* client/port numbers */
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/envy24control envy24control.1,1.3,1.4 envy24control.c,1.21,1.22 envy24control.h,1.11,1.12 mixer.c,1.7,1.8 patchbay.c,1.7,1.8
Update of /cvsroot/alsa/alsa-tools/envy24control
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25854
Modified Files:
envy24control.1 envy24control.c envy24control.h mixer.c
patchbay.c
Log Message:
[EMAIL PROTECTED]
I have attached patch for envy24control because after update from James
Tappin i have had problems with the mixer and patchbay.
SPDIF inputs and outputs was duplicated.
Index: envy24control.1
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- envy24control.1 4 Jun 2003 13:46:49 - 1.3
+++ envy24control.1 24 Feb 2004 19:05:44 - 1.4
@@ -32,13 +32,13 @@
card in your ALSA driver setup.
.TP
\fI-o\fP outputs
-Limit number of outputs to display. Default is 8.
+Limit number of analog line outputs to display. Default is 8.
.TP
\fI-i\fP inputs
-Limit number of inputs to display. Default is 10.
+Limit number of analog line inputs to display. Default is 8.
.TP
\fI-s\fP outputs
-Limit number of SPDIF outputs to display. Default is 2.
+Limit number of SPDIF inputs/outputs to display. Default is 2.
.SH SEE ALSO
\fB
Index: envy24control.c
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- envy24control.c 23 Feb 2004 12:51:02 - 1.21
+++ envy24control.c 24 Feb 2004 19:05:44 - 1.22
@@ -1680,14 +1680,14 @@
gtk_init(argc, argv);
name = hw:0;
- input_channels = 8;
- output_channels = 10;
- spdif_channels = 2;
+ input_channels = MAX_INPUT_CHANNELS;
+ output_channels = MAX_OUTPUT_CHANNELS;
+ spdif_channels = MAX_SPDIF_CHANNELS;
while ((c = getopt_long(argc, argv, D:c:i:o:s:, long_options, NULL)) != -1) {
switch (c) {
case 'c':
i = atoi(optarg);
- if (i 0 || i = 8) {
+ if (i 0 || i = MAX_CARD_NUMBERS) {
fprintf(stderr, envy24control: invalid card number
%d\n, i);
exit(1);
}
@@ -1699,24 +1699,24 @@
break;
case 'i':
input_channels = atoi(optarg);
- if (input_channels 0 || input_channels 8) {
- fprintf(stderr, envy24control: must have 0-8
inputs\n);
+ if (input_channels 0 || input_channels MAX_INPUT_CHANNELS)
{
+ fprintf(stderr, envy24control: must have 0-%i
inputs\n, MAX_INPUT_CHANNELS);
exit(1);
}
input_channels_set = 1;
break;
case 'o':
output_channels = atoi(optarg);
- if (output_channels 0 || output_channels 10) {
- fprintf(stderr, envy24control: must have 0-10
outputs\n);
+ if (output_channels 0 || output_channels
MAX_OUTPUT_CHANNELS) {
+ fprintf(stderr, envy24control: must have 0-%i
outputs\n, MAX_OUTPUT_CHANNELS);
exit(1);
output_channels_set = 1;
}
break;
case 's':
spdif_channels = atoi(optarg);
- if (spdif_channels 0 || spdif_channels 2) {
- fprintf(stderr, envy24control: must have 0-2
spdifs\n);
+ if (spdif_channels 0 || spdif_channels MAX_SPDIF_CHANNELS)
{
+ fprintf(stderr, envy24control: must have 0-%i
spdifs\n, MAX_SPDIF_CHANNELS);
exit(1);
}
break;
Index: envy24control.h
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- envy24control.h 30 Oct 2003 15:09:04 - 1.11
+++ envy24control.h 24 Feb 2004 19:05:44 - 1.12
@@ -25,6 +25,11 @@
/* Hoontech */
#define ICE1712_SUBDEVICE_STDSP24 0x12141217 /* Hoontech SoundTrack Audio
DSP 24 */
+#define MAX_CARD_NUMBERS 8
+#define MAX_INPUT_CHANNELS 8
+#define MAX_OUTPUT_CHANNELS8
+#define MAX_SPDIF_CHANNELS 2
+
typedef struct {
unsigned int subvendor; /* PCI[2c-2f] */
unsigned char size; /* size of EEPROM image in bytes */
Index: mixer.c
===
RCS file:
[alsa-cvslog] CVS: alsa-oss/alsa aoss.1,1.1,1.2
Update of /cvsroot/alsa/alsa-oss/alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1142 Modified Files: aoss.1 Log Message: Florian Schmidt [EMAIL PROTECTED] a note about FILE * based apps Index: aoss.1 === RCS file: /cvsroot/alsa/alsa-oss/alsa/aoss.1,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aoss.1 9 Feb 2004 12:36:39 - 1.1 +++ aoss.1 24 Feb 2004 19:40:47 - 1.2 @@ -28,6 +28,10 @@ slave.pcm dmix } +In the above configuration examples, the pcm.dsp0 definition is used to wrap calls do /dev/dsp0. You can also wrap usage of /dev/dsp1, /dev/dsp2, etc. by defining pcm.dsp1, pcm.dsp2, etc.. + +In the current form, aoss is not able to wrap OSS applications that make use of libc's FILE* infrastructure (fopen() and friends) for their communication with the OSS sound driver. This is because libc uses internal versions of open() and friends which cannot be intercepted by LD_PRELOAD'ing a shared library.. + .SS Arguments .TP \fIosscommand\fP --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include emu10k1.h,1.36,1.37
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16152 Modified Files: emu10k1.h Log Message: James Courtier-Dutton [EMAIL PROTECTED], some additions Index: emu10k1.h === RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- emu10k1.h 23 Feb 2004 19:22:01 - 1.36 +++ emu10k1.h 25 Feb 2004 07:32:11 - 1.37 @@ -644,9 +644,13 @@ #define SOLEH 0x5d/* Stop on loop enable high register */ #define SPBYPASS 0x5e/* SPDIF BYPASS mode register */ -#define SPBYPASS_ENABLE0x0001 /* Enable SPDIF bypass mode */ +#define SPBYPASS_SPDIF0_MASK 0x0003 /* SPDIF 0 bypass mode */ +#define SPBYPASS_SPDIF1_MASK 0x000c /* SPDIF 1 bypass mode */ +/* bypass mode: 0 - DSP; 1 - SPDIF A, 2 - SPDIF B, 3 - SPDIF C */ +#define SPBYPASS_FORMAT0x0f00 /* If 1, SPDIF XX uses 24 bit, if 0 - 20 bit*/ #define AC97SLOT 0x5f/* additional AC97 slots enable bits */ +#define AC97SLOT_10K2 0x03 #define AC97SLOT_CNTR 0x10/* Center enable */ #define AC97SLOT_LFE 0x20/* LFE enable */ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.270,1.271
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11912
Modified Files:
pcm.c
Log Message:
Reverted deprecated functions and added linker warning to them
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- pcm.c 21 Feb 2004 20:38:07 - 1.270
+++ pcm.c 23 Feb 2004 10:34:17 - 1.271
@@ -6085,6 +6085,21 @@
return xfer 0 ? (snd_pcm_sframes_t) xfer : err;
}
+snd_pcm_uframes_t _snd_pcm_mmap_hw_ptr(snd_pcm_t *pcm)
+{
+ return *pcm-hw.ptr;
+}
+
+snd_pcm_uframes_t _snd_pcm_boundary(snd_pcm_t *pcm)
+{
+ return pcm-boundary;
+}
+
+#ifndef DOC_HIDDEN
+link_warning(_snd_pcm_mmap_hw_ptr, Warning: _snd_pcm_mmap_hw_ptr() is deprecated,
consider to not use this function);
+link_warning(_snd_pcm_boundary, Warning: _snd_pcm_boundary() is deprecated, consider
to use snd_pcm_sw_params_current());
+#endif
+
static const char *names[SND_PCM_HW_PARAM_LAST_INTERVAL + 1] = {
[SND_PCM_HW_PARAM_FORMAT] = format,
[SND_PCM_HW_PARAM_CHANNELS] = channels,
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/seq seq_clientmgr.c,1.27,1.28
Update of /cvsroot/alsa/alsa-kernel/core/seq
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14626
Modified Files:
seq_clientmgr.c
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
Timestamping (if enabled on a subscription or a port) is not applied
to the quoted event but to the quoting event. This patch adds a
function to copy only selected fields into the event to be delivered.
- fix KERNEL_QUOTE event timestamping
- fix typo in port_broadcast_event
Index: seq_clientmgr.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_clientmgr.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- seq_clientmgr.c 5 Feb 2004 15:38:42 - 1.27
+++ seq_clientmgr.c 23 Feb 2004 10:50:22 - 1.28
@@ -547,6 +547,36 @@
/*
+ * expand a quoted event.
+ */
+static int expand_quoted_event(snd_seq_event_t *event)
+{
+ snd_seq_event_t *quoted;
+
+ quoted = event-data.quote.event;
+ if (quoted == NULL) {
+ snd_printd(seq: quoted event is NULL\n);
+ return -EINVAL;
+ }
+
+ event-type = quoted-type;
+ event-tag = quoted-tag;
+ event-source = quoted-source;
+ /* don't use quoted destination */
+ event-data = quoted-data;
+ /* use quoted timestamp only if subscription/port didn't update it */
+ if (event-queue == SNDRV_SEQ_QUEUE_DIRECT) {
+ event-flags = quoted-flags;
+ event-queue = quoted-queue;
+ event-time = quoted-time;
+ } else {
+ event-flags = (event-flags SNDRV_SEQ_TIME_STAMP_MASK)
+ | (quoted-flags ~SNDRV_SEQ_TIME_STAMP_MASK);
+ }
+ return 0;
+}
+
+/*
* deliver an event to the specified destination.
* if filter is non-zero, client filter bitmap is tested.
*
@@ -581,12 +611,9 @@
update_timestamp_of_queue(event, dest_port-time_queue,
dest_port-time_real);
- /* expand the quoted event */
if (event-type == SNDRV_SEQ_EVENT_KERNEL_QUOTE) {
quoted = 1;
- event = event-data.quote.event;
- if (event == NULL) {
- snd_printd(seq: quoted event is NULL\n);
+ if (expand_quoted_event(event) 0) {
result = 0; /* do not send bounce error */
goto __skip;
}
@@ -694,8 +721,8 @@
if (dest_client == NULL)
return 0; /* no matching destination */
- read_lock(client-ports_lock);
- list_for_each(p, client-ports_list_head) {
+ read_lock(dest_client-ports_lock);
+ list_for_each(p, dest_client-ports_list_head) {
client_port_t *port = list_entry(p, client_port_t, list);
event-dest.port = port-addr.port;
/* pass NULL as source client to avoid error bounce */
@@ -706,7 +733,7 @@
break;
num_ev++;
}
- read_unlock(client-ports_lock);
+ read_unlock(dest_client-ports_lock);
snd_seq_client_unlock(dest_client);
event-dest.port = SNDRV_SEQ_ADDRESS_BROADCAST; /* restore */
return (err 0) ? err : num_ev;
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/drivers/mpu401 mpu401_uart.c,1.29,1.30
Update of /cvsroot/alsa/alsa-kernel/drivers/mpu401 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14782 Modified Files: mpu401_uart.c Log Message: Clemens Ladisch [EMAIL PROTECTED] remove unneeded technical information from port names Index: mpu401_uart.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/mpu401/mpu401_uart.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mpu401_uart.c 13 Jan 2004 17:11:25 - 1.29 +++ mpu401_uart.c 23 Feb 2004 10:51:12 - 1.30 @@ -528,9 +528,9 @@ mpu-irq = irq; mpu-irq_flags = irq_flags; if (card-shortname[0]) - snprintf(rmidi-name, sizeof(rmidi-name), %s MPU-401, card-shortname); + snprintf(rmidi-name, sizeof(rmidi-name), %s MIDI, card-shortname); else - sprintf(rmidi-name, MPU-401 (UART) %d-%d, card-number, device); + sprintf(rmidi-name, MPU-401 MIDI %d-%d, card-number, device); snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, snd_mpu401_uart_output); snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, snd_mpu401_uart_input); rmidi-info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/core/seq seq_midi.c,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/core/seq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14995 Modified Files: seq_midi.c Log Message: Clemens Ladisch [EMAIL PROTECTED] This patch reverses the order of the Rawmidi x and rawmidi name parts of client names to enable selecting clients by a unique prefix (as snd_seq_parse_address does). Index: seq_midi.c === RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_midi.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- seq_midi.c 7 Jan 2004 14:34:22 - 1.15 +++ seq_midi.c 23 Feb 2004 10:52:15 - 1.16 @@ -285,7 +285,7 @@ cinfo.client = client-seq_client; cinfo.type = KERNEL_CLIENT; name = rmidi-name[0] ? (const char *)rmidi-name : External MIDI; - snprintf(cinfo.name, sizeof(cinfo.name), Rawmidi %d - %s, card-number, name); + snprintf(cinfo.name, sizeof(cinfo.name), %s - Rawmidi %d, name, card-number); return snd_seq_kernel_client_ctl(client-seq_client, SNDRV_SEQ_IOCTL_SET_CLIENT_INFO, cinfo); } --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
