Changeset 205 for sbliveos2/trunk/drv16

Timestamp:

Jun 14, 2007, 3:33:51 AM (18 years ago)

Author:

stevenhl

Message:

Make warnings away - SHL
Use drv16/midi_idc.h only - SHL
Add interrupts 16-23 - MF

Location:

sbliveos2/trunk/drv16

Files:

• ioctl.cpp (modified) (1 diff)
• irq.cpp (modified) (4 diffs)
• irq.hpp (modified) (1 diff)
• maudio.cpp (modified) (1 diff)
• maudio.hpp (modified) (1 diff)
• midistrm.cpp (modified) (1 diff)
• mpu401.cpp (modified) (1 diff)
• rm.cpp (modified) (5 diffs)
• rtmidi.hpp (modified) (1 diff)

sbliveos2/trunk/drv16/ioctl.cpp

@@ -541 +541 @@
     case DAUDIO_SETPROPERTY:
     {
-        rc = pStream->SetProperty(pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
+        rc = pStream->SetProperty((INT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
         break;
     }

sbliveos2/trunk/drv16/irq.cpp

@@ -27 +27 @@
 #include "irq.hpp"                     // Object definition
 
-const int NumIrqLevels = 16;
+const int NumIrqLevels = 24;
 
 
@@ -49 +49 @@
 void far ISR14( void )   { pIrqObject[14]->CallHandlers(); }
 void far ISR15( void )   { pIrqObject[15]->CallHandlers(); }
+// 13 Jun 07 MF
+void far ISR16( void )   { pIrqObject[16]->CallHandlers(); }
+void far ISR17( void )   { pIrqObject[17]->CallHandlers(); }
+void far ISR18( void )   { pIrqObject[18]->CallHandlers(); }
+void far ISR19( void )   { pIrqObject[19]->CallHandlers(); }
+void far ISR20( void )   { pIrqObject[20]->CallHandlers(); }
+void far ISR21( void )   { pIrqObject[21]->CallHandlers(); }
+void far ISR22( void )   { pIrqObject[22]->CallHandlers(); }
+void far ISR23( void )   { pIrqObject[23]->CallHandlers(); }
 
 // List of handlers here.
@@ -68 +77 @@
    (pfnISR) ISR13,
    (pfnISR) ISR14,
-   (pfnISR) ISR15
+   (pfnISR) ISR15,
+   // 13 Jun 07 MF
+   (pfnISR) ISR16,
+   (pfnISR) ISR17,
+   (pfnISR) ISR18,
+   (pfnISR) ISR19,
+   (pfnISR) ISR20,
+   (pfnISR) ISR21,
+   (pfnISR) ISR22,
+   (pfnISR) ISR23
 };
 
@@ -103 +121 @@
 IRQ::IRQ( unsigned irq_level )
 {
-   memset( (PVOID) this, 0, sizeof(IRQ) );     // Set all data to 0.
+   // 13 Jun 07 SHL
+   _fmemset( (PVOID) this, 0, sizeof(IRQ) );     // Set all data to 0.
    _usIRQLevel = irq_level;
    pIrqObject[ _usIRQLevel ] = this;

sbliveos2/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 IRQ_HW_Sharing = 1;               // 13 Jun 07 MF
 
 // Max num of int handlers per IRQ level.

sbliveos2/trunk/drv16/maudio.cpp

@@ -25 +25 @@
 #include <os2medef.h>
 #include <audio.h>
-#include "..\midi\midi_idc.h"          // RTMIDI interfaces,
+
+#include "midi_idc.h"                   // RTMIDI interfaces,
 #include "maudio.hpp"
 

sbliveos2/trunk/drv16/maudio.hpp

@@ -29 +29 @@
 #endif
 
-#include "..\midi\midi_idc.h"          // RTMIDI interfaces, MIDI_NAME_LENGTH
+#include "midi_idc.h"                  // RTMIDI interfaces, MIDI_NAME_LENGTH
 #include "audiohw.hpp"                 // Object definition.
 #include "timer.hpp"                   // Object definition.

sbliveos2/trunk/drv16/midistrm.cpp

@@ -182 +182 @@
 void MIDISTREAM::_allNotesOff( void )
 {
-   for ( USHORT noteNum=0; noteNum < NUM_MidiNotes; ++noteNum)
+   for ( BYTE noteNum=0; noteNum < NUM_MidiNotes; ++noteNum)
       if (_notesOn[noteNum])
          // This note number is playing on one or more channels.
          // Shut the note off on all channels on which it is playing.
-         for ( USHORT mchan=0; mchan < NUM_MidiChannels; ++mchan)
+         for ( BYTE mchan=0; mchan < NUM_MidiChannels; ++mchan)
             if (_notesOn[noteNum] & _usBitNumber[mchan]) {
                ((MIDIAUDIO*) pahw)->noteOff( mchan, noteNum, 0 );

sbliveos2/trunk/drv16/mpu401.cpp

@@ -30 +30 @@
 #include <string.h>                    // strcpy(), strcat()
 #include "sizedefs.h"                  //### NUM_DEVICES, MAX_MPU401
-#include "..\midi\midi_idc.h"          // RTMIDI i/f
+#include "midi_idc.h"                  // RTMIDI i/f
 #include "iodelay.h"
 #include "malloc.h"

sbliveos2/trunk/drv16/rm.cpp

@@ -99 +99 @@
  *  allocate resources.
  */
-ResourceManager::ResourceManager(ULONG pciId)
+ResourceManager::ResourceManager(ULONG)
 {
    APIRET rc;
@@ -418 +418 @@
    int nResources;                     // Number of resources.
    PRESOURCELIST pRL;                  // Return value, pointer to resource list
-                                       // constructured in the heap.
+                                       // constructed in the heap.
    // Count up number of resources.
    for ( i=0, nResources=0; i<MAX_ISA_Dev_IO; ++i) {
@@ -438 +438 @@
 
    // Fill in resource list values.
-   _fmemset( (PVOID) pRL, 0, nBytes );
+   _fmemset( (PVOID) pRL, 0, nBytes );  // 13 Jun 07 SHL
    pRL->Count = nResources;
 
@@ -485 +485 @@
    }
 
-   return pRL;
+   return (NPRESOURCELIST)pRL;
 }
 
@@ -652 +652 @@
 {
    APIRET rc;
+   // 13 Jun 07 SHL fixme to check overflow even though unlikely
    USHORT nBytes =
-            sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * pResourceList->Count);
+            sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * (USHORT)pResourceList->Count);
    NPAHRESOURCE pahResource = (NPAHRESOURCE) malloc( nBytes );
                                        // Handles for allocated resources are saved here.

sbliveos2/trunk/drv16/rtmidi.hpp

@@ -28 +28 @@
 #include <os2.h>
 #endif
-#include "..\midi\midi_idc.h"          // RTMIDI interfaces
+#include "midi_idc.h"                  // RTMIDI interfaces
 #include "maudio.hpp"                  // MIDIAUDIO