Changeset 73


Ignore:
Timestamp:
Jan 14, 2006, 11:32:17 PM (20 years ago)
Author:
vladest
Message:

Fixed compile issues
Fixed SB128 driver

Location:
GPL/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/alsa-kernel/core/memory.c

    r32 r73  
    186186}
    187187
    188 char *snd_hidden_kstrdup(const char *s, int flags)
    189 {
    190     int len;
    191     char *buf;
    192 
    193     if (!s) return NULL;
    194 
    195     len = strlen(s) + 1;
    196     buf = _snd_kmalloc(len, flags);
    197     if (buf)
    198         memcpy(buf, s, len);
    199     return buf;
    200 }
    201 
    202188static void snd_memory_info_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer)
    203189{
    … …  
    321307}
    322308
     309char *snd_hidden_kstrdup(const char *s, int flags)
     310{
     311    int len;
     312    char *buf;
     313
     314    if (!s) return NULL;
     315
     316    len = strlen(s) + 1;
     317    buf = _snd_kmalloc(len, flags);
     318    if (buf)
     319        memcpy(buf, s, len);
     320    return buf;
     321}
     322
    323323void *kzalloc(size_t size, unsigned int flags)
    324324{

  • GPL/trunk/alsa-kernel/include/sound/driver.h

    r71 r73  
    532532#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
    533533#endif
     534
     535char *snd_hidden_kstrdup(const char *s, int flags);
     536#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
     537
    534538char *snd_kmalloc_strdup(const char *string, int flags);
    535539int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
    … …  
    741745#endif
    742746
     747#define printk_ratelimit()      1
     748
    743749typedef unsigned gfp_t;
    744750
    745 char *kstrdup(const char *s, gfp_t gfp_flags);
    746 
    747751#endif                          /* __DRIVER_H */

  • GPL/trunk/alsa-kernel/pci/ens1370.c

    r70 r73  
    11341134                                   &snd_es1370_hw_constraints_rates);
    11351135#else
    1136         snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
    1137                                       &snd_es1371_hw_constraints_dac_clock);
     1136//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
     1137//                                    &snd_es1371_hw_constraints_dac_clock);
    11381138#endif
    11391139        return 0;
    … …  
    11571157                                      &snd_es1370_hw_constraints_clock);
    11581158#else
    1159         snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
    1160                                       &snd_es1371_hw_constraints_dac_clock);
     1159//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
     1160//                                    &snd_es1371_hw_constraints_dac_clock);
    11611161#endif
    11621162        return 0;

  • GPL/trunk/drv32/makefile.os2

    r63 r73  
    9797    @for %f in ($(LIBS)) do @%append $^@ library %f
    9898    @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib
     99    @%write $^@ library $(%WATCOM)\lib386\cplx3r.lib
    99100!else
    100101$(LNKFILE): $(MAKEFILE)
    … …  
    104105    @for %f in ($(LIBS)) do @%append $^@ %f
    105106    @%write $^@ $(%WATCOM)\lib386\os2\clib3r.lib
     107    @%write $^@ $(%WATCOM)\lib386\cplx3r.lib
    106108    @%write $^@ $(DEFFILE)
    107109!endif

  • GPL/trunk/include/watcom32.mak

    r68 r73  
    1313
    1414!if "$(DEBUG)" == "1"
    15 CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zev
     15CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
    1616CPPFLAGS= -xd
    1717ASFLAGS = -Mb -Li -Sv:M510
    1818!else
    19 CFLAGS  = -bt=os2v2 -e60 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zev
     19CFLAGS  = -bt=os2v2 -e60 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf
    2020CPPFLAGS= -xd
    2121ASFLAGS = -Mb -Li -Sv:M510
    … …  
    3838!endif
    3939
    40 CC          = WCC386 $(CFLAGS) $(CDEFINES) -i$(CINCLUDES)
     40CC          = WCC386 $(CFLAGS) -zev $(CDEFINES) -i$(CINCLUDES)
    4141CPP         = WPP386 $(CFLAGS) $(CPPFLAGS) $(CDEFINES) -i$(CINCLUDES)
    4242CPP16       = WPP386 $(CFLAGS16) $(CPPFLAGS) $(CDEFINES) -i$(CINCLUDES)

  • GPL/trunk/lib32/malloc.cpp

    r32 r73  
    655655//*****************************************************************************
    656656//*****************************************************************************
    657 

  • GPL/trunk/lib32/misc.c

    r61 r73  
    2424 *
    2525 */
    26 
     26#include <limits.h>
    2727#include "linux.h"
    2828#include <linux/init.h>
    … …  
    3838#include <dbgos2.h>
    3939#include <printfos2.h>
    40 #include <limits.h>
    4140
    4241struct new_utsname system_utsname = {0};

  • GPL/trunk/lib32/strstr.c

    r61 r73  
    4343        return strlen(src);
    4444}
     45
    4546#endif
Note: See TracChangeset for help on using the changeset viewer.