Changeset 418

Timestamp:

Mar 23, 2009, 12:15:39 AM (16 years ago)

Author:

Paul Smedley

Message:

Build fixes for Watcom 1.8

Location:

OCO/trunk/drv16

Files:

• irq.hpp (modified) (1 diff)
• maudio.cpp (modified) (2 diffs)
• midimsg.hpp (modified) (2 diffs)
• midistrm.hpp (modified) (1 diff)
• sizedefs.h (modified) (1 diff)
• stream.cpp (modified) (1 diff)
• timer.cpp (modified) (3 diffs)

OCO/trunk/drv16/irq.hpp

@@ -51 +51 @@
 // ###IHV:  IRQ sharing flag.  Set this to "0" for ISA bus, "1" for PCI
 // PCI and Microchannel environments (where hardware can share an IRQ level.
-const IRQ_HW_Sharing = 0;
+const BOOL IRQ_HW_Sharing = 0;
 
 // Max num of int handlers per IRQ level.
-const MAX_HandlersPerIRQLevel = 3;
+const int MAX_HandlersPerIRQLevel = 3;
 
 // PFN_InterruptHandler:  Pointer to an interrupt handler.  This is a near

OCO/trunk/drv16/maudio.cpp

@@ -70 +70 @@
 // if these haven't been redefined by the sub-classes.
 //******************************************************************************
-virtual int MIDIAUDIO::writeByte(OSSSTREAMID StreamId, BYTE b)
+int MIDIAUDIO::writeByte(OSSSTREAMID StreamId, BYTE b)
 {
    return 0;    // Failure.
@@ -76 +76 @@
 //******************************************************************************
 //******************************************************************************
-virtual int MIDIAUDIO::readByte(OSSSTREAMID StreamId)
+int MIDIAUDIO::readByte(OSSSTREAMID StreamId)
 {
    return -1;   // Failure.

OCO/trunk/drv16/midimsg.hpp

@@ -55 +55 @@
 
 // Byte length of the IBM Sysex Signature (0xF000003A).
-const IBMSysexSigLen = 4;
+const int IBMSysexSigLen = 4;
 
 // Miscellaneous error codes, must be <0.
@@ -68 +68 @@
 // Longest message at time of this writing is 4 byte IBM Sysex signature
 // plus 4 bytes sysex command and data == 8 bytes.  We'll tack on 2 extra.
-const MAX_MidiMsgLen = (IBMSysexSigLen + 4 + 2);
+const int MAX_MidiMsgLen = (IBMSysexSigLen + 4 + 2);
 
 // We use this class to build up MIDI messages as we receive the bytes.

OCO/trunk/drv16/midistrm.hpp

@@ -39 +39 @@
 
 // Number of notes in the MIDI definition.
-const NUM_MidiNotes = 128;
+const int NUM_MidiNotes = 128;
 
 // Number of channels in the MIDI definition.
-const NUM_MidiChannels = 16;
+const int NUM_MidiChannels = 16;
 
 // The MIDI parser is always in one of the following states.

OCO/trunk/drv16/sizedefs.h

@@ -24 +24 @@
 #define SIZEDEFS_H
 
-const NumLogicalDevices = 5; // Number of PNP logical devices on adapter.
+const int NumLogicalDevices = 5; // Number of PNP logical devices on adapter.
 
 #define HEAP_SIZE         16384         // must be a multiple of 4

OCO/trunk/drv16/stream.cpp

@@ -196 +196 @@
 //******************************************************************************
 #pragma off (unreferenced)
-virtual ULONG STREAM::Write(PSTREAMBUF pbuf, ULONG uLength, BOOL fLooping)
+ULONG STREAM::Write(PSTREAMBUF pbuf, ULONG uLength, BOOL fLooping)
 #pragma on (unreferenced)
 {

OCO/trunk/drv16/timer.cpp

@@ -217 +217 @@
  * @notes Maps operation to _iStop (Stop and Pause are identical).
  */
-virtual int TIMER::Stop( void )
+int TIMER::Stop( void )
 {
    return _iStop();
@@ -229 +229 @@
  * @notes Maps operation to _iStop (Stop and Pause are identical).
  */
-virtual int TIMER::Pause( void )
+int TIMER::Pause( void )
 {
    return _iStop();
@@ -241 +241 @@
  * @notes Maps operation to _iStart (Start and Resume are identical).
  */
-virtual int TIMER::Resume( void )
+int TIMER::Resume( void )
 {
    return _iStart();