Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 47450
b: refs/heads/master
c: d471c0f
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 11, 2007
1 parent 4688183 commit d9c76f9
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 88 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b612e475e75f860002d88dd8440ce250506c5094
refs/heads/master: d471c0fca7eae1ffd4f7d4c11ee835ff70aaa71f
160 changes: 73 additions & 87 deletions trunk/arch/um/drivers/hostaudio_kern.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#include "os.h"

struct hostaudio_state {
int fd;
int fd;
};

struct hostmixer_state {
int fd;
int fd;
};

#define HOSTAUDIO_DEV_DSP "/dev/sound/dsp"
Expand Down Expand Up @@ -72,12 +72,12 @@ MODULE_PARM_DESC(mixer, MIXER_HELP);
static ssize_t hostaudio_read(struct file *file, char __user *buffer,
size_t count, loff_t *ppos)
{
struct hostaudio_state *state = file->private_data;
struct hostaudio_state *state = file->private_data;
void *kbuf;
int err;

#ifdef DEBUG
printk("hostaudio: read called, count = %d\n", count);
printk("hostaudio: read called, count = %d\n", count);
#endif

kbuf = kmalloc(count, GFP_KERNEL);
Expand All @@ -91,20 +91,20 @@ static ssize_t hostaudio_read(struct file *file, char __user *buffer,
if(copy_to_user(buffer, kbuf, err))
err = -EFAULT;

out:
out:
kfree(kbuf);
return(err);
}

static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos)
{
struct hostaudio_state *state = file->private_data;
struct hostaudio_state *state = file->private_data;
void *kbuf;
int err;

#ifdef DEBUG
printk("hostaudio: write called, count = %d\n", count);
printk("hostaudio: write called, count = %d\n", count);
#endif

kbuf = kmalloc(count, GFP_KERNEL);
Expand All @@ -128,24 +128,24 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
static unsigned int hostaudio_poll(struct file *file,
struct poll_table_struct *wait)
{
unsigned int mask = 0;
unsigned int mask = 0;

#ifdef DEBUG
printk("hostaudio: poll called (unimplemented)\n");
printk("hostaudio: poll called (unimplemented)\n");
#endif

return(mask);
return(mask);
}

static int hostaudio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct hostaudio_state *state = file->private_data;
struct hostaudio_state *state = file->private_data;
unsigned long data = 0;
int err;

#ifdef DEBUG
printk("hostaudio: ioctl called, cmd = %u\n", cmd);
printk("hostaudio: ioctl called, cmd = %u\n", cmd);
#endif
switch(cmd){
case SNDCTL_DSP_SPEED:
Expand Down Expand Up @@ -182,42 +182,40 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,

static int hostaudio_open(struct inode *inode, struct file *file)
{
struct hostaudio_state *state;
int r = 0, w = 0;
int ret;
struct hostaudio_state *state;
int r = 0, w = 0;
int ret;

#ifdef DEBUG
printk("hostaudio: open called (host: %s)\n", dsp);
printk("hostaudio: open called (host: %s)\n", dsp);
#endif

state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
if(state == NULL)
state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
if(state == NULL)
return(-ENOMEM);

if(file->f_mode & FMODE_READ) r = 1;
if(file->f_mode & FMODE_WRITE) w = 1;
if(file->f_mode & FMODE_READ) r = 1;
if(file->f_mode & FMODE_WRITE) w = 1;

ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
if(ret < 0){
if(ret < 0){
kfree(state);
return(ret);
}

}
state->fd = ret;
file->private_data = state;
return(0);
file->private_data = state;
return(0);
}

static int hostaudio_release(struct inode *inode, struct file *file)
{
struct hostaudio_state *state = file->private_data;
struct hostaudio_state *state = file->private_data;

#ifdef DEBUG
printk("hostaudio: release called\n");
printk("hostaudio: release called\n");
#endif

os_close_file(state->fd);
kfree(state);
os_close_file(state->fd);
kfree(state);

return(0);
}
Expand All @@ -227,79 +225,78 @@ static int hostaudio_release(struct inode *inode, struct file *file)
static int hostmixer_ioctl_mixdev(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct hostmixer_state *state = file->private_data;
struct hostmixer_state *state = file->private_data;

#ifdef DEBUG
printk("hostmixer: ioctl called\n");
printk("hostmixer: ioctl called\n");
#endif

return(os_ioctl_generic(state->fd, cmd, arg));
}

static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
{
struct hostmixer_state *state;
int r = 0, w = 0;
int ret;
struct hostmixer_state *state;
int r = 0, w = 0;
int ret;

#ifdef DEBUG
printk("hostmixer: open called (host: %s)\n", mixer);
printk("hostmixer: open called (host: %s)\n", mixer);
#endif

state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
if(state == NULL) return(-ENOMEM);
state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
if(state == NULL) return(-ENOMEM);

if(file->f_mode & FMODE_READ) r = 1;
if(file->f_mode & FMODE_WRITE) w = 1;
if(file->f_mode & FMODE_READ) r = 1;
if(file->f_mode & FMODE_WRITE) w = 1;

ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);

if(ret < 0){
if(ret < 0){
printk("hostaudio_open_mixdev failed to open '%s', err = %d\n",
dsp, -ret);
kfree(state);
return(ret);
}
}

file->private_data = state;
return(0);
file->private_data = state;
return(0);
}

static int hostmixer_release(struct inode *inode, struct file *file)
{
struct hostmixer_state *state = file->private_data;
struct hostmixer_state *state = file->private_data;

#ifdef DEBUG
printk("hostmixer: release called\n");
printk("hostmixer: release called\n");
#endif

os_close_file(state->fd);
kfree(state);
os_close_file(state->fd);
kfree(state);

return(0);
}


/* kernel module operations */

static const struct file_operations hostaudio_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = hostaudio_read,
.write = hostaudio_write,
.poll = hostaudio_poll,
.ioctl = hostaudio_ioctl,
.mmap = NULL,
.open = hostaudio_open,
.release = hostaudio_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = hostaudio_read,
.write = hostaudio_write,
.poll = hostaudio_poll,
.ioctl = hostaudio_ioctl,
.mmap = NULL,
.open = hostaudio_open,
.release = hostaudio_release,
};

static const struct file_operations hostmixer_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = hostmixer_ioctl_mixdev,
.open = hostmixer_open_mixdev,
.release = hostmixer_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.ioctl = hostmixer_ioctl_mixdev,
.open = hostmixer_open_mixdev,
.release = hostmixer_release,
};

struct {
Expand All @@ -313,42 +310,31 @@ MODULE_LICENSE("GPL");

static int __init hostaudio_init_module(void)
{
printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
dsp, mixer);

module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
if(module_data.dev_audio < 0){
printk(KERN_ERR "hostaudio: couldn't register DSP device!\n");
return -ENODEV;
}
if(module_data.dev_audio < 0){
printk(KERN_ERR "hostaudio: couldn't register DSP device!\n");
return -ENODEV;
}

module_data.dev_mixer = register_sound_mixer(&hostmixer_fops, -1);
if(module_data.dev_mixer < 0){
printk(KERN_ERR "hostmixer: couldn't register mixer "
if(module_data.dev_mixer < 0){
printk(KERN_ERR "hostmixer: couldn't register mixer "
"device!\n");
unregister_sound_dsp(module_data.dev_audio);
return -ENODEV;
}
unregister_sound_dsp(module_data.dev_audio);
return -ENODEV;
}

return 0;
return 0;
}

static void __exit hostaudio_cleanup_module (void)
{
unregister_sound_mixer(module_data.dev_mixer);
unregister_sound_dsp(module_data.dev_audio);
unregister_sound_mixer(module_data.dev_mixer);
unregister_sound_dsp(module_data.dev_audio);
}

module_init(hostaudio_init_module);
module_exit(hostaudio_cleanup_module);

/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/

0 comments on commit d9c76f9

Please sign in to comment.