Changeset 151 for sbliveos2/trunk/sblive


Ignore:
Timestamp:
May 28, 2000, 6:50:46 PM (25 years ago)
Author:
sandervl
Message:

update

Location:
sbliveos2/trunk/sblive
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • sbliveos2/trunk/sblive/cardmi.c

    r142 r151  
    3737#include "cardmi.h"
    3838
     39#ifdef TARGET_OS2
     40extern int OSS32_ProcessMidiIRQ(unsigned long streamid);
     41#endif
     42
    3943static struct {
    4044        int (*Fn) (struct emu10k1_mpuin *, u8);
    … …  
    96100        emu10k1_mpu_acquire(card);
    97101
     102#ifdef TARGET_OS2
     103        emu10k1_irq_enable(card, INTE_MIDIRXENABLE);
     104#endif
    98105        return CTSTATUS_SUCCESS;
    99106}
    … …  
    343350         */
    344351
     352#ifdef TARGET_OS2
     353        OSS32_ProcessMidiIRQ((unsigned long)card_mpuin->openinfo.refdata);
     354        return CTSTATUS_SUCCESS;
     355#else
    345356        count = 0;
    346357        idx = card_mpuin->qtail;
    … …  
    364375
    365376        return CTSTATUS_SUCCESS;
     377#endif
    366378}
    367379

  • sbliveos2/trunk/sblive/cardmi.h

    r142 r151  
    5858/* flags for card MIDI in object */
    5959#define FLAGS_MIDM_STARTED          0x00001000      // Data has started to come in after Midm Start
     60
     61#ifdef TARGET_OS2
     62#define MIDIIN_MAX_BUFFER_SIZE      4
     63#else
    6064#define MIDIIN_MAX_BUFFER_SIZE      200             // Definition for struct emu10k1_mpuin
     65#endif
    6166
    6267struct midi_data

  • sbliveos2/trunk/sblive/midi.c

    r142 r151  
    5555        struct midi_hdr *midihdr;
    5656
     57#ifdef TARGET_OS2
     58        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL) {
     59#else
    5760        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr *), GFP_KERNEL)) == NULL) {
     61#endif
    5862                ERROR();
    5963                return -EINVAL;
    … …  
    336340                return -EFAULT;
    337341
     342#ifdef TARGET_OS2
     343        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr), GFP_KERNEL)) == NULL)
     344#else
    338345        if ((midihdr = (struct midi_hdr *) kmalloc(sizeof(struct midi_hdr *), GFP_KERNEL)) == NULL)
     346#endif
    339347                return -EINVAL;
    340348

  • sbliveos2/trunk/sblive/midi.h

    r142 r151  
    4242#define MIDIIN_STATE_STOPPED 0x00000002
    4343
     44#ifdef TARGET_OS2
     45#define MIDIIN_BUFLEN 16
     46#else
    4447#define MIDIIN_BUFLEN 1024
     48#endif
    4549
    4650struct emu10k1_mididevice
Note: See TracChangeset for help on using the changeset viewer.