Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv28241/alsa-kernel/include
Modified Files:
hdsp.h sscape_ioctl.h version.h
Log Message:
- sync with the 2.6 tree (imajor, iminor)
- fixed firmware ioctls for sscape and hdsp drivers (ioctl out of range)
Index: hdsp.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/hdsp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hdsp.h 14 Jun 2003 07:56:01 -0000 1.2
+++ hdsp.h 25 Sep 2003 18:55:43 -0000 1.3
@@ -68,7 +68,7 @@
typedef struct _snd_hdsp_firmware hdsp_firmware_t;
struct _snd_hdsp_firmware {
- unsigned long firmware_data[24413];
+ unsigned long *firmware_data; /* 24413 long words */
};
#define SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE _IOW('H', 0x42, hdsp_firmware_t)
Index: sscape_ioctl.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/sscape_ioctl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sscape_ioctl.h 22 Sep 2002 08:46:12 -0000 1.1
+++ sscape_ioctl.h 25 Sep 2003 18:55:43 -0000 1.2
@@ -10,10 +10,10 @@
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
Index: version.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- version.h 28 Jul 2003 11:10:45 -0000 1.23
+++ version.h 25 Sep 2003 18:55:43 -0000 1.24
@@ -1,3 +1,3 @@
-/* include/version.h. Generated by configure. */
-#define CONFIG_SND_VERSION "0.9.6"
+/* include/version.h. Generated automatically by configure. */
+#define CONFIG_SND_VERSION "0.9.7"
#define CONFIG_SND_DATE ""
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
