Changeset 205


Ignore:
Timestamp:
Jun 14, 2007, 1:33:51 AM (13 years ago)
Author:
stevenhl
Message:

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

Location:
sbliveos2/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • sbliveos2/trunk/drv16/ioctl.cpp

    r191 r205  
    541541    case DAUDIO_SETPROPERTY:
    542542    {
    543         rc = pStream->SetProperty(pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
     543        rc = pStream->SetProperty((INT)pDAudioCmd->SetProperty.type, pDAudioCmd->SetProperty.value);
    544544        break;
    545545    }
  • sbliveos2/trunk/drv16/irq.cpp

    r159 r205  
    2727#include "irq.hpp"                     // Object definition
    2828
    29 const int NumIrqLevels = 16;
     29const int NumIrqLevels = 24;
    3030
    3131
     
    4949void far ISR14( void )   { pIrqObject[14]->CallHandlers(); }
    5050void far ISR15( void )   { pIrqObject[15]->CallHandlers(); }
     51// 13 Jun 07 MF
     52void far ISR16( void )   { pIrqObject[16]->CallHandlers(); }
     53void far ISR17( void )   { pIrqObject[17]->CallHandlers(); }
     54void far ISR18( void )   { pIrqObject[18]->CallHandlers(); }
     55void far ISR19( void )   { pIrqObject[19]->CallHandlers(); }
     56void far ISR20( void )   { pIrqObject[20]->CallHandlers(); }
     57void far ISR21( void )   { pIrqObject[21]->CallHandlers(); }
     58void far ISR22( void )   { pIrqObject[22]->CallHandlers(); }
     59void far ISR23( void )   { pIrqObject[23]->CallHandlers(); }
    5160
    5261// List of handlers here.
     
    6877   (pfnISR) ISR13,
    6978   (pfnISR) ISR14,
    70    (pfnISR) ISR15
     79   (pfnISR) ISR15,
     80   // 13 Jun 07 MF
     81   (pfnISR) ISR16,
     82   (pfnISR) ISR17,
     83   (pfnISR) ISR18,
     84   (pfnISR) ISR19,
     85   (pfnISR) ISR20,
     86   (pfnISR) ISR21,
     87   (pfnISR) ISR22,
     88   (pfnISR) ISR23
    7189};
    7290
     
    103121IRQ::IRQ( unsigned irq_level )
    104122{
    105    memset( (PVOID) this, 0, sizeof(IRQ) );     // Set all data to 0.
     123   // 13 Jun 07 SHL
     124   _fmemset( (PVOID) this, 0, sizeof(IRQ) );     // Set all data to 0.
    106125   _usIRQLevel = irq_level;
    107126   pIrqObject[ _usIRQLevel ] = this;
  • sbliveos2/trunk/drv16/irq.hpp

    r142 r205  
    5151// ###IHV:  IRQ sharing flag.  Set this to "0" for ISA bus, "1" for PCI
    5252// PCI and Microchannel environments (where hardware can share an IRQ level.
    53 const IRQ_HW_Sharing = 0;
     53const IRQ_HW_Sharing = 1;               // 13 Jun 07 MF
    5454
    5555// Max num of int handlers per IRQ level.
  • sbliveos2/trunk/drv16/maudio.cpp

    r142 r205  
    2525#include <os2medef.h>
    2626#include <audio.h>
    27 #include "..\midi\midi_idc.h"          // RTMIDI interfaces,
     27
     28#include "midi_idc.h"                   // RTMIDI interfaces,
    2829#include "maudio.hpp"
    2930
  • sbliveos2/trunk/drv16/maudio.hpp

    r142 r205  
    2929#endif
    3030
    31 #include "..\midi\midi_idc.h"          // RTMIDI interfaces, MIDI_NAME_LENGTH
     31#include "midi_idc.h"                  // RTMIDI interfaces, MIDI_NAME_LENGTH
    3232#include "audiohw.hpp"                 // Object definition.
    3333#include "timer.hpp"                   // Object definition.
  • sbliveos2/trunk/drv16/midistrm.cpp

    r147 r205  
    182182void MIDISTREAM::_allNotesOff( void )
    183183{
    184    for ( USHORT noteNum=0; noteNum < NUM_MidiNotes; ++noteNum)
     184   for ( BYTE noteNum=0; noteNum < NUM_MidiNotes; ++noteNum)
    185185      if (_notesOn[noteNum])
    186186         // This note number is playing on one or more channels.
    187187         // Shut the note off on all channels on which it is playing.
    188          for ( USHORT mchan=0; mchan < NUM_MidiChannels; ++mchan)
     188         for ( BYTE mchan=0; mchan < NUM_MidiChannels; ++mchan)
    189189            if (_notesOn[noteNum] & _usBitNumber[mchan]) {
    190190               ((MIDIAUDIO*) pahw)->noteOff( mchan, noteNum, 0 );
  • sbliveos2/trunk/drv16/mpu401.cpp

    r151 r205  
    3030#include <string.h>                    // strcpy(), strcat()
    3131#include "sizedefs.h"                  //### NUM_DEVICES, MAX_MPU401
    32 #include "..\midi\midi_idc.h"          // RTMIDI i/f
     32#include "midi_idc.h"                  // RTMIDI i/f
    3333#include "iodelay.h"
    3434#include "malloc.h"
  • sbliveos2/trunk/drv16/rm.cpp

    r178 r205  
    9999 *  allocate resources.
    100100 */
    101 ResourceManager::ResourceManager(ULONG pciId)
     101ResourceManager::ResourceManager(ULONG)
    102102{
    103103   APIRET rc;
     
    418418   int nResources;                     // Number of resources.
    419419   PRESOURCELIST pRL;                  // Return value, pointer to resource list
    420                                        // constructured in the heap.
     420                                       // constructed in the heap.
    421421   // Count up number of resources.
    422422   for ( i=0, nResources=0; i<MAX_ISA_Dev_IO; ++i) {
     
    438438
    439439   // Fill in resource list values.
    440    _fmemset( (PVOID) pRL, 0, nBytes );
     440   _fmemset( (PVOID) pRL, 0, nBytes );  // 13 Jun 07 SHL
    441441   pRL->Count = nResources;
    442442
     
    485485   }
    486486
    487    return pRL;
     487   return (NPRESOURCELIST)pRL;
    488488}
    489489
     
    652652{
    653653   APIRET rc;
     654   // 13 Jun 07 SHL fixme to check overflow even though unlikely
    654655   USHORT nBytes =
    655             sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * pResourceList->Count);
     656            sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * (USHORT)pResourceList->Count);
    656657   NPAHRESOURCE pahResource = (NPAHRESOURCE) malloc( nBytes );
    657658                                       // Handles for allocated resources are saved here.
  • sbliveos2/trunk/drv16/rtmidi.hpp

    r142 r205  
    2828#include <os2.h>
    2929#endif
    30 #include "..\midi\midi_idc.h"          // RTMIDI interfaces
     30#include "midi_idc.h"                  // RTMIDI interfaces
    3131#include "maudio.hpp"                  // MIDIAUDIO
    3232
  • sbliveos2/trunk/include/dbgos2.h

    r153 r205  
    2222//
    2323//******************************************************************************
    24 #ifndef __COMMDBG_H__
    25 #define __COMMDBG_H__
     24#ifndef __DBGOS2_H__
     25#define __DBGOS2_H__
    2626
    2727#ifdef __cplusplus
     
    5050#endif
    5151
    52 #endif //__COMMDBG_H__
     52#endif //__DBGOS2_H__
  • sbliveos2/trunk/install/rcstub.c

    r192 r205  
    3838UCHAR   uDummy = 0;
    3939
     40// 06 Jun 07 SHL
     41VOID APIENTRY __DLLstart_(VOID)
     42{
     43}
    4044
     45#if 0   // 06 Jun 07 SHL
    4146VOID APIENTRY RCSTUB(VOID)
    4247{
    4348}
    44 
    45 
     49#endif
  • sbliveos2/trunk/runtime/string.c

    r142 r205  
    1212#include <string.h>
    1313
    14 char *strncpy(char *dst, const char *src, int n)
     14char *strncpy(char *dst, const char *src, unsigned int n)
    1515{
    1616   int 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, unsigned int n)
    2626{
    2727   int 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, unsigned int n)
    3636
    3737   int i,a,b;
  • sbliveos2/trunk/sblive/cardwo.c

    r153 r205  
    232232                u8 t = (card_waveout->globalreverb & 0xff) + (wave_out->localreverb & 0xff);
    233233
    234                 left->send_a = (t > 255) ? 255 : t;
     234                left->send_a = ((unsigned)t > 255) ? 255 : t;
    235235        } else {
    236236                left->send_a = 0;
     
    240240                u8 t = (card_waveout->globalchorus & 0xff) + (wave_out->localchorus & 0xff);
    241241
    242                 left->send_d = (t > 255) ? 255 : t;
     242                left->send_d = ((unsigned)t > 255) ? 255 : t;
    243243        } else {
    244244                left->send_d = 0;
  • sbliveos2/trunk/sblive/midi.c

    r151 r205  
    287287                        cnt = count;
    288288
    289                 if (cnt <= 0) {
     289                if (cnt == 0) {
    290290                        if (file->f_flags & O_NONBLOCK)
    291291                                return ret ? ret : -EAGAIN;
Note: See TracChangeset for help on using the changeset viewer.