Changeset 573


Ignore:
Timestamp:
Nov 30, 2012, 12:13:55 AM (13 years ago)
Author:
David Azarewicz
Message:

fixed build problems, changed version number

Location:
GPL/branches/uniaud32-2.1.x
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-2.1.x

  • GPL/branches/uniaud32-2.1.x/!clean.cmd

    r86 r573  
    11@echo off
    22SET KEE=0
     3wmake -ms -f makefile.os2 clean
    34wmake -ms -f makefile.os2 DEBUG=1 clean
    45SET KEE=1
     6wmake -ms -f makefile.os2 clean
    57wmake -ms -f makefile.os2 DEBUG=1 clean
    68SET KEE=

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/core/init.c

    r569 r573  
    607607EXPORT_SYMBOL(snd_card_set_id);
    608608
     609#ifdef NOT_USED
    609610static ssize_t
    610611card_id_show_attr(struct device *dev,
    … …  
    654655        return count;
    655656}
     657#endif
    656658
    657659static struct device_attribute card_id_attrs =
    658660        __ATTR(id, S_IRUGO | S_IWUSR, card_id_show_attr, card_id_store_attr);
    659661
     662#ifdef NOT_USED
    660663static ssize_t
    661664card_number_show_attr(struct device *dev,
    … …  
    665668        return snprintf(buf, PAGE_SIZE, "%i\n", card ? card->number : -1);
    666669}
     670#endif
    667671
    668672static struct device_attribute card_number_attrs =

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/core/seq/seq.c

    r569 r573  
    7979MODULE_PARM_DESC(seq_default_timer_resolution, "The default timer resolution in Hz.");
    8080
    81 MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_SEQUENCER);
     81MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR);
    8282MODULE_ALIAS("devname:snd/seq");
    8383

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/core/timer.c

    r569 r573  
    5454MODULE_PARM_DESC(timer_tstamp_monotonic, "Use posix monotonic clock source for timestamps (default).");
    5555
    56 MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_TIMER);
     56MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR);
    5757MODULE_ALIAS("devname:snd/timer");
    5858

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

    r569 r573  
    119119struct class_device;
    120120struct class_device_attribute {int x; }; /* dummy */
    121 #define __ATTR(cls,perm,read,write) {NULL } /* dummy */
     121#define __ATTR(cls,perm,read,write) {0 } /* dummy */
    122122
    123123#define min_t(type, x, y) ({                    \

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/hda_codec.h

    r569 r573  
    10091009}
    10101010#else   
    1011 #define hda_call_check_power_status(codec, nid)         0
     1011#define hda_call_check_power_status(codec, nid)         
    10121012#endif
    10131013

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/patch_conexant.c

    r569 r573  
    12751275        }
    12761276
     1277    #ifdef NOT_USED
    12771278        if (spec->beep_amp)
    12781279                snd_hda_attach_beep_device(codec, spec->beep_amp);
     1280    #endif             
    12791281
    12801282        return 0;
    … …  
    20942096        }
    20952097
     2098    #ifdef NOT_USED
    20962099        if (spec->beep_amp)
    20972100                snd_hda_attach_beep_device(codec, spec->beep_amp);
     2101        #endif
    20982102
    20992103        return 0;
    … …  
    32713275        }
    32723276
     3277    #ifdef NOT_USED
    32733278        if (spec->beep_amp)
    32743279                snd_hda_attach_beep_device(codec, spec->beep_amp);
     3280        #endif
    32753281
    32763282        return 0;
    … …  
    38733879        }
    38743880        codec->patch_ops = cx_auto_patch_ops;
     3881        #ifdef NOT_USED
    38753882        if (spec->beep_amp)
    38763883                snd_hda_attach_beep_device(codec, spec->beep_amp);
     3884        #endif
    38773885        return 0;
    38783886}

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/patch_realtek.c

    r569 r573  
    1110211102        }
    1110311103
     11104    #ifdef NOT_USED
    1110411105        if (has_cdefine_beep(codec)) {
    1110511106                err = snd_hda_attach_beep_device(codec, 0x1);
    … …  
    1110911110                }
    1111011111        }
     11112        #endif
    1111111113
    1111211114        if (board_config != ALC882_AUTO)
    … …  
    1537215374        }
    1537315375
     15376    #ifdef NOT_USED
    1537415377        if (has_cdefine_beep(codec)) {
    1537515378                err = snd_hda_attach_beep_device(codec, 0x1);
    … …  
    1537915382                }
    1538015383        }
     15384        #endif
    1538115385
    1538215386        if (board_config != ALC269_AUTO)
    … …  
    1972219726        }
    1972319727
     19728    #ifdef NOT_USED
    1972419729        if (has_cdefine_beep(codec)) {
    1972519730                err = snd_hda_attach_beep_device(codec, 0x1);
    … …  
    1972919734                }
    1973019735        }
     19736        #endif
    1973119737
    1973219738        if (board_config != ALC662_AUTO)

  • GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/patch_via.c

    r569 r573  
    264264        snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
    265265                            !spec->vt1708_jack_detectect);
    266         cancel_delayed_work_sync(&spec->vt1708_hp_work);
     266        //NOT_USED cancel_delayed_work_sync(&spec->vt1708_hp_work);
    267267}
    268268

  • GPL/branches/uniaud32-2.1.x/drv32/makefile.os2

    r455 r573  
    6161FILE5    = idc.obj dispatch.obj
    6262FILE6    = rmhelp.obj irq.obj util.obj
    63 FILE7    = impdos.lib 
     63FILE7    = impdos.lib
    6464!if "$(KEE)" == "1"
    6565FILE8    = impkee.lib
    … …  
    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)\cs5535audio.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 
     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)\cs5535audio.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
    73 # $(ALSA_LIB)\au88xx.lib 
     73# $(ALSA_LIB)\au88xx.lib
    7474#===================================================================
    7575#
    … …  
    8787    @%write $^@ option alignment=16
    8888    @%write $^@ option map=$(WMAPNAME)
    89 !if "$(ACPI)" == "1" 
    90     @%write $^@ option description '$(%BUILDLEVEL) (ACPI)' 
     89!if "$(ACPI)" == "1"
     90    @%write $^@ option description '$(%BUILDLEVEL) (ACPI)'
    9191!else if "$(KEE)" == "1" !else if "$(KEE)" == "1"
    9292    @%write $^@ option description '$(%BUILDLEVEL) (KEE)'
    … …  
    9797    @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
    9898    @for %f in ($(LIBS)) do @%append $^@ library %f
    99 !if "$(ACPI)" == "1" 
     99!if "$(ACPI)" == "1"
    100100    @%write $^@ $(ACPI_LIB)\acpidrv.lib
    101101!endif
    … …  
    108108    @for %f in ($(FILES)) do @%append $^@ $(OBJDIR)\%f
    109109    @for %f in ($(LIBS)) do @%append $^@ %f
    110 !if "$(ACPI)" == "1" 
     110!if "$(ACPI)" == "1"
    111111    @%write $^@ $(ACPI_LIB)\acpidrv.lib
    112112!endif
    … …  
    117117
    118118$(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
    119 !if "$(ACPI)" == "1" 
    120      @%write $(DEFFILE) description '$(%BUILDLEVEL) (ACPI)' 
    121 !else if "$(KEE)" == "1" 
     119!if "$(ACPI)" == "1"
     120     @%write $(DEFFILE) description '$(%BUILDLEVEL) (ACPI)'
     121!else if "$(KEE)" == "1"
    122122     @%write $(DEFFILE) description '$(%BUILDLEVEL) (KEE)'
    123123!else
    … …  
    128128
    129129     copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)
    130          
    131 !if "$(ACPI)" == "1" 
    132       copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)acpi.sys 
    133 !else if "$(KEE)" == "1" 
     130
     131!if "$(ACPI)" == "1"
     132      copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)acpi.sys
     133!else if "$(KEE)" == "1"
    134134      copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)kee.sys
    135135!else
    … …  
    151151     -rm *.obj *.lnk *.lrf *.def *.sys *.sym *.lst *.map *.wmap *.lib
    152152     @cd ..\..
    153      -@rm $(ALSA_BIN_)\$(TARGET)*.sys 
    154      -@rm $(ALSA_BIN)\$(TARGET).sy* 
    155      -@rm $(ALSA_LIB)\*.lib 
     153     -@rm $(ALSA_BIN_)\$(TARGET)*.sys
     154     -@rm $(ALSA_BIN)\$(TARGET).sy*
     155     -@rm $(ALSA_LIB)\*.lib

  • GPL/branches/uniaud32-2.1.x/lib32/irq.c

    r552 r573  
    8383
    8484        if ( pSlot ) {
    85                 hRes = NULL;
     85                hRes = 0;
    8686                if (RMRequestIRQ(irq, (ulSharedFlag & SA_SHIRQ) != 0, &hRes) == FALSE) {
    8787                        rprintf(("RMRequestIRQ failed for irq %d", irq));
    … …  
    129129                                        pSlot->irqNo = 0;
    130130                                        RMDeallocateIRQ(pSlot->hRes);
    131                                         pSlot->hRes = NULL;
     131                                        pSlot->hRes = 0;
    132132                                        // pSlot->fEOI = 0;
    133133                                }

  • GPL/branches/uniaud32-2.1.x/uniaud.inc

    r570 r573  
    77# BUILDVERSION must be 3 parts, and only numbers like 5.44.108
    88# It is best that 2'nd number is always 2 digits, eg at least 10
    9 BUILDVERSION = 2.1.4
     9BUILDVERSION = 2.2.1
    1010
    1111# Fixpack version
    … …  
    1313# ex RC3  GA  FIXPACK2 beta_47
    1414# Comment out to avoid a fixpack line in bldlevel
    15 FIXPACK = BETA SVN565
     15FIXPACK = BETA SVN573
    1616
    1717# ALSA BUILD VERSION
Note: See TracChangeset for help on using the changeset viewer.