Context Navigation

include

Timestamp:

Oct 18, 2007, 6:38:12 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.6

Location:

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

Files:

-              r250
+              r262
 #define minor(x) MINOR(x)
 #endif
+#ifndef imajor
+#define imajor(x) major((x)->i_rdev)
+#endif
+#ifndef iminor
+#define iminor(x) minor((x)->i_rdev)
+#endif
 #ifndef mk_kdev
 #define mk_kdev(maj, min) MKDEV(maj, min)
 …
 #define need_resched() (current->need_resched)
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 4) && !defined TARGET_OS2
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 4) && !defined(WE_ARE_WOLK) && !defined TARGET_OS2
 #include <linux/fs.h>
 static inline struct proc_dir_entry *PDE(const struct inode *inode)

-              r250
+              r262
 };
-#ifndef PCI_OLD_SUSPEND
-#define PCI_OLD_SUSPEND
-#endif
 struct pci_driver {
         struct list_head node;

r250	r262
69	69
70	70	struct _snd_hdsp_firmware {
71		unsigned long ~~firmware_data[24413];~~
	71	unsigned long firmware_data; / 24413 long words */
72	72	};
73	73

-              r260
+              r262
         size_t period_bytes;                    /* requested period size */
         unsigned int periods;
         size_t buffer_bytes;                    /* requested period size */
+        size_t buffer_bytes;                    /* requested buffer size */
         size_t bytes;                           /* total # bytes processed */
         size_t mmap_bytes;
         char *buffer;                           /* vmallocated period */
         size_t buffer_used;                     /* used length from buffer */
+        size_t buffer_used;                     /* used length from period buffer */
         snd_pcm_plugin_t *plugin_first;
         snd_pcm_plugin_t *plugin_last;

-              r212
+              r262
 struct sscape_microcode
+{
   unsigned char code[65536];
+  unsigned char *code;  /* 65536 chars */
 };
 #define SND_SSCAPE_LOAD_BOOTB  _IOWR('P', 100, struct sscape_bootblock)
 #define SND_SSCAPE_LOAD_MCODE  _IOW('P', 101, struct sscape_microcode)
+#define SND_SSCAPE_LOAD_MCODE  _IOW ('P', 101, struct sscape_microcode)
 #endif

r260	r262
1		/* include/version.h. Generated by configure. */
2		#define CONFIG_SND_VERSION "0.9.6"
	1	/* include/version.h. Generated automatically by configure. */
	2	#define CONFIG_SND_VERSION "0.9.7"
3	3	#define CONFIG_SND_DATE ""

Note: See TracChangeset for help on using the changeset viewer.