Changeset 312 for GPL/branches


Ignore:
Timestamp:
Mar 24, 2008, 4:56:48 AM (17 years ago)
Author:
Paul Smedley
Message:

Reinstate ALS4000 device

Location:
GPL/branches/uniaud-2.0
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud-2.0/alsa-kernel/isa/makefile.os2

    r32 r312  
    3232#
    3333#===================================================================
    34 FILE1    = opl3sa2.obj
    35 #als100.obj azt2320.obj cmi8330.obj dt0197h.obj es18xx.obj
     34FILE1    =
    3635FILE2    =
    37 # sgalaxy.obj
    3836FILE3    =
    3937FILE4    =

  • GPL/branches/uniaud-2.0/alsa-kernel/makefile.os2

    r305 r312  
    4141    @echo BUILDING isa
    4242    @cd isa
    43 #    @wmake $(NMAKEOPTS)
     43    @wmake $(NMAKEOPTS)
    4444    @cd ..
    4545    @echo BUILDING pci

  • GPL/branches/uniaud-2.0/alsa-kernel/pci/als4000.c

    r305 r312  
    689689        }
    690690        /* check, if we can restrict PCI DMA transfers to 24 bits */
    691 #ifndef TARGET_OS2
    692691        if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
    693692            pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
    694 #else
    695         if (!pci_dma_supported(pci, DMA_24BIT_MASK)) {
    696 #endif
    697693                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
    698694                pci_disable_device(pci);

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

    r310 r312  
    3434FILE1    = pci_iomap_compat.obj ens1370.obj ens1371.obj cs4281.obj  es1938.obj
    3535FILE2    = es1968.obj intel8x0.obj maestro3.obj via82xx.obj
    36 FILE3    = fm801.obj atiixp.obj cmipci.obj
    37 #FILE4    = als4000.obj
     36FILE3    = fm801.obj atiixp.obj cmipci.obj als4000.obj
     37FILE4    =
    3838FILE5    =
    3939FILE6    =

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

    r305 r312  
    7171
    7272#LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\instr.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
    73 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
     73LIBS     = $(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
    7474WMAPNAME = $(OBJDIR)\$(TARGET).wmap
    7575# $(ALSA_LIB)\au88xx.lib

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

    r310 r312  
    177177        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_cmipci_exit);
    178178    }
    179 #if 0
    180179    if((ForceCard == CARD_NONE || ForceCard == CARD_ALS4000) &&
    181180       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_als4000_init) == 0)
    … …  
    183182        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_als4000_exit);
    184183    }
    185 #endif
    186184    if((ForceCard == CARD_NONE || ForceCard == CARD_CS4281) &&
    187185       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cs4281_init) == 0)
Note: See TracChangeset for help on using the changeset viewer.