Changeset 594

Timestamp:

Apr 3, 2017, 3:18:42 PM (8 years ago)

Author:

David Azarewicz

Message:

Code cleanup.
Hack for tick.

Location:

GPL/branches/uniaud32-2.1.x

Files:

• alsa-kernel/core/info.c (modified) (4 diffs)
• alsa-kernel/core/init.c (modified) (2 diffs)
• alsa-kernel/core/pcm.c (modified) (2 diffs)
• alsa-kernel/core/pcm_lib.c (modified) (3 diffs)
• alsa-kernel/core/pcm_native.c (modified) (1 diff)
• alsa-kernel/core/sgbuf.c (modified) (1 diff)
• alsa-kernel/core/sound_oss.c (modified) (1 diff)
• alsa-kernel/core/timer.c (modified) (1 diff)
• alsa-kernel/pci/ac97/ac97_codec.c (modified) (1 diff)
• alsa-kernel/pci/ali5451/ali5451.c (modified) (13 diffs)
• alsa-kernel/pci/atiixp.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_codec.c (modified) (1 diff)
• alsa-kernel/pci/hda/hda_proc.c (modified) (1 diff)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (1 diff)
• alsa-kernel/pci/intel8x0.c (modified) (2 diffs)
• alsa-kernel/pci/nm256/nm256.c (modified) (12 diffs)
• alsa-kernel/pci/via82xx.c (modified) (9 diffs)
• drv32/dispatch.c (modified) (32 diffs)
• drv32/parse.c (modified) (1 diff)
• include/dbgos2.h (modified) (1 diff)
• include/linux/types.h (modified) (1 diff)
• lib32/fminstrload.c (modified) (1 diff)
• lib32/ioctl.c (modified) (9 diffs)
• lib32/misc.c (modified) (1 diff)
• lib32/sound.c (modified) (4 diffs)
• lib32/soundmidi.c (modified) (1 diff)
• lib32/soundmixer.c (modified) (5 diffs)
• tools/header.mif (modified) (1 diff)

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/info.c

@@ -81 +81 @@
 static void snd_info_disconnect(struct snd_info_entry *entry);
 
-
+#ifdef NOT_USED
 /* resize the proc r/w buffer */
 static int resize_info_buffer(struct snd_info_buffer *buffer,
@@ -106 +106 @@
         return 0;
 }
+#endif
 
 #ifndef TARGET_OS2
@@ -171 +172 @@
 }
 
+#ifdef NOT_USED
 static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig)
 {
@@ -557 +559 @@
         .release =              snd_info_entry_release,
 };
+#endif
 
 int __init snd_info_init(void)

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/init.c

@@ -657 +657 @@
 #endif
 
+#ifdef NOT_USED
 static struct device_attribute card_id_attrs =
         __ATTR(id, S_IRUGO | S_IWUSR, card_id_show_attr, card_id_store_attr);
 
-#ifdef NOT_USED
 static ssize_t
 card_number_show_attr(struct device *dev,
@@ -668 +668 @@
         return snprintf(buf, PAGE_SIZE, "%i\n", card ? card->number : -1);
 }
-#endif
 
 static struct device_attribute card_number_attrs =
         __ATTR(number, S_IRUGO, card_number_show_attr, NULL);
+#endif
 
 /**

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/pcm.c

@@ -231 +231 @@
 #define ACCESS(v) [SNDRV_PCM_ACCESS_##v] = #v
 #define START(v) [SNDRV_PCM_START_##v] = #v
-#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v 
+#define SUBFORMAT(v) [SNDRV_PCM_SUBFORMAT_##v] = #v
 
 static char *snd_pcm_stream_names[] = {
@@ -1184 +1184 @@
 int pcm_instances(int card_id)
 {
-    int idx;
+    //int idx;
     int pcms = 0;
     struct snd_pcm *pcm;

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/pcm_lib.c

@@ -46 +46 @@
         snd_pcm_uframes_t frames, ofs, transfer;
 
+  /* DAZ: This is a hack to prevent extra noise after every sound.
+   * runtime->boundary is always *much* bigger than runtime->silence_size
+   * so the ring buffer never gets filled with silence. This hack forces
+   * the ring buffer to always get filled with silence.
+   * I am guessing that the OS2 code is not providing a big enough buffer
+   * of silence.
+   */
+  #ifndef TARGET_OS2
         if (runtime->silence_size < runtime->boundary) {
                 snd_pcm_sframes_t noise_dist, n;
@@ -67 +75 @@
                         frames = runtime->silence_size;
         } else {
+        #endif
                 if (new_hw_ptr == ULONG_MAX) {  /* initialization */
                         snd_pcm_sframes_t avail = snd_pcm_playback_hw_avail(runtime);
@@ -89 +98 @@
                 }
                 frames = runtime->buffer_size - runtime->silence_filled;
-        }
+  #ifndef TARGET_OS2            
+        }
+        #endif
         if (snd_BUG_ON(frames > runtime->buffer_size))
                 return;

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/pcm_native.c

@@ -892 +892 @@
         snd_pcm_trigger_tstamp(substream);
         runtime->hw_ptr_jiffies = jiffies;
-        runtime->hw_ptr_buffer_jiffies = (runtime->buffer_size * HZ) / 
+        runtime->hw_ptr_buffer_jiffies = (runtime->buffer_size * HZ) /
                                                             runtime->rate;
         runtime->status->state = state;

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/sgbuf.c

@@ -109 +109 @@
 {
         struct snd_sg_buf *sgbuf;
-        unsigned int i, pages, chunk, maxpages;
-        struct snd_dma_buffer tmpb;
+        unsigned int pages;
+//      unsigned int i, chunk, maxpages;
+//      struct snd_dma_buffer tmpb;
 #ifdef TARGET_OS2
         void *ptr;

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/sound_oss.c

@@ -114 +114 @@
         int cidx = SNDRV_MINOR_OSS_CARD(minor);
         int track2 = -1;
-        int register1 = -1, register2 = -1;
-        struct device *carddev = snd_card_get_device_link(card);
+//      int register1 = -1, register2 = -1;
+//      struct device *carddev = snd_card_get_device_link(card);
 
         if (card && card->number >= 8)

GPL/branches/uniaud32-2.1.x/alsa-kernel/core/timer.c

@@ -44 +44 @@
 #endif
 
-static int timer_limit = DEFAULT_TIMER_LIMIT;
+//static int timer_limit = DEFAULT_TIMER_LIMIT;
 static int timer_tstamp_monotonic = 1;
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>");

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/ac97/ac97_codec.c

@@ -603 +603 @@
 }
 
+#ifdef NOT_USED
 static const struct snd_kcontrol_new snd_ac97_controls_master_mono[2] = {
 AC97_SINGLE("Master Mono Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
 AC97_SINGLE("Master Mono Playback Volume", AC97_MASTER_MONO, 0, 31, 1)
 };
+#endif
 
 static const struct snd_kcontrol_new snd_ac97_controls_tone[2] = {

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/ali5451/ali5451.c

@@ -61 +61 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 
@@ -302 +302 @@
                                              unsigned int port)
 {
-        return (unsigned int)inl(ALI_REG(codec, port)); 
+        return (unsigned int)inl(ALI_REG(codec, port));
 }
 
@@ -815 +815 @@
         bVal = inb(ALI_REG(codec, ALI_SPDIF_CTRL));
         outb(bVal & ALI_SPDIF_OUT_CH_STATUS, ALI_REG(codec, ALI_SPDIF_CTRL));
-   
+
         wVal = inw(ALI_REG(codec, ALI_GLOBAL_CONTROL));
         wVal |= ALI_SPDIF_OUT_SEL_PCM;
@@ -1076 +1076 @@
                 else if (rate == 48000)
                         delta = 0x1000;
-                else 
+                else
                         delta = (((rate << 12) + rate) / 48000) & 0x0000ffff;
         }
@@ -1107 +1107 @@
 static int snd_ali_trigger(struct snd_pcm_substream *substream,
                                int cmd)
-                                    
+                                
 {
         struct snd_ali *codec = snd_pcm_substream_chip(substream);
@@ -1259 +1259 @@
         Delta = snd_ali_convert_rate(runtime->rate, 0);
 
-        if (pvoice->number == ALI_SPDIF_IN_CHANNEL || 
+        if (pvoice->number == ALI_SPDIF_IN_CHANNEL ||
             pvoice->number == ALI_PCM_IN_CHANNEL)
                 snd_ali_disable_special_channel(codec, pvoice->number);
@@ -1277 +1277 @@
 
         /* set target ESO for channel */
-        pvoice->eso = runtime->buffer_size; 
+        pvoice->eso = runtime->buffer_size;
 
         snd_ali_printk("playback_prepare: eso=%xh count=%xh\n",
@@ -1350 +1350 @@
 
         Delta = (pvoice->number == ALI_MODEM_IN_CHANNEL ||
-                 pvoice->number == ALI_MODEM_OUT_CHANNEL) ? 
+                 pvoice->number == ALI_MODEM_OUT_CHANNEL) ?
                 0x1000 : snd_ali_convert_rate(runtime->rate, pvoice->mode);
 
@@ -1380 +1380 @@
 
         /* set target ESO for channel  */
-        pvoice->eso = runtime->buffer_size; 
+        pvoice->eso = runtime->buffer_size;
 
         /* set interrupt count size  */
@@ -1809 +1809 @@
                 }
                 break;
-        case 1: 
+        case 1:
                 change = (codec->spdif_mask & 0x04) ? 1 : 0;
                 change = change ^ spdif_enable;
@@ -1929 +1929 @@
         for (i = 0; i < ALI_CHANNELS; i++) {
                 outb(i, ALI_REG(chip, ALI_GC_CIR));
-                for (j = 0; j < ALI_CHANNEL_REGS; j++) 
+                for (j = 0; j < ALI_CHANNEL_REGS; j++)
                         im->channel_regs[i][j] = inl(ALI_REG(chip, j*4 + 0xe0));
         }
@@ -1969 +1969 @@
         for (i = 0; i < ALI_CHANNELS; i++) {
                 outb(i, ALI_REG(chip, ALI_GC_CIR));
-                for (j = 0; j < ALI_CHANNEL_REGS; j++) 
+                for (j = 0; j < ALI_CHANNEL_REGS; j++)
                         outl(im->channel_regs[i][j], ALI_REG(chip, j*4 + 0xe0));
         }
@@ -2318 +2318 @@
         .resume = ali_resume,
 #endif
-};                                
+};
 
 static int __init alsa_card_ali_init(void)

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/atiixp.c

@@ -61 +61 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/hda_codec.c

@@ -639 +639 @@
         struct hda_codec_preset_list *tbl;
         const struct hda_codec_preset *preset;
-        int mod_requested = 0;
+        //int mod_requested = 0;
 
         if (is_generic_config(codec))

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/hda_proc.c

@@ -493 +493 @@
 #endif
 
-        int sup = snd_hda_param_read(codec, nid, AC_PAR_POWER_STATE);
+        //int sup = snd_hda_param_read(codec, nid, AC_PAR_POWER_STATE);
         int pwr = snd_hda_codec_read(codec, nid, 0,
                                      AC_VERB_GET_POWER_STATE, 0);

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/hda/patch_sigmatel.c

@@ -4850 +4850 @@
 {
         struct sigmatel_spec *spec = codec->spec;
-        const struct dmi_device *dev = NULL;
+        //const struct dmi_device *dev = NULL;
 
         if ((codec->subsystem_id >> 16) == PCI_VENDOR_ID_HP) {

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/intel8x0.c

@@ -97 +97 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
-static int joystick;
+//static int joystick;
 module_param(joystick, int, 0444);
 
@@ -3164 +3164 @@
 };
 
+#ifdef NOT_USED
 static struct snd_pci_quirk spdif_aclink_defaults[] __devinitdata = {
         SND_PCI_QUIRK(0x147b, 0x1c1a, "ASUS KN8", 1),
         {0} /* end */
 };
+#endif
 
 /* look up white/black list for SPDIF over ac-link */

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/nm256/nm256.c

@@ -1 @@
-/* 
+/*
  * Driver for NeoMagic 256AV and 256ZX chipsets.
  * Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>
@@ -24 +24 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-  
+
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -87 +87 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 
@@ -401 +401 @@
 };
 static struct snd_pcm_hw_constraint_list constraints_rates = {
-        .count = ARRAY_SIZE(samplerates), 
+        .count = ARRAY_SIZE(samplerates),
         .list = samplerates,
         .mask = 0,
@@ -957 +957 @@
 
 
-/* 
- * Initialize the hardware. 
+/*
+ * Initialize the hardware.
  */
 static void
@@ -998 +998 @@
 }
 
-/* 
- * Handle a potential interrupt for the device referred to by DEV_ID. 
+/*
+ * Handle a potential interrupt for the device referred to by DEV_ID.
  *
  * I don't like the cut-n-paste job here either between the two routines,
@@ -1148 +1148 @@
         testb = chip->mixer_status_mask;
 
-        /* 
-         * Loop around waiting for the mixer to become ready. 
+        /*
+         * Loop around waiting for the mixer to become ready.
          */
         while (timeout-- > 0) {
@@ -1159 +1159 @@
 }
 
-/* 
+/*
  * Initial register values to be written to the AC97 mixer.
  * While most of these are identical to the reset values, we do this
@@ -1188 +1188 @@
         { AC97_REC_GAIN,        0x0B0B },
         { AC97_GENERAL_PURPOSE, 0x0000 },
-        { AC97_3D_CONTROL,      0x8000 }, 
+        { AC97_3D_CONTROL,      0x8000 },
         { AC97_VENDOR_ID1,      0x8384 },
         { AC97_VENDOR_ID2,      0x7609 },
@@ -1218 +1218 @@
 }
 
-/* 
+/*
  */
 static void
@@ -1331 +1331 @@
 }
 
-/* 
+/*
  * See if the signature left by the NM256 BIOS is intact; if so, we use
  * the associated address as the end of our audio buffer in the video
@@ -1499 +1499 @@
         chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize = capture_bufsize * 1024;
 
-        /* 
+        /*
          * The NM256 has two memory ports.  The first port is nothing
          * more than a chunk of video RAM, which is used as the I/O ring

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/via82xx.c

@@ -44 +44 @@
  *
  * Sep. 26, 2005        Karsten Wiese <annabellesgarden@yahoo.de>
- *      - Optimize position calculation for the 823x chips. 
+ *      - Optimize position calculation for the 823x chips.
  */
 
@@ -111 +111 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 
@@ -513 +513 @@
         return inl(VIAREG(chip, AC97));
 }
- 
+
 static inline void snd_via82xx_codec_xwrite(struct via82xx *chip, unsigned int val)
 {
         outl(val, VIAREG(chip, AC97));
 }
- 
+
 static int snd_via82xx_codec_ready(struct via82xx *chip, int secondary)
 {
@@ -533 +533 @@
         return -EIO;
 }
- 
+
 static int snd_via82xx_codec_valid(struct via82xx *chip, int secondary)
 {
@@ -550 +550 @@
         return -EIO;
 }
- 
+
 static void snd_via82xx_codec_wait(struct snd_ac97 *ac97)
 {
@@ -648 +648 @@
                         /*
                          * Update hwptr_done based on 'period elapsed'
-                         * interrupts. We'll use it, when the chip returns 0 
+                         * interrupts. We'll use it, when the chip returns 0
                          * for OFFSET_CURR_COUNT.
                          */
@@ -697 +697 @@
                         /*
                          * Update hwptr_done based on 'period elapsed'
-                         * interrupts. We'll use it, when the chip returns 0 
+                         * interrupts. We'll use it, when the chip returns 0
                          * for OFFSET_CURR_COUNT.
                          */
@@ -877 +877 @@
                 status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
 
-        /* An apparent bug in the 8251 is worked around by sending a 
+        /* An apparent bug in the 8251 is worked around by sending a
          * REG_CTRL_START. */
         if (chip->revision == VIA_REV_8251 && (status & VIA_REG_STAT_EOL))
@@ -908 +908 @@
                                 }
                 }
-        }                           
+        }                       
 unlock:
         viadev->lastpos = res;

GPL/branches/uniaud32-2.1.x/drv32/dispatch.c

@@ -105 +105 @@
     //printk("StratIOCtl 0x%x\n", rp->Function);
     #endif
-    //    printk("cmd: %x, len: %i, pack: %x\n",rp->Function, rp->ioctl.usParmLen, rp->ParmPacket);
+    //    printk("cmd: %x, len: %i, pack: %x\n",rp->ioctl.bFunction, rp->ioctl.usParmLen, rp->ioctl.pvParm);
     // work with Parm Packet
     if ((rp->ioctl.usParmLen != 0 ||
@@ -183 +183 @@
     case IOCTL_OSS32_ATTACH:
         {
+          dprintf(("OSS32_ATTACH\n"));
             card_id = (ULONG) *linParm;
             // Check if audio init was successful
@@ -193 +194 @@
     case IOCTL_OSS32_VERSION:
         {
+          dprintf(("OSS32_VERSION\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -206 +208 @@
     case IOCTL_OSS32_GET_PCM_NUM:
         {
+          dprintf(("GET_PCM_NUM\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -219 +222 @@
 
     case IOCTL_OSS32_CARDS_NUM:
+        dprintf(("OSS32_CARDS_NUM\n"));
         if (rp->ioctl.usDataLen < sizeof(ULONG))
         {
@@ -231 +235 @@
     case IOCTL_OSS32_PCM_CAPS:
         {
+          dprintf(("OSS32_PCM_CAPS\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -244 +249 @@
     case IOCTL_OSS32_CARD_INFO:
         {
+          dprintf(("OSS32_CARD_INFO\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -257 +263 @@
     case IOCTL_OSS32_GET_POWER_STATE:
         {
+          dprintf(("OSS32_GET_POWER_STATE\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -270 +277 @@
     case IOCTL_OSS32_SET_POWER_STATE:
         {
+          dprintf(("OSS32_SET_POWER_STATE\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -283 +291 @@
     case IOCTL_OSS32_GET_CNTRLS_NUM:
         {
+          dprintf(("OSS32_GET_CNTRLS_NUM\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -298 +307 @@
     case IOCTL_OSS32_GET_CNTRLS:
         {
+          dprintf(("OSS32_GET_CNTRLS\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -311 +321 @@
     case IOCTL_OSS32_CNTRL_INFO:
         {
+          dprintf(("OSS32_CNTRL_INFO\n"));
 
             if (rp->ioctl.usDataLen < sizeof(ULONG))
@@ -336 +347 @@
     case IOCTL_OSS32_CNTRL_GET:
         {
+          dprintf(("OSS32_CNTRL_GET\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -360 +372 @@
     case IOCTL_OSS32_CNTRL_PUT:
         {
+          dprintf(("OSS32_CNTRL_PUT\n"));
 
             if (rp->ioctl.usDataLen < sizeof(ULONG)) {
@@ -383 +396 @@
     case IOCTL_OSS32_SET_PCM:
         {
+          dprintf(("OSS32_SET_PCM\n"));
 
             if (rp->ioctl.usParmLen < sizeof(ULONG))
@@ -399 +413 @@
     case IOCTL_OSS32_CNTRL_WAIT:
         {
+          dprintf(("OSS32_CNTRL_WAIT\n"));
             if (rp->ioctl.usDataLen < sizeof(ULONG))
             {
@@ -414 +429 @@
             pData = (ULONG *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_OPEN\n"));
             // close all pcms from uniaud16 first
             pcm->ret = OSS32_WaveOpen(pcm->deviceid, pcm->streamtype, pData,  pcm->pcm, rp->ioctl.usSysFileNum);
@@ -422 +439 @@
         {
             ULONG alsa_id = *((ULONG *)linParm);
+
+          dprintf(("OSS32_PCM_CLOSE\n"));
             OSS32_WaveClose(alsa_id);
         }
@@ -429 +448 @@
             char *pData1 = (char *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_READ\n"));
             pcm->ret = UniaudIoctlPCMRead(pcm->deviceid, pData1, pcm->size);
         }
@@ -436 +457 @@
             char *pData1 = (char *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_WRITE\n"));
             pcm->ret = UniaudIoctlPCMWrite(pcm->deviceid, pData1, pcm->size);
         }
@@ -442 +465 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_PAUSE\n"));
             pcm->ret = UniaudIoctlPCMResume(pcm->deviceid, 0);
         }
@@ -448 +473 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_RESUME\n"));
             pcm->ret = UniaudIoctlPCMResume(pcm->deviceid, 1);
         }
@@ -454 +481 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_START\n"));
             pcm->ret = UniaudIoctlPCMStart(pcm->deviceid);
         }
@@ -460 +489 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_DROP\n"));
             pcm->ret = UniaudIoctlPCMDrop(pcm->deviceid);
         }
@@ -469 +500 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_STATUS\n"));
             pcm->ret = UniaudIoctlPCMStatus(pcm->deviceid, pData1);
         }
@@ -476 +509 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_REFINEHWPARAMS\n"));
             pcm->ret = UniaudIoctlHWRefine(pcm->deviceid, pData1);
         }
@@ -483 +518 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_SETHWPARAMS\n"));
             pcm->ret = UniaudIoctlHWParamSet(pcm->deviceid, pData1);
         }
@@ -490 +527 @@
             void *pData1 = (void *)linData;
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_SETSWPARAMS\n"));
             pcm->ret = UniaudIoctlSWParamSet(pcm->deviceid, pData1);
         }
@@ -496 +535 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_PREPARE\n"));
             pcm->ret = UniaudIoctlPCMPrepare(pcm->deviceid);
         }
@@ -503 +544 @@
         {
             int unlock  = (int)*linParm;
+
+          dprintf(("OSS32_PCM_CLOSE_ALL\n"));
             if (unlock)
                 unlock_all = 1;
@@ -510 +553 @@
         break;
     case IOCTL_OSS32_PCM_CLOSE_16:
+          dprintf(("OSS32_PCM_CLOSE_16\n"));
         OSS32_CloseUNI16();
         break;
@@ -515 +559 @@
         {
             ioctl_pcm *pcm = (ioctl_pcm *)linParm;
+
+          dprintf(("OSS32_PCM_WAIT_INT\n"));
             pcm->ret =  WaitForPCMInterrupt((void*)pcm->deviceid, pcm->streamtype);
         }

GPL/branches/uniaud32-2.1.x/drv32/parse.c

@@ -240 +240 @@
         if(*pszOption == '2') {
             MAGIC_COMM_PORT = 0x2f8;
+        }
+        if(*pszOption == '4') {
+            MAGIC_COMM_PORT = 0x4000;
         }
         break;

GPL/branches/uniaud32-2.1.x/include/dbgos2.h

@@ -55 +55 @@
 #define dprintf2(a)     if(DebugLevel > 1) printk a
 #define dprintf3(a)     if(DebugLevel > 2) printk a
-#define DebugInt3()     ; //_asm int 3
+#define DebugInt3()     
 //#define DebInt3()     _asm int 3;
 #else

GPL/branches/uniaud32-2.1.x/include/linux/types.h

@@ -2 +2 @@
 #define _LINUX_TYPES_H
 
-#pragma off (unreferenced)
+//#pragma off (unreferenced)
 
 #include <linux/posix_types.h>

GPL/branches/uniaud32-2.1.x/lib32/fminstrload.c

@@ -103 +103 @@
 
     if(pHandle == NULL || pHandle->magic != MAGIC_MIDI_ALSA32) {
-        DebugInt3();
+        //DebugInt3();
         return OSSERR_INVALID_STREAMID;
     }

GPL/branches/uniaud32-2.1.x/lib32/ioctl.c

@@ -226 +226 @@
         WAVE_CAPS *wc;
         int i;
-        int sel_pcm = -1;
+        //int sel_pcm = -1;
         int max_ch = 0;
 
@@ -439 +439 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int ret;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -492 +493 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -545 +547 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         //dprintf(("GetUniaudCardInfo"));
@@ -600 +603 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControlNum"));
@@ -667 +671 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControls"));
@@ -756 +761 @@
 int GetUniaudControlInfo(ULONG deviceid, ULONG id, void *info)
 {
-        struct snd_ctl_elem_value *pElem = NULL;
+        //struct snd_ctl_elem_value *pElem = NULL;
         struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         //dprintf(("GetUniaudControlInfo"));
@@ -820 +826 @@
         //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         if(alsa_fops == NULL) {
@@ -878 +885 @@
         //struct snd_ctl_elem_info  *pElemInfo = NULL;
         mixerhandle *pHandle = NULL;
-        int              ret, i, j, sz;
+        int              ret, sz;
+        //int i, j;
 
         if(alsa_fops == NULL) {

GPL/branches/uniaud32-2.1.x/lib32/misc.c

@@ -205 +205 @@
 }
 //******************************************************************************
-static struct notifier_block *reboot_notify_list = NULL;
+//static struct notifier_block *reboot_notify_list = NULL;
 // No need to implement this right now. The ESS Maestro 3 driver uses it
 // to call pci_unregister_driver, which is always called from the shutdown

GPL/branches/uniaud32-2.1.x/lib32/sound.c

@@ -329 +329 @@
         ULONG                            format_mask;
         struct snd_mask                   *mask;
-        int max_ch;
+        //int max_ch;
 
         dprintf(("OSS32_QueryDevCaps"));
@@ -773 +773 @@
         ULONG                           periodbytes, minperiodbytes, maxperiodbytes;
         BOOL                            fTryAgain = FALSE;
-        ULONG ulMinRate, ulMaxRate;
+        //ULONG ulMinRate, ulMaxRate;
 
         if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
@@ -1063 +1063 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
         struct snd_pcm_status    status;
-        int                             iRet, align, iRet1;
+        int                             iRet;
+        //int align, iRet1;
         LONG                            ulTransferred;
-        ULONG                           ulPosition, ulI, ulJ, ulSize;
-        char                            *buf;
+        //ULONG                         ulPosition, ulI, ulJ;
+        ULONG ulSize;
+        //char                          *buf;
 
 //        return OSSERR_SUCCESS;
@@ -1109 +1111 @@
                         return OSSERR_BUFFER_FULL;
                 }
+                
+                //dprintf(("WaveAddBuffer: ReqSize=%x Size=%x", ulReqSize, ulSize));
 
                 //rprintf(("AddBuffer: state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));

GPL/branches/uniaud32-2.1.x/lib32/soundmidi.c

@@ -287 +287 @@
 {
     midihandle  *pHandle = (midihandle *)streamid;
-    int          ret;
+    //int          ret;
     LONG         transferred;
     struct snd_seq_event fmevent;

GPL/branches/uniaud32-2.1.x/lib32/soundmixer.c

@@ -346 +346 @@
 {
         mixerhandle *pHandle = (mixerhandle *)streamid;
-        int              ret;
+        //int            ret;
 
         if(pHandle == NULL || pHandle->magic != MAGIC_MIXER_ALSA32) {
@@ -364 +364 @@
         struct snd_ctl_elem_value *pElem = NULL;
         struct snd_ctl_elem_info  *pElemInfo;
-        int                               ret, idx, lVol, rVol = 0, idxMute, cnt;
+        int                               ret, idx, lVol, rVol = 0, idxMute;
+        //int cnt;
 
         //dprintf(("OSS32_MixSetVolume line=%d\n", line));
@@ -718 +719 @@
 {
         mixerhandle *pHandle = (mixerhandle *)streamid;
-        int              ret;
+        //int            ret;
 
         if(pHandle == NULL || pHandle->magic != MAGIC_MIXER_ALSA32) {
@@ -813 +814 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         if(alsa_fops == NULL)
@@ -870 +872 @@
 {
         mixerhandle *pHandle = NULL;
-        int              ret, i, j;
+        int              ret;
+        //int i, j;
 
         if(alsa_fops == NULL) {

GPL/branches/uniaud32-2.1.x/tools/header.mif

@@ -45 +45 @@
 
 !if "$(DEBUG)" == "1"
-CFLAGS = -dDEBUG -bt=os2v2 -e60 -hc -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
+CFLAGS = -dDEBUG -bt=os2v2 -hc -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
 CPPFLAGS= -xd
 ASFLAGS = -D:DEBUG -Mb -Li -Sv:M510
 !else
-CFLAGS = -bt=os2v2 -e60 -5r -omlinear -s -w4 -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
+CFLAGS = -bt=os2v2 -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
 CPPFLAGS= -xd
 ASFLAGS = -Mb -Li -Sv:M510