Changeset 92 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

May 2, 2007, 9:13:43 AM (19 years ago)

Author:

Brendan Oakley

Message:

Merged 0.9.0beta6 to 0.9.0beta12. Fixed a few compilation errors.
Left include/sound/driver.h at beta9 until I figure out why it contains
so many modifications to sections that were removed in beta10.
Does not yet build. Needs more fixing.
Added a few new files that were in the copy Paul gave me to work from.

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• driver.h (modified) (5 diffs)
• initval.h (modified) (5 diffs)
• pcm_params.h (modified) (3 diffs)
• version.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/driver.h

@@ -106 +106 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
 #include <linux/malloc.h>
+#else
+#include <linux/slab.h>
+#endif
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <linux/ioport.h>
@@ -136 +141 @@
 #endif
 #include "compat_22.h"
-#endif
+#endif /* LINUX_2_2 */
+
 #ifdef LINUX_2_3
 #include <linux/init.h>
@@ -166 +172 @@
 #define pci_alloc_consistent snd_pci_hack_alloc_consistent
 #endif /* i386 or ppc */
+#ifndef list_for_each_safe
+#define list_for_each_safe(pos, n, head) \
+        for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next)
+#endif
 #endif
 
@@ -180 +190 @@
 #endif
 
+#ifndef MODULE_LICENSE
+#define MODULE_LICENSE(license)
 #ifndef PCI_D0
 #define PCI_D0     0
@@ -227 +239 @@
 #define schedule_work(w) snd_compat_schedule_work(w)
 
-/* Name change */
+/* Typedef's */
 typedef struct timeval snd_timestamp_t;
 #ifndef TARGET_OS2

GPL/branches/alsa-resync1/alsa-kernel/include/sound/initval.h

@@ -1 @@
-#ifndef __INITVAL_H
-#define __INITVAL_H
+#ifndef __SOUND_INITVAL_H
+#define __SOUND_INITVAL_H
 
 /*
@@ -18 +18 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -73 +73 @@
 #define SNDRV_DEFAULT_ENABLE    { 1,1,1,1,1,1,1,1 }
 #define SNDRV_DEFAULT_ENABLE_PNP        SNDRV_DEFAULT_ENABLE
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
 #define SNDRV_DEFAULT_PORT      { REPEAT_SNDRV(-1) }
 #define SNDRV_DEFAULT_IRQ       { REPEAT_SNDRV(SNDRV_AUTO_IRQ) }
@@ -85 +86 @@
 #define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
 #define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
+#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
+#ifdef __ISAPNP__
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
+#else
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
+#endif
 #define SNDRV_DEFAULT_PORT      { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
 #define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
@@ -196 +203 @@
 #endif
 
-#endif                          /* __INITVAL_H */
+#endif /* __SOUND_INITVAL_H */

GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm_params.h

@@ -1 @@
-#ifndef __PCM_PARAMS_H
-#define __PCM_PARAMS_H
+#ifndef __SOUND_PCM_PARAMS_H
+#define __SOUND_PCM_PARAMS_H
 
 /*
@@ -19 +19 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -363 +363 @@
 #undef assert
 
-#endif
+#endif /* __SOUND_PCM_PARAMS_H */
+

GPL/branches/alsa-resync1/alsa-kernel/include/sound/version.h

@@ -2 +2 @@
  *  Configuration header file for compilation of the ALSA driver
  */
+#define CONFIG_SND_DATE "04-29-2007"
 
 #ifndef __ALSA_VERSION_H__