Changeset 34 for GPL/trunk/lib32

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

Location:

GPL/trunk/lib32

Files:

• fminstrload.c (modified) (5 diffs)
• irq.c (modified) (5 diffs)
• ossidc.cpp (modified) (1 diff)
• pci.c (modified) (3 diffs)
• sound.c (modified) (2 diffs)
• soundmidi.c (modified) (4 diffs)

GPL/trunk/lib32/fminstrload.c

@@ -178 +178 @@
  * Send patch to destination port
  */
-static int load_patch (midihandle *pHandle, fm_instrument_t * fm_instr, int bank, int prg, char *name) 
+static int load_patch (midihandle *pHandle, struct fm_instrument * fm_instr, int bank, int prg, char *name)
 {
     snd_seq_instr_header_t *put;
@@ -231 +231 @@
 
     sbi_inst_t sbi_instr;
-    fm_instrument_t fm_instr;
+    struct fm_instrument fm_instr;
     int fm_instr_type;
 
@@ -311 +311 @@
 {
         snd_instr_header_t *put;
-        fm_instrument_t *instr;
+        struct fm_instrument *instr;
         fm_xinstrument_t *xinstr;
         int idx;
@@ -317 +317 @@
         if (fm == NULL || __data == NULL)
                 return -EINVAL;
-        instr = (fm_instrument_t *)fm;
+        instr = (struct fm_instrument *)fm;
         *__data = NULL;
         *__size = 0;
@@ -415 +415 @@
 {
         assert(info && id);
-        info->id.instr = *(struct sndrv_seq_instr *)id;
+        info->id.instr = *(struct snd_seq_instr *)id;
 }
 

GPL/trunk/lib32/irq.c

@@ -47 +47 @@
 //******************************************************************************
 int request_irq(unsigned int irq,
-                void (*handler)(int, void *, struct pt_regs *),
+                int (near *handler)(int, void *, struct pt_regs *),
                 unsigned long x0, const char *x1, void *x2)
 {
@@ -54 +54 @@
     if(RMRequestIRQ(hResMgr, irq, (x0 & SA_SHIRQ) ? TRUE : FALSE) == FALSE) {
         dprintf(("RMRequestIRQ failed for irq %d", irq));
-        return NULL;
+        return 0;
     }
 
@@ -109 +109 @@
 void eoi_irq(unsigned int irq)
 {
-    if(irq > 0xf) {
+    if(irq > 0xff) {
         DebugInt3();
         return;
@@ -119 +119 @@
 BOOL oss_process_interrupt(int irq)
 {
- BOOL rc;
+ int rc;
  int  i;
 
@@ -142 +142 @@
         {
             fInInterrupt = TRUE;
-            irqHandlers[irq][i].handler(irq, irqHandlers[irq][i].x2, 0);
-            rc = (eoiIrq[irq] > 0);
+            rc = irqHandlers[irq][i].handler(irq, irqHandlers[irq][i].x2, 0);
+            //rc = (eoiIrq[irq] > 0);
             fInInterrupt = FALSE;
-            if(rc) {
+            if(rc == 1) {
                 //ok, this interrupt was intended for us; notify the 16 bits MMPM/2 driver
                 OSS32_ProcessIRQ();

GPL/trunk/lib32/ossidc.cpp

@@ -100 +100 @@
 };
 //******************************************************************************
-OSSRET OSS32_Initialize()
-{
+OSSRET OSS32_Initialize(void)
+{
+    int i;
+
     fStrategyInit = TRUE;
-    int i;
 
     if(DevSetTimer(TimerHandler16) != 0) {

GPL/trunk/lib32/pci.c

@@ -32 +32 @@
 #include <asm/io.h>
 #include <sound/config.h>
+#include <sound/driver.h>
 #include <sound/asound.h>
 
@@ -526 +527 @@
                         //return 1;
                     }
-                    else pcidev->devfn = NULL;
+                    else pcidev->devfn = 0;
 
                     RMDestroy(hResMgr);
@@ -765 +766 @@
         u32 config[16];
 };
-statuc struct saved_config_tbl saved_tbl[16];
+static struct saved_config_tbl saved_tbl[16];
 
 void pci_save_state(struct pci_dev *pci)

GPL/trunk/lib32/sound.c

@@ -1157 +1157 @@
             buffer += ret;
             size   -= ret;
-            if(size <= 0) {
+            if((int)size <= 0) {
                 break;
             }
@@ -1257 +1257 @@
     int          ret;
     int          leftvol, rightvol;
-    snd_pcm_volume_t pcm_volume;
+    struct snd_pcm_volume pcm_volume;
 
     if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {

GPL/trunk/lib32/soundmidi.c

@@ -48 +48 @@
     midihandle                      *pHandle;
     int                              ret, i;
-    struct sndrv_seq_port_subscribe  subs;
-    struct sndrv_seq_client_info     clientinfo;
-    struct sndrv_seq_port_info       portinfo;
+    struct snd_seq_port_subscribe  subs;
+    struct snd_seq_client_info     clientinfo;
+    struct snd_seq_port_info       portinfo;
 
     *pStreamId = 0;
@@ -203 +203 @@
     //unsubscribe
     if(pHandle->state & MIDISTATE_SUBSCRIBED) {
-        struct sndrv_seq_port_subscribe  subs;
+        struct snd_seq_port_subscribe  subs;
 
         memset(&subs, 0, sizeof(subs));
@@ -219 +219 @@
     //delete port
     if(pHandle->state & MIDISTATE_SUBSCRIBED) {
-        struct sndrv_seq_port_info       portinfo;
+        struct snd_seq_port_info       portinfo;
         
         memset(&portinfo, 0, sizeof(portinfo));
@@ -287 +287 @@
     int          ret;
     LONG         transferred;
-    struct sndrv_seq_event fmevent;
+    struct snd_seq_event fmevent;
 
     if(pHandle == NULL || pHandle->magic != MAGIC_MIDI_ALSA32) {