Changeset 324

Timestamp:

03/25/08 04:46:42 (8 months ago)

Author:

psmedley

Message:

Tidy ups + bump version number

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/core/memalloc.c (modified) (3 diffs)
• alsa-kernel/include/sound/core.h (modified) (3 diffs)
• include/version.h (modified) (1 diff)
• lib32/sound.c (modified) (1 diff)
• uniaud.inc (modified) (1 diff)

GPL/branches/uniaud32-2.0/alsa-kernel/core/memalloc.c

@@ -89 +89 @@
 #ifdef CONFIG_SND_DEBUG
 #define __ASTRING__(x) #x
+#ifndef TARGET_OS2
 #define snd_assert(expr, args...) do {\
         if (!(expr)) {\
@@ -96 +97 @@
 } while (0)
 #else
-#ifndef TARGET_OS2
-#define snd_assert(expr, args...) /**/
-#else
 #define snd_assert(expr, retval) \
         if (!(expr)) {\
@@ -104 +102 @@
                 ##retval;\
         }
+#endif
+#else
+#ifndef TARGET_OS2
+#define snd_assert(expr, args...) /**/
+#else
+#define snd_assert(expr, retval) (void)(expr)
 #endif
 #endif

GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/core.h

@@ -415 +415 @@
  * not checked.
  */
+#ifndef TARGET_OS2
 #define snd_assert(expr, args...) do {                                  \
         if (unlikely(!(expr))) {                                        \
@@ -422 +423 @@
         }                                                               \
 } while (0)
-
-#define snd_BUG() do {                          \
-        snd_printk(KERN_ERR "BUG?\n");          \
-        dump_stack();                           \
-} while (0)
-
-#else /* !CONFIG_SND_DEBUG */
-
-#ifndef TARGET_OS2
-#define snd_printd(fmt, args...)        /* nothing */
-#define snd_assert(expr, args...)       (void)(expr)
-#else
-#define snd_printd snd_printk
+#else
 #define snd_assert(expr, retval) \
         if (!(expr)) {\
@@ -440 +429 @@
                 ##retval;\
         }
+#endif
+#define snd_BUG() do {                          \
+        snd_printk(KERN_ERR "BUG?\n");          \
+        dump_stack();                           \
+} while (0)
+
+#else /* !CONFIG_SND_DEBUG */
+
+#ifndef TARGET_OS2
+#define snd_printd(fmt, args...)        /* nothing */
+#define snd_assert(expr, args...)       (void)(expr)
+#else
+#define snd_printd snd_printk
+#define snd_assert(expr, retval)        (void)(expr)
 #endif
 #define snd_BUG()                       /* nothing */

GPL/branches/uniaud32-2.0/include/version.h

@@ -14 +14 @@
 #define VENDOR_NAME             "Netlabs"
 #define PRODUCT_TIMESTAMP       20080325L       // YYYYMMDD
-#define UNIAUD_VERSION          "1.9.0-"
+#define UNIAUD_VERSION          "1.9.1"
 #define ALSA_VERSION            "1.0.16"
  
  
-#define RM_VERSION              190
+#define RM_VERSION              191
 #define RM_DRIVER_NAME          "UNIAUD32.SYS"
 #define RM_DRIVER_DESCRIPTION   "OS/2 Universal Audio 32 Driver"

GPL/branches/uniaud32-2.0/lib32/sound.c

@@ -1061 +1061 @@
     ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
     if ( ((status.state != SNDRV_PCM_STATE_PREPARED) &&
+          (status.state != SNDRV_PCM_STATE_SETUP) &&
           (status.state != SNDRV_PCM_STATE_RUNNING) &&
           (status.state != SNDRV_PCM_STATE_DRAINING))) {

GPL/branches/uniaud32-2.0/uniaud.inc

@@ -7 +7 @@
 # BUILDVERSION must be 3 parts, and only numbers like 5.44.108
 # It is best that 2'nd number is always 2 digits, eg at least 10
-BUILDVERSION = 1.9.0
+BUILDVERSION = 1.9.1
 
 # Fixpack version