Ignore:
Timestamp:
Jul 23, 2000, 6:21:57 PM (25 years ago)
Author:
sandervl
Message:

update

Location:
sbliveos2/trunk/include
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • sbliveos2/trunk/include/dbgos2.h

    r142 r153  
    3030
    3131void cdecl PrintfOut(char far *DbgStr , ...);
     32extern int dbglevel;
    3233
    3334#ifdef __cplusplus
    … …  
    3738#ifdef DEBUG
    3839#define dprintf(a)      PrintfOut a
     40#define dprintf2(a) if(dbglevel >= 2) PrintfOut a
     41#define dprintf3(a) if(dbglevel >= 3) PrintfOut a
     42#define dprintf4(a) if(dbglevel >= 4) PrintfOut a
    3943#define DebugInt3()     _asm int 3
    4044#else
    4145#define dprintf(a)
     46#define dprintf2(a)
     47#define dprintf3(a)
     48#define dprintf4(a)
    4249#define DebugInt3()     
    4350#endif

  • sbliveos2/trunk/include/linux/mm.h

    r142 r153  
    77#include <linux/errno.h>
    88#include <asm/page.h>
     9#include <asm/atomic.h>
    910
    1011/*

  • sbliveos2/trunk/include/linux/poll.h

    r142 r153  
    88#include <asm/uaccess.h>
    99#include <linux/wait.h>
     10#include <linux/fs.h>
    1011
    1112#ifdef __KERNEL__

  • sbliveos2/trunk/include/linux/slab.h

    r142 r153  
    4646#endif  /* __KERNEL__ */
    4747
    48 extern void *kmalloc(size_t, int);
     48extern void *kmalloc(int, int);
    4949extern void kfree(const void *);
    50 extern void kfree_s(const void *, size_t);
     50extern void kfree_s(const void *, int);
    5151
    5252#endif  /* _LINUX_SLAB_H */

  • sbliveos2/trunk/include/linux/soundcard.h

    r142 r153  
    828828#define SOUND_MIXER_READ_LINE2          MIXER_READ(SOUND_MIXER_LINE2)
    829829#define SOUND_MIXER_READ_LINE3          MIXER_READ(SOUND_MIXER_LINE3)
     830#define SOUND_MIXER_READ_VIDEO          MIXER_READ(SOUND_MIXER_VIDEO)
    830831
    831832/* Obsolete macros */
    … …  
    858859#define SOUND_MIXER_WRITE_LINE2         MIXER_WRITE(SOUND_MIXER_LINE2)
    859860#define SOUND_MIXER_WRITE_LINE3         MIXER_WRITE(SOUND_MIXER_LINE3)
     861#define SOUND_MIXER_WRITE_VIDEO         MIXER_WRITE(SOUND_MIXER_VIDEO)
    860862
    861863/* Obsolete macros */

  • sbliveos2/trunk/include/linux/types.h

    r142 r153  
    7272typedef unsigned long           ulong;
    7373
     74typedef unsigned long           dma_addr_t;
     75
    7476#ifndef __BIT_TYPES_DEFINED__
    7577#define __BIT_TYPES_DEFINED__

  • sbliveos2/trunk/include/ossidc.h

    r151 r153  
    8282                ULONG   bufsize;
    8383        } midiread;
     84        struct {
     85                ULONG   streamtype;
     86                ULONG   streamid;
     87        } getspace;
    8488        struct {
    8589                ULONG   param1;
    … …  
    134138#define IDC32_MIDI_WRITE                12
    135139#define IDC32_MIDI_READ                 13
     140#define IDC32_STREAM_GETSPACE           14
    136141
    137142#define MIX_SETMASTERVOL                0
    … …  
    256261ULONG OSS32_StreamMidiWrite(ULONG streamid, ULONG midiByte);
    257262ULONG OSS32_StreamMidiRead(ULONG streamid, char NEAR *buffer, ULONG bufsize);
     263ULONG OSS32_StreamGetSpace(ULONG streamtype, ULONG streamid);
    258264
    259265//Sets file id in current task structure
    … …  
    273279BOOL  OSS16_SetGlobalVol(ULONG ulSysFileNum, USHORT line, ULONG volume);
    274280BOOL  OSS16_StreamSetFragment(STREAM *stream, ULONG fragsize);
     281ULONG OSS16_StreamGetSpace(STREAM *stream);
    275282BOOL  OSS16_AttachToPdd();
    276283void  OSS16_DetachFromPdd();

  • sbliveos2/trunk/include/sbversion.h

    r151 r153  
    2525#define __SBVERSION_H__
    2626
    27 #define SBLIVE_VERSION "0.4.0"
     27#define SBLIVE_VERSION "0.6.0"
    2828
    2929#endif //__SBVERSION_H__

  • sbliveos2/trunk/include/version.mak

    r151 r153  
    1111
    1212_VENDOR = Creative Labs SoundBlaster Live
    13 _VERSION = 0.40.000
     13_VERSION = 0.60.000
    1414
    1515FILEVER = @^#$(_VENDOR):$(_VERSION)^#@
Note: See TracChangeset for help on using the changeset viewer.