Changeset 535

Timestamp:

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

Author:

David Azarewicz

Message:

version string changes

Location:

GPL/trunk

Files:

• drv32/init.c (modified) (3 diffs)
• lib32/ossidc.cpp (modified) (1 diff)
• lib32/pci.c (modified) (1 diff)
• lib32/sound.c (modified) (2 diffs)
• uniaud.inc (modified) (1 diff)

GPL/trunk/drv32/init.c

@@ -48 +48 @@
 const char ERR_INIT[]    = "Initialization failed\r\r\n";
 const char ERR_NAMES[]    = "Query names failed\r\r\n";
+#ifdef DEBUG
+const char szALSA[]      = "\r\n"PRODUCT_NAME" v"UNIAUD_VERSION"-DEBUG\r\nBased on ALSA "ALSA_VERSION"\r\n";
+#else
 const char szALSA[]      = "\r\n"PRODUCT_NAME" v"UNIAUD_VERSION"\r\nBased on ALSA "ALSA_VERSION"\r\n";
+#endif
 
 //const char szCopyRight1[]= "Copyright 2000-2002 InnoTek Systemberatung GmbH\r\n";
@@ -224 +228 @@
     GetParms(args);
 
+#ifdef DEBUG
+        rprintf(("Uniaud32 version %s-DEBUG",UNIAUD_VERSION));
+#else
+        rprintf(("Uniaud32 version %s",UNIAUD_VERSION));
+#endif
+
     if(fVerbose) {
         WriteString(szALSA, sizeof(szALSA)-1);
@@ -229 +239 @@
         WriteString(szCopyRight2, sizeof(szCopyRight2)-1);
     }
+
 
     if(fDebug) {

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;
 }

GPL/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r530
+FIXPACK = SVNr535
 
 # ALSA BUILD VERSION