Changeset 382 for GPL


Ignore:
Timestamp:
Sep 27, 2008, 11:10:33 AM (17 years ago)
Author:
Paul Smedley
Message:

Reinstate support for emu10k1 cards

Location:
GPL/branches/uniaud32-2.0
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/config.h

    r358 r382  
    575575
    576576#define assert(a)
    577 #define CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
    578 #define CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
    579577
    580578#ifndef fastcall
    … …  
    620618#endif
    621619
     620#define GFP_DMA32 0             /* driver must check for 32-bit address */
     621#define __GFP_COMP      0
     622#define __GFP_NOWARN    0
     623#define __GFP_NORETRY   0
     624
     625#define page_to_pfn(page)       (page_to_phys(page) >> PAGE_SHIFT)
     626
    622627#endif //__ALSA_CONFIG_H__

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/emu10k1/memory.c

    r358 r382  
    456456static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
    457457{
     458#ifndef TARGET_OS2
    458459        int page, first_page, last_page;
    459460
    … …  
    481482        }
    482483        return 0;
     484#else
     485    int page, first_page, last_page;
     486    struct snd_dma_buffer dmab;
     487
     488    emu10k1_memblk_init(blk);
     489    get_single_page_range(emu->memhdr, blk, &first_page, &last_page);
     490    /* allocate kernel pages */
     491    for (page = first_page; page <= last_page; page++) {
     492        if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci),
     493                                PAGE_SIZE, &dmab) < 0)
     494            goto __fail;
     495        if (! is_valid_page(emu, dmab.addr)) {
     496            snd_dma_free_pages(&dmab);
     497            goto __fail;
     498        }
     499        emu->page_addr_table[page] = dmab.addr;
     500        emu->page_ptr_table[page] = dmab.area;
     501    }
     502    return 0;
     503
     504__fail:
     505    /* release allocated pages */
     506    last_page = page - 1;
     507    for (page = first_page; page <= last_page; page++) {
     508        dmab.area = emu->page_ptr_table[page];
     509        dmab.addr = emu->page_addr_table[page];
     510        dmab.bytes = PAGE_SIZE;
     511        snd_dma_free_pages(&dmab);
     512        emu->page_addr_table[page] = 0;
     513        emu->page_ptr_table[page] = NULL;
     514    }
     515
     516    return -ENOMEM;
     517#endif
    483518}
    484519

  • GPL/branches/uniaud32-2.0/alsa-kernel/pci/makefile.os2

    r333 r382  
    6666    @echo BUILDING emu10k1
    6767    @cd emu10k1
    68 #    @wmake $(NMAKEOPTS)
     68    @wmake $(NMAKEOPTS)
    6969    @cd ..
    7070    @echo BUILDING ca0106
    … …  
    101101
    102102clean: .SYMBOLIC
     103    @echo CLEANING hda
     104    @cd hda
     105    @wmake $(NMAKEOPTS) clean
     106    @cd ..
    103107    @echo CLEANING ac97
    104108    @cd ac97

  • GPL/branches/uniaud32-2.0/drv32/makefile.os2

    r335 r382  
    6969FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10)
    7070
    71 LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
     71LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
    7272WMAPNAME = $(OBJDIR)\$(TARGET).wmap
    7373# $(ALSA_LIB)\au88xx.lib

  • GPL/branches/uniaud32-2.0/lib32/ossidc.cpp

    r344 r382  
    166166    }
    167167
    168 #if 0
     168
    169169    if((ForceCard == CARD_NONE || ForceCard == CARD_SBLIVE) &&
    170170       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_emu10k1_init) == 0)
    … …  
    172172        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_emu10k1_exit);
    173173    }
    174 #endif
     174
    175175    if((ForceCard == CARD_NONE || ForceCard == CARD_CMEDIA) &&
    176176       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cmipci_init) == 0)
Note: See TracChangeset for help on using the changeset viewer.