Changeset 553


Ignore:
Timestamp:
Jul 27, 2011, 7:54:48 PM (14 years ago)
Author:
rudi
Message:

Adapt sourcecode to OpenWatcom

Location:
cmedia/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • cmedia/trunk/Cmpciset/cmpciset.c

    r354 r553  
    2828#include        <malloc.h>
    2929
     30#if defined(__BORLANDC__)  || __WATCOMC__ < 1200
    3031#include        "warp4.h"
    31 
     32#endif
    3233
    3334//#define               DEBUG

  • cmedia/trunk/Drv16/fmdo.cpp

    r354 r553  
    478478 *  Standard MIDI channel status command - unimplemented.
    479479 */
    480 virtual void FMSYNTH::polyphonicPressure( BYTE mchan, BYTE note, BYTE value )
     480void FMSYNTH::polyphonicPressure( BYTE mchan, BYTE note, BYTE value )
    481481{
    482482   BYTE dummy;          // Suppress warnings about parms not used.
    … …  
    489489 *  Standard MIDI channel status command - unimplemented.
    490490 */
    491 virtual void FMSYNTH::channelPressure( BYTE mchan, BYTE value )
     491void FMSYNTH::channelPressure( BYTE mchan, BYTE value )
    492492{
    493493   BYTE dummy;          // Suppress warnings about parms not used.
    … …  
    495495   dummy = value;
    496496}
    497 

  • cmedia/trunk/Drv16/irq.hpp

    r354 r553  
    4747#endif
    4848
    49 // clude <stddef.h>             //### NULL?  to be removed
    50 
    51 // ###IHV:  IRQ sharing flag.  Set this to "0" for ISA bus, "1" for PCI
    52 // PCI and Microchannel environments (where hardware can share an IRQ level.
    53 const IRQ_HW_Sharing = 0;
    5449
    5550// Max num of int handlers per IRQ level.
    56 const MAX_HandlersPerIRQLevel = 3;
     51const int MAX_HandlersPerIRQLevel = 3;
    5752
    5853

  • cmedia/trunk/Drv16/log.cpp

    r354 r553  
    452452
    453453
    454 virtual void LOG::vTrace( USHORT eventNum )
     454void LOG::vTrace( USHORT eventNum )
    455455/* Log the specified event. */
    456456{
    … …  
    460460
    461461
    462 virtual void LOG::vLog( USHORT eventNum, ... )
     462void LOG::vLog( USHORT eventNum, ... )
    463463/* Log the specified event, with data. */
    464464{
    … …  
    490490}
    491491
    492 virtual void PERFLOG::vTrace( USHORT eventNum )
     492void PERFLOG::vTrace( USHORT eventNum )
    493493{
    494494   RDTSC_COUNT rdtsc_result;            // Output from Pentium timing instruction.
    … …  
    586586
    587587
    588 virtual void BINARYLOG::vTrace( USHORT eventNum )
     588void BINARYLOG::vTrace( USHORT eventNum )
    589589/* Log the specified trace point. */
    590590{

  • cmedia/trunk/Drv16/midimsg.hpp

    r354 r553  
    5555
    5656// Byte length of the IBM Sysex Signature (0xF000003A).
    57 const IBMSysexSigLen = 4;
     57const int IBMSysexSigLen = 4;
    5858
    5959// Miscellaneous error codes, must be <0.
    … …  
    6868// Longest message at time of this writing is 4 byte IBM Sysex signature
    6969// plus 4 bytes sysex command and data == 8 bytes.  We'll tack on 2 extra.
    70 const MAX_MidiMsgLen = (IBMSysexSigLen + 4 + 2);
     70const int MAX_MidiMsgLen = (IBMSysexSigLen + 4 + 2);
    7171
    7272// We use this class to build up MIDI messages as we receive the bytes.

  • cmedia/trunk/Drv16/midistrm.hpp

    r354 r553  
    3939
    4040// Number of notes in the MIDI definition.
    41 const NUM_MidiNotes = 128;
     41const USHORT NUM_MidiNotes = 128;
    4242
    4343// Number of channels in the MIDI definition.
    44 const NUM_MidiChannels = 16;
     44const USHORT NUM_MidiChannels = 16;
    4545
    4646// The MIDI parser is always in one of the following states.

  • cmedia/trunk/Drv16/mpu401.cpp

    r354 r553  
    6565}
    6666
    67 virtual void MPU_401::noteOff( BYTE mchan, BYTE note, BYTE velocity )
     67void MPU_401::noteOff( BYTE mchan, BYTE note, BYTE velocity )
    6868{
    6969   writeByte( (BYTE) 0x80 | mchan );
    … …  
    7272}
    7373
    74 virtual void MPU_401::noteOn( BYTE mchan, BYTE note, BYTE velocity )
     74void MPU_401::noteOn( BYTE mchan, BYTE note, BYTE velocity )
    7575{
    7676   writeByte( (BYTE) 0x90 | mchan );
    … …  
    7979}
    8080
    81 virtual void MPU_401::polyphonicPressure( BYTE mchan, BYTE note, BYTE value )
     81void MPU_401::polyphonicPressure( BYTE mchan, BYTE note, BYTE value )
    8282{
    8383   writeByte( (BYTE) 0xA0 | mchan );
    … …  
    8686}
    8787
    88 virtual void MPU_401::controlChange( BYTE mchan, BYTE control_number, BYTE value )
     88void MPU_401::controlChange( BYTE mchan, BYTE control_number, BYTE value )
    8989{
    9090   writeByte( (BYTE) 0xB0 | mchan );
    … …  
    9393}
    9494
    95 virtual void MPU_401::programChange( BYTE mchan, BYTE program_number )
     95void MPU_401::programChange( BYTE mchan, BYTE program_number )
    9696{
    9797   writeByte( (BYTE) 0xC0 | mchan );
    … …  
    9999}
    100100
    101 virtual void MPU_401::channelPressure( BYTE mchan, BYTE value )
     101void MPU_401::channelPressure( BYTE mchan, BYTE value )
    102102{
    103103   writeByte( (BYTE) 0xD0 | mchan );
    … …  
    105105}
    106106
    107 virtual void MPU_401::pitchBend( BYTE mchan, BYTE value_lsb, BYTE value_msb )
     107void MPU_401::pitchBend( BYTE mchan, BYTE value_lsb, BYTE value_msb )
    108108{
    109109   writeByte( (BYTE) 0xE0 | mchan );

  • cmedia/trunk/Drv16/sizedefs.h

    r354 r553  
    2424#define SIZEDEFS_H
    2525
    26 const NumLogicalDevices = 5; // Number of PNP logical devices on adapter.
    27 
    2826#define HEAP_SIZE         16384         // must be a multiple of 4
    2927#define DEFAULT_HEAP      4096

  • cmedia/trunk/Drv16/stream.cpp

    r354 r553  
    199199
    200200#pragma off (unreferenced)
    201 virtual ULONG STREAM::Write(PSTREAMBUF pbuf, ULONG uLength, BOOL fLooping)
     201ULONG STREAM::Write(PSTREAMBUF pbuf, ULONG uLength, BOOL fLooping)
    202202#pragma on (unreferenced)
    203203{

  • cmedia/trunk/Drv16/waudio.cpp

    r354 r553  
    337337 *
    338338 */
    339 virtual void WAVEAUDIO::ConfigDev(STREAM *stream, PWAVECONFIGINFO pConfigInfo)
     339void WAVEAUDIO::ConfigDev(STREAM *stream, PWAVECONFIGINFO pConfigInfo)
    340340{
    341341   FORMAT_INFO formatInfo;

  • cmedia/trunk/Install/rcstub.c

    r354 r553  
    3939
    4040
    41 VOID APIENTRY RCSTUB(VOID)
     41ULONG __DLLstart(VOID)
    4242{
     43  return 0;
    4344}
    4445

  • cmedia/trunk/Runtime/string.c

    r354 r553  
    1212#include <string.h>
    1313
    14 char *strncpy(char *dst, const char *src, int n)
     14char *strncpy(char *dst, const char *src, size_t n)
    1515{
    16    int i;
     16   size_t i;
    1717
    1818   for (i=0; i<n; i++)
    … …  
    2323
    2424
    25 char __far *_fstrncpy(char __far *dst, const char __far *src, int n)
     25char __far *_fstrncpy(char __far *dst, const char __far *src, size_t n)
    2626{
    27    int i;
     27   size_t i;
    2828
    2929   for (i=0; i<n; i++)
    … …  
    3333}
    3434
    35 int _fstrnicmp(const char __far *string1, const char __far *string2, int n)
     35int _fstrnicmp(const char __far *string1, const char __far *string2, size_t n)
    3636{ 
    37    int i,a,b;
     37   size_t i;
     38   int a,b;
    3839
    3940   for (i=0; i<n; i++) {
Note: See TracChangeset for help on using the changeset viewer.