Update of /cvsroot/alsa/alsa-kernel/core/ioctl32
In directory sc8-pr-cvs1:/tmp/cvs-serv9757/core/ioctl32
Modified Files:
pcm32.c rawmidi32.c timer32.c
Log Message:
Sync with the 2.5 kernel tree
Index: pcm32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/pcm32.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pcm32.c 6 Feb 2003 17:59:15 -0000 1.13
+++ pcm32.c 6 Jun 2003 11:54:27 -0000 1.14
@@ -21,6 +21,7 @@
#include <sound/driver.h>
#include <linux/time.h>
#include <linux/slab.h>
+#include <linux/compat.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include "ioctl32.h"
@@ -136,15 +137,10 @@
COPY(step);\
}
-struct timeval32 {
- s32 tv_sec;
- s32 tv_usec;
-} __attribute__((packed));
-
struct sndrv_pcm_status32 {
s32 state;
- struct timeval32 trigger_tstamp;
- struct timeval32 tstamp;
+ struct compat_timespec trigger_tstamp;
+ struct compat_timespec tstamp;
u32 appl_ptr;
u32 hw_ptr;
s32 delay;
@@ -159,9 +155,9 @@
{\
COPY(state);\
COPY(trigger_tstamp.tv_sec);\
- COPY(trigger_tstamp.tv_usec);\
+ COPY(trigger_tstamp.tv_nsec);\
COPY(tstamp.tv_sec);\
- COPY(tstamp.tv_usec);\
+ COPY(tstamp.tv_nsec);\
COPY(appl_ptr);\
COPY(hw_ptr);\
COPY(delay);\
Index: rawmidi32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/rawmidi32.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rawmidi32.c 6 Feb 2003 17:59:15 -0000 1.6
+++ rawmidi32.c 6 Jun 2003 11:54:27 -0000 1.7
@@ -21,6 +21,7 @@
#include <sound/driver.h>
#include <linux/time.h>
#include <linux/fs.h>
+#include <linux/compat.h>
#include <sound/core.h>
#include <sound/rawmidi.h>
#include <asm/uaccess.h>
@@ -42,14 +43,9 @@
COPY(no_active_sensing);\
}
-struct timeval32 {
- s32 tv_sec;
- s32 tv_usec;
-} __attribute__((packed));
-
struct sndrv_rawmidi_status32 {
s32 stream;
- struct timeval32 tstamp;
+ struct compat_timespec tstamp;
u32 avail;
u32 xruns;
unsigned char reserved[16];
@@ -59,7 +55,7 @@
{\
COPY(stream);\
COPY(tstamp.tv_sec);\
- COPY(tstamp.tv_usec);\
+ COPY(tstamp.tv_nsec);\
COPY(avail);\
COPY(xruns);\
}
Index: timer32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/ioctl32/timer32.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- timer32.c 6 Feb 2003 17:59:16 -0000 1.6
+++ timer32.c 6 Jun 2003 11:54:27 -0000 1.7
@@ -21,6 +21,7 @@
#include <sound/driver.h>
#include <linux/time.h>
#include <linux/fs.h>
+#include <linux/compat.h>
#include <sound/core.h>
#include <sound/timer.h>
#include <asm/uaccess.h>
@@ -31,7 +32,7 @@
s32 card;
unsigned char id[64];
unsigned char name[80];
- u32 ticks;
+ u32 reserved0;
u32 resolution;
unsigned char reserved[64];
};
@@ -42,17 +43,11 @@
COPY(card);\
memcpy(dst->id, src->id, sizeof(src->id));\
memcpy(dst->name, src->name, sizeof(src->name));\
- COPY(ticks);\
COPY(resolution);\
}
-struct timeval32 {
- s32 tv_sec;
- s32 tv_usec;
-};
-
struct sndrv_timer_status32 {
- struct timeval32 tstamp;
+ struct compat_timespec tstamp;
u32 resolution;
u32 lost;
u32 overrun;
@@ -63,7 +58,7 @@
#define CVT_sndrv_timer_status()\
{\
COPY(tstamp.tv_sec);\
- COPY(tstamp.tv_usec);\
+ COPY(tstamp.tv_nsec);\
COPY(resolution);\
COPY(lost);\
COPY(overrun);\
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
