Changeset 535 for GPL/trunk/lib32

Timestamp:

Aug 8, 2010, 5:35:47 AM (15 years ago)

Author:

David Azarewicz

Message:

version string changes

Location:

GPL/trunk/lib32

Files:

• ossidc.cpp (modified) (1 diff)
• pci.c (modified) (1 diff)
• sound.c (modified) (2 diffs)

GPL/trunk/lib32/ossidc.cpp

@@ -113 +113 @@
                 return OSSERR_INIT_FAILED;
         }
-        rprintf(("\nUniaud version %s\n",UNIAUD_VERSION));
         dprintf(("OSS32_Initialize. Start address: %X", OffsetBeginCS32));
 

GPL/trunk/lib32/pci.c

@@ -511 +511 @@
 
                         RMInit();
-                        dprintf(("pci_register_driver: found=%x:%x searching for %x:%x\n",
-                                pcidev->vendor, pcidev->device, driver->id_table[iTableIx].vendor, driver->id_table[iTableIx].device));
+                        dprintf(("pci_register_driver: found=%x:%x searching for %x:%x with %s",
+                                pcidev->vendor, pcidev->device, driver->id_table[iTableIx].vendor, driver->id_table[iTableIx].device, driver->name));
 
                         if(driver->probe(pcidev, &driver->id_table[iTableIx]) == 0) {

GPL/trunk/lib32/sound.c

@@ -1322 +1322 @@
 OSSRET OSS32_WaveGetStatus(ULONG streamid, ULONG *pStatus)
 {
+        struct snd_pcm_status status;
         soundhandle        *pHandle = (soundhandle *)streamid;
-        struct snd_pcm_status    status;
         int                             ret;
 
@@ -1340 +1340 @@
         //Get the status of the stream
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
-
-        if(ret) {
-                DebugInt3();
-                return UNIXToOSSError(ret);
-        }
-
+        if(ret) return UNIXToOSSError(ret);
         *pStatus = status.state;
+
         return OSSERR_SUCCESS;
 }