Changeset 585 for GPL/branches


Ignore:
Timestamp:
Jul 27, 2014, 8:03:43 PM (11 years ago)
Author:
David Azarewicz
Message:

Misc cleanup

Location:
GPL/branches/DAZ
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/DAZ/Makefile

    r580 r585  
    2626#
    2727#===================================================================
    28 all: subdirs
     28all: subdirs alsa-kernel lib32 drv32
    2929
    3030subdirs: .SYMBOLIC
    … …  
    3232  @if not exist $(ALSA_BIN) $(CREATEPATH) $(ALSA_BIN)
    3333  @$(ROOT)\tools\mkversion.cmd
     34
     35alsa-kernel: .symbolic
    3436  @echo BUILDING alsa-kernel
    3537  @cd alsa-kernel
    3638  @wmake $(WMAKEOPTS)
    3739  @cd ..
     40
     41lib32: .symbolic
    3842  @echo BUILDING lib32
    3943  @cd lib32
    4044  @wmake $(WMAKEOPTS)
    4145  @cd ..
     46
     47drv32: .symbolic
    4248  @echo BUILDING drv32
    4349  @cd drv32

  • GPL/branches/DAZ/alsa-kernel/Makefile

    r580 r585  
    66#
    77#===================================================================
    8 all: subdirs
     8all: core drivers isa pci synth
    99
    10 subdirs: .SYMBOLIC
     10core: .SYMBOLIC
    1111  @echo BUILDING core
    1212  @cd core
    1313  @wmake $(WMAKEOPTS)
    1414  @cd ..
     15
     16drivers: .symbolic
    1517  @echo BUILDING drivers
    1618  @cd drivers
    1719  @wmake $(WMAKEOPTS)
    1820  @cd ..
     21
     22isa: .symbolic
    1923  @echo BUILDING isa
    2024  @cd isa
    2125  @wmake $(WMAKEOPTS)
    2226  @cd ..
     27
     28pci: .symbolic
    2329  @echo BUILDING pci
    2430  @cd pci
    2531  @wmake $(WMAKEOPTS)
    2632  @cd ..
     33
     34synth: .symbolic
    2735  @echo BUILDING synth
    2836  @cd synth

  • GPL/branches/DAZ/alsa-kernel/core/Makefile

    r584 r585  
    2828#
    2929#===================================================================
    30 all: $(OBJDIR)\$(TARGET).lib subdirs
     30all: $(OBJDIR)\$(TARGET).lib seq oss
    3131
    3232$(LNKFILE): Makefile
    … …  
    3939
    4040
    41 subdirs: .SYMBOLIC
     41seq: .SYMBOLIC
    4242    @echo BUILDING seq
    4343    @cd seq
    4444    @wmake $(WMAKEOPTS)
    4545    @cd ..
     46
     47oss: .symbolic
    4648    @echo BUILDING oss
    4749    @cd oss

  • GPL/branches/DAZ/alsa-kernel/core/control.c

    r528 r585  
    2929#include <sound/info.h>
    3030#include <sound/control.h>
     31#ifdef TARGET_OS2
    3132#include <proto.h>
     33#endif
    3234
    3335/* max number of user-defined controls */
    … …  
    196198        if (snd_BUG_ON(!control || !control->count))
    197199                return NULL;
    198 
    199200        kctl = kzalloc(sizeof(*kctl) + sizeof(struct snd_kcontrol_volatile) * control->count, GFP_KERNEL);
    200 
    201201        if (kctl == NULL) {
    202202                snd_printk(KERN_ERR "Cannot allocate control instance\n");

  • GPL/branches/DAZ/alsa-kernel/core/hrtimer.c

    r584 r585  
     1This file is not used by OS2
    12/*
    23 * ALSA timer back-end using hrtimer
    … …  
    2021
    2122#include <linux/init.h>
    22 #include <linux/slab.h>
    2323#include <linux/module.h>
    2424#include <linux/moduleparam.h>

  • GPL/branches/DAZ/alsa-kernel/core/info.c

    r479 r585  
    649649        if (!strcmp(card->id, card->proc_root->name))
    650650                return 0;
     651               
    651652#ifndef TARGET_OS2
    652653        p = proc_symlink(card->id, snd_proc_root, card->proc_root->name);

  • GPL/branches/DAZ/alsa-kernel/core/init.c

    r479 r585  
    6060static int module_slot_match(struct module *module, int idx)
    6161{
     62        int match = 1;
    6263#ifndef TARGET_OS2
    6364#ifdef MODULE
    6465        const char *s1, *s2;
    6566
    66         int match = 1;
    6767        if (!module || !module->name || !slots[idx])
    6868                return 0;
     69               
    6970        s1 = module->name;
    7071        s2 = slots[idx];
    … …  
    8889                        break;
    8990        }
    90 
    9191#endif /* MODULE */
    92 #else
    93         int match = 1;
    9492#endif
    9593        return match;

  • GPL/branches/DAZ/alsa-kernel/core/isadma.c

    r305 r585  
    3939 * Programs an ISA DMA transfer for the given buffer.
    4040 */
    41  
    4241void snd_dma_program(unsigned long dma,
    4342                     unsigned long addr, unsigned int size,

  • GPL/branches/DAZ/alsa-kernel/core/jack.c

    r584 r585  
    2121
    2222#include <linux/input.h>
    23 #include <linux/slab.h>
    24 #include <linux/module.h>
    2523#include <sound/jack.h>
    2624#include <sound/core.h>
    2725
    28 static int jack_switch_types[] = {
     26static int jack_types[] = {
    2927        SW_HEADPHONE_INSERT,
    3028        SW_MICROPHONE_INSERT,
    … …  
    129127        jack->type = type;
    130128
    131         for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++)
     129        for (i = 0; i < ARRAY_SIZE(jack_types); i++)
    132130                if (type & (1 << i))
    133131                        input_set_capability(jack->input_dev, EV_SW,
    134                                              jack_switch_types[i]);
     132                                             jack_types[i]);
    135133
    136134        err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
    … …  
    226224        }
    227225
    228         for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) {
     226        for (i = 0; i < ARRAY_SIZE(jack_types); i++) {
    229227                int testbit = 1 << i;
    230228                if (jack->type & testbit)
    231                         input_report_switch(jack->input_dev,
    232                                             jack_switch_types[i],
     229                        input_report_switch(jack->input_dev, jack_types[i],
    233230                                            status & testbit);
    234231        }

  • GPL/branches/DAZ/alsa-kernel/core/misc.c

    r464 r585  
    128128EXPORT_SYMBOL(snd_pci_quirk_lookup);
    129129#endif
    130 
    131 //#include "misc.inc"

  • GPL/branches/DAZ/alsa-kernel/core/oss/Makefile

    r584 r585  
    3737#
    3838#===================================================================
    39 all: $(OBJDIR)\$(TARGET).lib subdirs
     39all: $(OBJDIR)\$(TARGET).lib
    4040
    4141
    … …  
    4848    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4949
    50 subdirs: .SYMBOLIC
    51 #    @echo BUILDING instr
    52 #    @cd instr
    53 #    @wmake $(WMAKEOPTS)
    54 #    @cd ..
     50# we don't build this
     51instr: .SYMBOLIC
     52    @echo BUILDING instr
     53    @cd instr
     54    @wmake $(WMAKEOPTS)
     55    @cd ..
    5556
    5657clean: .SYMBOLIC

  • GPL/branches/DAZ/alsa-kernel/core/pcm_compat.c

    r479 r585  
    2222
    2323#include <linux/compat.h>
    24 #include <proto.h>
    2524
    2625static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,

  • GPL/branches/DAZ/alsa-kernel/core/pcm_lib.c

    r549 r585  
    230230#define hw_ptr_error(substream, fmt, ...) ;
    231231#endif
     232
    232233static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
    233234{

  • GPL/branches/DAZ/alsa-kernel/core/pcm_misc.c

    r399 r585  
    1919 *
    2020 */
    21  
     21
    2222#include <linux/time.h>
    2323#include <sound/core.h>
    … …  
    446446                        break;
    447447                }
    448 
    449448        }
    450449        return 0;

  • GPL/branches/DAZ/alsa-kernel/core/seq/Makefile

    r584 r585  
    2929#
    3030#===================================================================
    31 all: $(OBJDIR)\$(TARGET).lib subdirs
     31all: $(OBJDIR)\$(TARGET).lib
    3232
    3333
    … …  
    4040    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    4141
    42 subdirs: .SYMBOLIC
    43 #    @echo BUILDING oss
    44 #    @cd oss
    45 #    @wmake $(WMAKEOPTS)
    46 #    @cd ..
     42# we don't build this
     43oss: .SYMBOLIC
     44    @echo BUILDING oss
     45    @cd oss
     46    @wmake $(WMAKEOPTS)
     47    @cd ..
    4748
    4849clean: .SYMBOLIC

  • GPL/branches/DAZ/alsa-kernel/core/seq/oss/Makefile

    r584 r585  
    3939#
    4040#===================================================================
    41 all: $(OBJDIR)\$(TARGET).lib subdirs
     41all: $(OBJDIR)\$(TARGET).lib
    4242
    4343
    … …  
    5050    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    5151
    52 subdirs: .SYMBOLIC
    53 #    @echo BUILDING instr
    54 #    @cd instr
    55 #    @wmake $(WMAKEOPTS)
    56 #    @cd ..
     52# we don't build this
     53instr: .SYMBOLIC
     54    @echo BUILDING instr
     55    @cd instr
     56    @wmake $(WMAKEOPTS)
     57    @cd ..
    5758
    5859clean: .SYMBOLIC

  • GPL/branches/DAZ/alsa-kernel/drivers/Makefile

    r580 r585  
    99WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
    11 all: subdirs
     11all: opl3 mpu401
    1212
    13 subdirs: .SYMBOLIC
     13opl3: .SYMBOLIC
    1414    @echo BUILDING opl3
    1515    @cd opl3
    1616    @wmake $(WMAKEOPTS)
    1717    @cd ..
     18
     19mpu401
    1820    @echo BUILDING mpu401
    1921    @cd mpu401

  • GPL/branches/DAZ/alsa-kernel/isa/Makefile

    r580 r585  
    99WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
    1010
     11#we only build sb
     12all: sb
    1113
    12 all: subdirs
     14ad1816a: .SYMBOLIC
     15    @echo BUILDING ad1816a
     16    @cd ad1816a
     17    @wmake $(WMAKEOPTS)
     18    @cd ..
    1319
    14 subdirs: .SYMBOLIC
    15 #    @echo BUILDING ad1816a
    16 #    @cd ad1816a
    17 #    @wmake $(WMAKEOPTS)
    18 #    @cd ..
    19 #    @echo BUILDING ad1848
    20 #    @cd ad1848
    21 #    @wmake $(WMAKEOPTS)
    22 #    @cd ..
    23 #    @echo BUILDING cs423x
    24 #    @cd cs423x
    25 #    @wmake $(WMAKEOPTS)
    26 #    @cd ..
    27 #    @echo BUILDING es1688
    28 #    @cd es1688
    29 #    @wmake $(WMAKEOPTS)
    30 #    @cd ..
    31 #    @echo BUILDING gus
    32 #    @cd gus
    33 #    @wmake $(WMAKEOPTS)
    34 #    @cd ..
    35 #    @echo BUILDING opti9xx
    36 #    @cd opti9xx
    37 #    @wmake $(WMAKEOPTS)
    38 #    @cd ..
     20ad1848: .symbolic
     21    @echo BUILDING ad1848
     22    @cd ad1848
     23    @wmake $(WMAKEOPTS)
     24    @cd ..
     25
     26cs423x: .symbolic
     27    @echo BUILDING cs423x
     28    @cd cs423x
     29    @wmake $(WMAKEOPTS)
     30    @cd ..
     31
     32es1688: .symbolic
     33    @echo BUILDING es1688
     34    @cd es1688
     35    @wmake $(WMAKEOPTS)
     36    @cd ..
     37
     38gus: .symbolic
     39    @echo BUILDING gus
     40    @cd gus
     41    @wmake $(WMAKEOPTS)
     42    @cd ..
     43
     44opti9xx: .symbolic
     45    @echo BUILDING opti9xx
     46    @cd opti9xx
     47    @wmake $(WMAKEOPTS)
     48    @cd ..
     49
     50sb: .symbolic
    3951    @echo BUILDING sb
    4052    @cd sb
    … …  
    4254    @cd ..
    4355
    44 
    45 ##    @echo BUILDING wavefront
    46 ##    @cd wavefront
    47 ##    @nmake $(WMAKEOPTS)
    48 ##    @cd ..
     56wavefront: .symbolic
     57    @echo BUILDING wavefront
     58    @cd wavefront
     59    @nmake $(WMAKEOPTS)
     60    @cd ..
    4961
    5062

  • GPL/branches/DAZ/alsa-kernel/pci/Makefile

    r584 r585  
    3030#
    3131#===================================================================
    32 all: $(OBJDIR)\$(TARGET).lib subdirs
     32all: $(OBJDIR)\$(TARGET).lib hda ac97 ali5451 cs46xx cs5535audio emu10k1 ca0106 nm256 trident ymfpci
    3333
    3434
    … …  
    4242
    4343
    44 subdirs: .SYMBOLIC
     44hda: .SYMBOLIC
    4545    @echo BUILDING hda
    4646    @cd hda
    4747    @wmake $(WMAKEOPTS)
    4848    @cd ..
     49
     50ac97: .symbolic
    4951    @echo BUILDING ac97
    5052    @cd ac97
    5153    @wmake $(WMAKEOPTS)
    5254    @cd ..
     55
     56ali5451: .symbolic
    5357    @echo BUILDING ali5451
    5458    @cd ali5451
    5559    @wmake $(WMAKEOPTS)
    5660    @cd ..
     61
     62cs46xx: .symbolic
    5763    @echo BUILDING cs46xx
    5864    @cd cs46xx
    5965    @wmake $(WMAKEOPTS)
    6066    @cd ..
     67
     68cs5535audio: .symbolic
    6169    @echo BUILDING cs5535audio
    6270    @cd cs5535audio
    6371    @wmake $(WMAKEOPTS)
    6472    @cd ..
     73
     74emu10k1: .symbolic
    6575    @echo BUILDING emu10k1
    6676    @cd emu10k1
    6777    @wmake $(WMAKEOPTS)
    6878    @cd ..
     79
     80ca0106: .symbolic
    6981    @echo BUILDING ca0106
    7082    @cd ca0106
    7183    @wmake $(WMAKEOPTS)
    7284    @cd ..
     85
     86nm256: .symbolic
    7387    @echo BUILDING nm256
    7488    @cd nm256
    7589    @wmake $(WMAKEOPTS)
    7690    @cd ..
    77 #    @echo BUILDING rme9652
    78 #    @cd rme9652
    79 #    @wmake $(WMAKEOPTS)
    80 #    @cd ..
     91
     92trident: .symbolic
    8193    @echo BUILDING trident
    8294    @cd trident
    8395    @wmake $(WMAKEOPTS)
    8496    @cd ..
     97
     98ymfpci: .symbolic
    8599    @echo BUILDING ymfpci
    86100    @cd ymfpci
    87101    @wmake $(WMAKEOPTS)
    88102    @cd ..
    89 #    @echo BUILDING vortex
    90 #    @cd au88x0
    91 #    @wmake $(WMAKEOPTS)
    92 #    @cd ..
    93103
     104#we don't build this
     105rme9653: .symbolic
     106    @echo BUILDING rme9652
     107    @cd rme9652
     108    @wmake $(WMAKEOPTS)
     109    @cd ..
    94110
    95 ##    @echo BUILDING wavefront
    96 ##    @cd wavefront
    97 ##    @nmake $(WMAKEOPTS)
    98 ##    @cd ..
     111#we don't build this
     112vortex: .symbolic
     113    @echo BUILDING vortex
     114    @cd au88x0
     115    @wmake $(WMAKEOPTS)
     116    @cd ..
     117
     118#we don't build this
     119wavefront: .symbolic
     120    @echo BUILDING wavefront
     121    @cd wavefront
     122    @nmake $(WMAKEOPTS)
     123    @cd ..
    99124
    100125

  • GPL/branches/DAZ/alsa-kernel/synth/Makefile

    r584 r585  
    2525#
    2626#===================================================================
    27 all: $(OBJDIR)\$(TARGET).lib subdirs
     27all: $(OBJDIR)\$(TARGET).lib emux
    2828
    2929
    … …  
    3636    copy $(OBJDIR)\$(TARGET).lib $(ALSA_LIB)
    3737
    38 subdirs: .SYMBOLIC
     38emux: .SYMBOLIC
    3939    @echo BUILDING emux
    4040    @cd emux

  • GPL/branches/DAZ/drv32/Makefile

    r584 r585  
    9898  @%write $^@ /MAP:$(OBJDIR)\$(TARGET).map
    9999  @for %f in ($(FILES)) do @%append $^@ $(OBJDIR)\%f
    100   @for %f in ($(LIBS)) do @%append $^@ %f
     100  @for %f in ($(LIBS)) do @if exist %f @%append $^@ %f
    101101  @%write $^@ $(WATCOM)\lib386\os2\clib3r.lib
    102102  @%write $^@ $(WATCOM)\lib386\os2\os2386.lib
    … …  
    104104!endif
    105105
    106 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
     106$(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES)
    107107  @%create $(DEFFILE)
    108108  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 and eCS (c) 2014 $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
Note: See TracChangeset for help on using the changeset viewer.