Changeset 148 for sbliveos2/trunk


Ignore:
Timestamp:
Apr 26, 2000, 8:01:02 PM (25 years ago)
Author:
sandervl
Message:

beta 0.25 update

Location:
sbliveos2/trunk
Files:
2 added
17 edited

Legend:

Unmodified
Added
Removed

  • sbliveos2/trunk/ChangeLog

    r147 r148  
    11$Id$
     2
     3 2000-04-26: Sander van Leeuwen <sandervl@xs4all.nl>
     4        - Beta release 0.25
    25
    36 2000-04-24: Sander van Leeuwen <sandervl@xs4all.nl>

  • sbliveos2/trunk/drv16/ioctl.cpp

    r147 r148  
    202202   PSTREAM             pStream;
    203203   ULONG               volume;
     204   ULONG               addr;
    204205
    205206   if (p->usIOCtlRequest != AUDIO_CHANGE) {
    … …  
    211212
    212213   pAudChange = (LPMCI_AUDIO_CHANGE)p->pbRequestInfo;
    213    
    214    if(DevHelp_VerifyAccess(SELECTOROF(pAudChange), sizeof(MCI_AUDIO_CHANGE), OFFSETOF(pAudChange), VERIFY_READONLY))
    215    {
     214
     215   //Test for MMPM/2 bug (structure crosses selector boundary)
     216   addr  = OFFSETOF(pAudChange);
     217   addr += sizeof(MCI_AUDIO_CHANGE);
     218   if(addr >= 0x10000UL) {
    216219        dprintf(("Invalid MCI_AUDIO_CHANGE pointer %lx!!", (ULONG)pAudChange));
    217220        p->sReturnCode = INVALID_REQUEST;
    … …  
    220223   }
    221224   pMasterVol = (LPMCI_TRACK_INFO)pAudChange->pvDevInfo;
    222    if(DevHelp_VerifyAccess(SELECTOROF(pMasterVol), sizeof(MCI_TRACK_INFO), OFFSETOF(pMasterVol), VERIFY_READONLY))
    223    {
     225
     226   //Test for MMPM/2 bug (structure crosses selector boundary)
     227   addr  = OFFSETOF(pMasterVol);
     228   addr += sizeof(MCI_TRACK_INFO);
     229   if(addr >= 0x10000UL) {
    224230        dprintf(("Invalid MCI_TRACK_INFO pointer %lx!!", (ULONG)pMasterVol));
    225231        p->sReturnCode = INVALID_REQUEST;

  • sbliveos2/trunk/drv16/makefile.os2

    r147 r148  
    142142
    143143clean:
    144      del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap
     144     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf

  • sbliveos2/trunk/drv16/malloc.c

    r142 r148  
    5454unsigned uMemFree;      // N bytes available for allocation.
    5555char __near
    56    acHeap[HEAP_SIZE];   // The heap.  NOTE:  This must be the last data definition in the HEAP segment,
     56   acHeap[HEAP_SIZE] = {0};   // The heap.  NOTE:  This must be the last data definition in the HEAP segment,
    5757                        // although not done currently, we are planning to size the heap down at INIT
    5858                        // time.  If this is done, any vbls in the HEAP segment that

  • sbliveos2/trunk/drv32/devhlp.asm

    r142 r148  
    6363
    6464        public GetTKSSBase
     65        public iodelay32_
    6566        extrn  DevHlp : near
     67        extrn   DOSIODELAYCNT : ABS
    6668
    6769        ALIGN   4
    … …  
    120122GetTKSSBase endp
    121123
     124iodelay32_ proc near
     125        mov   eax, DOSIODELAYCNT
     126        align 4
     127@@:     dec   eax
     128        jnz   @b
     129        loop  iodelay32_
     130        ret
     131iodelay32_ endp
     132
    122133CODE32  ends
    123134

  • sbliveos2/trunk/drv32/impdos.def

    r142 r148  
    5050    DOSGETMACHINEMODE         @49
    5151    DOSGETVERSION             @92
    52     DOSOPEN                   @70
    5352    DOSQCURDIR                @71
    5453    DOSQCURDISK               @72
    … …  
    5958    DOS32FLATDS               @370
    6059    DOS32FLATCS               @369
     60    DOSIODELAYCNT             @427

  • sbliveos2/trunk/drv32/makefile.os2

    r142 r148  
    3535
    3636!if "$(DEBUG)" == "1"
    37 #CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    38 CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf -DKEE
     37CFLAGS  = -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
     38ASFLAGS = -Mb -Li -Sv:M510
    3939!else
    40 #CFLAGS  = -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    41 CFLAGS  = -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf -DKEE
     40CFLAGS  = -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -xd -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
     41ASFLAGS = -Mb -Li -Sv:M510
     42!endif
     43
     44!if "$(KEE)" == "1"
     45CFLAGS  = $(CFLAGS) -mf -DKEE
     46ASFLAGS = $(ASFLAGS) -D:KEE
     47!else
     48CFLAGS  = $(CFLAGS) -mc -zu
    4249!endif
    4350
    4451CC      = WPP386 $(CFLAGS) $(IWC)
    45 CCSMALL = WPP386 $(CFLAGS_SMALL) $(IWC)
    46 
    47 !if "$(DEBUG)" == "1"
    48 ASFLAGS = -Mb -Li -Sv:M510 -D:KEE
    49 !else
    50 ASFLAGS = -Mb -Li -Sv:M510 -D:KEE
    51 !endif
    5252ASM     = alp $(ASFLAGS) $(INCA)
    5353
    … …  
    9292FILE2    = strategy.obj
    9393FILE3    = init.obj
    94 FILE4    = devhlp.obj
     94FILE4    = impmvdm.lib devhlp.obj
    9595FILE5    = idc.obj dispatch.obj
    9696FILE6    = impdos.lib
     97!if "$(KEE)" == "1"
    9798FILE7    = impkee.lib
     99!endif
    98100FILE8    = ..\sblive\sblive32.lib ..\lib32\linuxlib.lib
    99101FILELAST = end.obj
    … …  
    116118    @%write $^@ option description '@$#$(_VENDOR):$(_VERSION)$#@'
    117119    @%write $^@ option map=$(WMAPNAME)
     120    @for %f in ($(FILES)) do @%append $^@ file %f
     121#!if "$(KEE)" == "1"
    118122    @%write $^@ import DOSIODELAYCNT DOSCALLS.427
    119     @for %f in ($(FILES)) do @%append $^@ file %f
     123#!endif
    120124    @%write $^@ library $(%WATCOM)\lib386\os2\clib3r.lib
    121125
    … …  
    125129     mapsym $(TARGET).MAP
    126130     copy $(TARGET).sys ..\bin
     131!ifdef KEE
     132     copy $(TARGET).sys ..\bin\$(TARGET)kee.sys
     133!else
     134     copy $(TARGET).sys ..\bin\$(TARGET)w4.sys
     135!endif
    127136     copy $(TARGET).sym ..\bin
    128137
    129138clean:
    130      del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap
     139     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lib
    131140   

  • sbliveos2/trunk/drv32/startup.asm

    r142 r148  
    190190        public thunk3216_devhelp
    191191        public thunk3216_devhelp_modified_ds
    192         public iodelay_
    193192        extrn DOSOPEN       : far
     193        extrn DOSCLOSE      : far
    194194        extrn DOSWRITE      : far
    195         extrn DOSCLOSE      : far
    196         EXTRN DOSIODELAYCNT : ABS
    197195
    198196;DEZE MOET ALS EERSTE blijven staan!!!!
    … …  
    379377        lea     dx, [bp - 2]
    380378        push    dx
    381         call    far ptr DOSWRITE
     379        call    DOSWRITE
    382380
    383381        pop     eax
    … …  
    416414        jmp     far ptr FLAT:thunk1632_devhelp_modified_ds
    417415
    418 iodelay_:
    419         db    0B8h
    420         dw    DOSIODELAYCNT
    421         align 4
    422 @@:     dec   eax
    423         jnz   @b
    424         loop  iodelay_
    425         jmp   far ptr FLAT:thunk1632_iodelay32_
    426 
    427416;end of 16 bits code segment
    428417__OffFinalCS16 label byte
    … …  
    441430        public STRATEGY_
    442431        public IDC_
    443         public iodelay32_
    444         public thunk1632_iodelay32_
    445432        extrn  SBLIVE_STRATEGY  : near
    446433        extrn  SBLIVE_IDC : near
     434IFDEF KEE
    447435        extrn  KernThunkStackTo16 : near
    448436        extrn  KernThunkStackTo32 : near
     437ENDIF
    449438
    450439__OffBeginCS32:
    … …  
    511500DevHlp_ModifiedDS endp
    512501
    513 iodelay32_ proc near
    514         jmp     far ptr CODE16:iodelay_
    515         ALIGN 4
    516 thunk1632_iodelay32_:
    517         ret
    518 iodelay32_ endp
    519 
    520502STRATEGY_ proc far
    521503        push    ds
    … …  
    616598    public  stacksel
    617599
    618     __OffBeginDS32      dd 0
     600    __OffBeginDS32   dd 0
    619601
    620602    stacksel         dd 0

  • sbliveos2/trunk/include/ossidc.h

    r142 r148  
    142142#define MIX_SETAUXMUTE                  18
    143143
    144 #define MAKE_VOLUME(l, r)               ((r << 8) | l)
     144#define MAKE_VOLUME_LR(l, r)            ((r << 8) | l)
    145145
    146146#define MIX_RECSRC_MIC                  0
    … …  
    258258ULONG OSS16_OpenStream(STREAM *stream);
    259259void  OSS16_CloseStream(STREAM *stream);
     260typedef enum {
     261  MIDI_RECEIVE = 0,
     262  MIDI_SEND
     263} MIDITYPE;
     264ULONG OSS16_OpenMidiStream(MIDITYPE midiType);
     265void OSS16_CloseMidiStream(MIDITYPE midiType, ULONG streamid);
    260266
    261267#endif //TARGET_OS216

  • sbliveos2/trunk/include/sbversion.h

    r142 r148  
    2525#define __SBVERSION_H__
    2626
    27 #define SBLIVE_VERSION "0.1.0"
     27#define SBLIVE_VERSION "0.2.5"
    2828
    2929#endif //__SBVERSION_H__

  • sbliveos2/trunk/include/version.mak

    r142 r148  
    1111
    1212_VENDOR = Creative Labs SoundBlaster Live
    13 _VERSION = 0.10.000
     13_VERSION = 0.25.000
    1414
    1515FILEVER = @^#$(_VENDOR):$(_VERSION)^#@

  • sbliveos2/trunk/lib32/makefile.os2

    r147 r148  
    1212
    1313!if "$(DEBUG)" == "1"
    14 #CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    15 CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
     14CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    1615!else
    17 #CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    18 CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
     16CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    1917!endif
    2018
    21 CC       = WCC386 $(CFLAGS) $(IWC)
    22 CCSMALL  = WCC386 $(CFLAGS_SMALL) $(IWC)
    23 CPP      = WPP386 $(CFLAGS) $(IWC)
    24 CPPSMALL = WPP386 $(CFLAGS_SMALL) $(IWC)
     19ASFLAGS = -Mb -Li -Sv:ALP
    2520
    26 ASFLAGS = -Mb -Li -Sv:ALP
     21!if "$(KEE)" == "1"
     22CFLAGS  = $(CFLAGS) -mf -DKEE
     23ASFLAGS = $(ASFLAGS) -D:KEE
     24!else
     25CFLAGS  = $(CFLAGS) -mc -zu
     26!endif
     27
     28CC      = WCC386 $(CFLAGS) $(IWC)
     29CPP     = WPP386 $(CFLAGS) $(IWC)
    2730ASM     = alp $(ASFLAGS) $(INCA)
    2831

  • sbliveos2/trunk/lib32/memory.cpp

    r142 r148  
    5050
    5151        if(KernLinToPageList(address, PAGE_SIZE, &pagelist, &nrpages)) {
     52                DebugInt3();
    5253                return 0;
    5354        }
    … …  
    5859
    5960        if(DevLinToPageList(addr, PAGE_SIZE, (PAGELIST near *)__StackToFlat((ULONG)&pagelist))) {
     61                DebugInt3();
    6062                return 0;
    6163        }
    … …  
    8587        if(DevVMAlloc(VMDHA_FIXED|VMDHA_CONTIG, order*PAGE_SIZE, (LINEAR)-1, __StackToFlat((ULONG)&addr))) {
    8688#endif
    87                 return 0;
    88         }
     89                DebugInt3();
     90                return 0;
     91        }
     92////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
    8993        return (void *)addr;
    9094}
    … …  
    98102        DevVMFree((LINEAR)addr);
    99103#endif
     104////    dprintf(("free_pages %x", addr));
    100105        return 0;
    101106}
    … …  
    204209        if(DevVMAlloc(VMDHA_FIXED, size+4, (LINEAR)-1, __StackToFlat((ULONG)&addr))) {
    205210#endif
     211                DebugInt3();
    206212                return 0;
    207213        }
    208214        *(ULONG *)addr = 0; //flat address
     215////    dprintf(("kmalloc %d returned %x", size, addr));
    209216        return addr+4;
    210217  }
    … …  
    214221        return 0;
    215222  }
     223////  dprintf(("kmalloc %d returned %x", size, addr));
    216224  return addr+4; //first 4 bytes contain original 16:16 address
    217225}
    … …  
    228236  }
    229237  addr -= 4;  //first 4 bytes contain original 16:16 address or 0 if allocated by VMAlloc
     238////  dprintf(("kfree %x", addr));
    230239  if(*(ULONG near *)addr) { 
    231240        CallOSS16(IDC16_FREE, *(ULONG near *)addr, 0); 

  • sbliveos2/trunk/lib32/ossidc.cpp

    r142 r148  
    4545  idcpacket.param1 = param1;
    4646  idcpacket.param2 = param2;
     47#ifdef KEE
    4748  pPacket          = (ULONG)__FlatToStack(&idcpacket);
     49#else
     50  pPacket          = (ULONG)__Compress48Pointer((char FAR48 *)&idcpacket);
     51#endif
    4852
    4953#ifdef KEE

  • sbliveos2/trunk/makefile.os2

    r147 r148  
    2525#      WMAKE -f makefile.os2 DEBUG=1 /ms
    2626#
     27#  To build the KEE enhanced debug version of the 32 bits driver:
     28#      WMAKE -f makefile.os2 DEBUG=1 KEE=1 /ms
     29#
    2730#  To build a fully optimized release version:
    2831#      WMAKE -f makefile.os2 /ms
     32#
     33#  To build the KEE enhanced release version of the 32 bits driver:
     34#      WMAKE -f makefile.os2 KEE=1 /ms
     35#
    2936#
    3037
    … …  
    3340!if "$(DEBUG)" == "1"
    3441NMAKEOPTS=$(NMAKEOPTS) DEBUG=1
     42!endif
     43
     44!if "$(KEE)" == "1"
     45NMAKEOPTS=$(NMAKEOPTS) KEE=1
    3546!endif
    3647
    … …  
    5869        @echo BUILDING linuxlib.lib
    5970        @cd lib32
    60         @wmake $(NMAKEOPTS)
     71        @wmake /ms $(NMAKEOPTS)
    6172        @cd ..
    6273
    … …  
    6475        @echo BUILDING sblive32.lib
    6576        @cd sblive
    66         @wmake $(NMAKEOPTS)
     77        @wmake /ms $(NMAKEOPTS)
    6778        @cd ..
    6879
    … …  
    7687        @echo BUILDING sblive32.sys
    7788        @cd drv32
    78         @wmake $(NMAKEOPTS)
     89        @wmake /ms $(NMAKEOPTS)
    7990        @cd ..

  • sbliveos2/trunk/runtime/makefile.os2

    r147 r148  
    9393   wlib @$(NAME).lrf
    9494
     95clean:
     96     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf *.lib

  • sbliveos2/trunk/sblive/makefile.os2

    r147 r148  
    1212
    1313!if "$(DEBUG)" == "1"
    14 #CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    15 #CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2  -dDEBUG -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
    16 CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
     14CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -hc -d2 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
    1715!else
    18 #CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zu -zp1 -mc
    19 CFLAGS  = -D__KERNEL__ -DKEE -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1 -mf
     16CFLAGS  = -D__KERNEL__ -DPRIVATE_PCM_VOLUME -DMODULE -DPCI_8010 -dTARGET_OS2 -bt=os2v2 -e60 -5r -i$(INC) -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -zp1
     17!endif
     18
     19ASFLAGS = -Mb -Li -Sv:ALP
     20
     21!if "$(KEE)" == "1"
     22CFLAGS = $(CFLAGS) -mf -DKEE
     23ASFLAGS= $(ASFLAGS) -D:KEE
     24!else
     25CFLAGS = $(CFLAGS) -mc -zu
    2026!endif
    2127
    2228CC      = WCC386 $(CFLAGS) $(IWC)
    23 CCSMALL = WCC386 $(CFLAGS_SMALL) $(IWC)
    24 
    25 ASFLAGS = -Mb -Li -Sv:ALP
    2629ASM     = alp $(ASFLAGS) $(INCA)
    2730
Note: See TracChangeset for help on using the changeset viewer.