sound in 2.1.61-vger

David Woodhouse (dwmw2@cam.ac.uk)
Wed, 05 Nov 1997 02:09:25 +0000

This is a multipart MIME message.

--==_Exmh_-6949690900
Content-Type: text/plain; charset=us-ascii

There have been a number of patches which include sound fixes recently.
This one's against 2.1.61-vger; some of the others didn't patch cleanly
against it.

--==_Exmh_-6949690900
Content-Type: text/plain ; name="sound-vger-2.1.61-diff"; charset=us-ascii
Content-Description: sound-vger-2.1.61-diff
Content-Disposition: attachment; filename="sound-vger-2.1.61-diff"

--- linux/drivers/sound/soundcard.c.orig Fri Oct 24 00:54:17 1997
+++ linux/drivers/sound/soundcard.c Wed Nov 5 01:55:12 1997
@@ -64,10 +64,11 @@



-static long
-sound_read(struct inode *inode, struct file *file, char *buf, unsigned long count)
+static ssize_t
+sound_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
int dev;
+ struct inode *inode = file->f_dentry->d_inode;

dev = MINOR(inode->i_rdev);

@@ -76,10 +77,11 @@
return sound_read_sw(dev, &files[dev], buf, count);
}

-static long
-sound_write(struct inode *inode, struct file *file, const char *buf, unsigned long count)
+static ssize_t
+sound_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
{
int dev;
+ struct inode *inode = file->f_dentry->d_inode;

dev = MINOR(inode->i_rdev);

--- linux/drivers/sound/dmasound.c.orig Wed Nov 5 01:56:44 1997
+++ linux/drivers/sound/dmasound.c Wed Nov 5 02:00:00 1997
@@ -702,10 +702,10 @@
static void sound_release(struct inode *inode, struct file *file);
static long long sound_lseek(struct inode *inode, struct file *file,
long long offset, int orig);
-static long sound_read(struct inode *inode, struct file *file, char *buf,
- unsigned long count);
-static long sound_write(struct inode *inode, struct file *file,
- const char *buf, unsigned long count);
+static ssize_t sound_read(struct file *file, char *buf,
+ size_t count, loff_t *ppos);
+static ssize_t sound_write(struct file *file, const char *buf,
+ size_t count, loff_t *ppos);
static inline int
ioctl_return(int *addr, int value)
{
@@ -3458,10 +3458,10 @@
}


-static long
-sound_read(struct inode *inode, struct file *file, char *buf,
- unsigned long count)
+static ssize_t
+sound_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
+ strut inode *inode = file->f_dentry->d_inode;
int dev = MINOR(inode->i_rdev);

switch (dev & 0x0f)
@@ -3478,10 +3478,11 @@
}


-static long
-sound_write(struct inode *inode, struct file *file,
- const char *buf, unsigned long count)
+static ssize_t
+sound_write(struct file *file, const char *buf,
+ size_t count, loff_t *ppos)
{
+ struct inode *inode = file->f_dentry->d_inode;
int dev = MINOR(inode->i_rdev);

switch (dev & 0x0f)

--==_Exmh_-6949690900--