#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/vmalloc.h>
#include <linux/time.h>
#include <linux/smp_lock.h>
#include <linux/string.h>
#include <sound/info.h>
#include <sound/version.h>
#include <linux/proc_fs.h>
-#include <linux/mutex.h>
+#include <linux/devfs_fs_kernel.h>
#include <stdarg.h>
/*
return 1;
}
-static DEFINE_MUTEX(info_mutex);
+static DECLARE_MUTEX(info_mutex);
struct snd_info_private_data {
struct snd_info_buffer *rbuffer;
static int snd_info_version_done(void);
-/* resize the proc r/w buffer */
-static int resize_info_buffer(struct snd_info_buffer *buffer,
- unsigned int nsize)
-{
- char *nbuf;
-
- nsize = PAGE_ALIGN(nsize);
- nbuf = kmalloc(nsize, GFP_KERNEL);
- if (! nbuf)
- return -ENOMEM;
-
- memcpy(nbuf, buffer->buffer, buffer->len);
- kfree(buffer->buffer);
- buffer->buffer = nbuf;
- buffer->len = nsize;
- return 0;
-}
-
/**
* snd_iprintf - printf on the procfs buffer
* @buffer: the procfs buffer
{
va_list args;
int len, res;
- int err = 0;
- might_sleep();
if (buffer->stop || buffer->error)
return 0;
len = buffer->len - buffer->size;
va_start(args, fmt);
- for (;;) {
- va_list ap;
- va_copy(ap, args);
- res = vsnprintf(buffer->buffer + buffer->curr, len, fmt, ap);
- va_end(ap);
- if (res < len)
- break;
- err = resize_info_buffer(buffer, buffer->len + PAGE_SIZE);
- if (err < 0)
- break;
- len = buffer->len - buffer->size;
- }
+ res = vsnprintf(buffer->curr, len, fmt, args);
va_end(args);
-
- if (err < 0)
- return err;
+ if (res >= len) {
+ buffer->stop = 1;
+ return 0;
+ }
buffer->curr += res;
buffer->size += res;
return res;
}
-EXPORT_SYMBOL(snd_iprintf);
-
/*
*/
-static struct proc_dir_entry *snd_proc_root;
-struct snd_info_entry *snd_seq_root;
-EXPORT_SYMBOL(snd_seq_root);
-
+static struct proc_dir_entry *snd_proc_root = NULL;
+struct snd_info_entry *snd_seq_root = NULL;
#ifdef CONFIG_SND_OSSEMUL
-struct snd_info_entry *snd_oss_root;
+struct snd_info_entry *snd_oss_root = NULL;
#endif
static inline void snd_info_entry_prepare(struct proc_dir_entry *de)
struct snd_info_private_data *data;
struct snd_info_entry *entry;
struct snd_info_buffer *buf;
- ssize_t size = 0;
+ size_t size = 0;
loff_t pos;
data = file->private_data;
buf = data->wbuffer;
if (buf == NULL)
return -EIO;
- mutex_lock(&entry->access);
- if (pos + count >= buf->len) {
- if (resize_info_buffer(buf, pos + count)) {
- mutex_unlock(&entry->access);
- return -ENOMEM;
- }
- }
- if (copy_from_user(buf->buffer + pos, buffer, count)) {
- mutex_unlock(&entry->access);
+ if (pos >= buf->len)
+ return -ENOMEM;
+ size = buf->len - pos;
+ size = min(count, size);
+ if (copy_from_user(buf->buffer + pos, buffer, size))
return -EFAULT;
- }
- buf->size = pos + count;
- mutex_unlock(&entry->access);
- size = count;
+ if ((long)buf->size < pos + size)
+ buf->size = pos + size;
break;
case SNDRV_INFO_CONTENT_DATA:
if (entry->c.ops->write)
struct proc_dir_entry *p;
int mode, err;
- mutex_lock(&info_mutex);
+ down(&info_mutex);
p = PDE(inode);
entry = p == NULL ? NULL : (struct snd_info_entry *)p->data;
if (entry == NULL || entry->disconnected) {
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
return -ENODEV;
}
if (!try_module_get(entry->module)) {
}
mode = file->f_flags & O_ACCMODE;
if (mode == O_RDONLY || mode == O_RDWR) {
- if ((entry->content == SNDRV_INFO_CONTENT_DATA &&
+ if ((entry->content == SNDRV_INFO_CONTENT_TEXT &&
+ !entry->c.text.read_size) ||
+ (entry->content == SNDRV_INFO_CONTENT_DATA &&
entry->c.ops->read == NULL)) {
err = -ENODEV;
goto __error;
}
}
if (mode == O_WRONLY || mode == O_RDWR) {
- if ((entry->content == SNDRV_INFO_CONTENT_DATA &&
+ if ((entry->content == SNDRV_INFO_CONTENT_TEXT &&
+ !entry->c.text.write_size) ||
+ (entry->content == SNDRV_INFO_CONTENT_DATA &&
entry->c.ops->write == NULL)) {
err = -ENODEV;
goto __error;
case SNDRV_INFO_CONTENT_TEXT:
if (mode == O_RDONLY || mode == O_RDWR) {
buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
- if (buffer == NULL)
- goto __nomem;
+ if (buffer == NULL) {
+ kfree(data);
+ err = -ENOMEM;
+ goto __error;
+ }
+ buffer->len = (entry->c.text.read_size +
+ (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
+ buffer->buffer = vmalloc(buffer->len);
+ if (buffer->buffer == NULL) {
+ kfree(buffer);
+ kfree(data);
+ err = -ENOMEM;
+ goto __error;
+ }
+ buffer->curr = buffer->buffer;
data->rbuffer = buffer;
- buffer->len = PAGE_SIZE;
- buffer->buffer = kmalloc(buffer->len, GFP_KERNEL);
- if (buffer->buffer == NULL)
- goto __nomem;
}
if (mode == O_WRONLY || mode == O_RDWR) {
buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
- if (buffer == NULL)
- goto __nomem;
+ if (buffer == NULL) {
+ if (mode == O_RDWR) {
+ vfree(data->rbuffer->buffer);
+ kfree(data->rbuffer);
+ }
+ kfree(data);
+ err = -ENOMEM;
+ goto __error;
+ }
+ buffer->len = (entry->c.text.write_size +
+ (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
+ buffer->buffer = vmalloc(buffer->len);
+ if (buffer->buffer == NULL) {
+ if (mode == O_RDWR) {
+ vfree(data->rbuffer->buffer);
+ kfree(data->rbuffer);
+ }
+ kfree(buffer);
+ kfree(data);
+ err = -ENOMEM;
+ goto __error;
+ }
+ buffer->curr = buffer->buffer;
data->wbuffer = buffer;
- buffer->len = PAGE_SIZE;
- buffer->buffer = kmalloc(buffer->len, GFP_KERNEL);
- if (buffer->buffer == NULL)
- goto __nomem;
}
break;
case SNDRV_INFO_CONTENT_DATA: /* data */
break;
}
file->private_data = data;
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
if (entry->content == SNDRV_INFO_CONTENT_TEXT &&
(mode == O_RDONLY || mode == O_RDWR)) {
if (entry->c.text.read) {
- mutex_lock(&entry->access);
+ down(&entry->access);
entry->c.text.read(entry, data->rbuffer);
- mutex_unlock(&entry->access);
+ up(&entry->access);
}
}
return 0;
- __nomem:
- if (data->rbuffer) {
- kfree(data->rbuffer->buffer);
- kfree(data->rbuffer);
- }
- if (data->wbuffer) {
- kfree(data->wbuffer->buffer);
- kfree(data->wbuffer);
- }
- kfree(data);
- err = -ENOMEM;
__error:
module_put(entry->module);
__error1:
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
return err;
}
entry = data->entry;
switch (entry->content) {
case SNDRV_INFO_CONTENT_TEXT:
- if (data->rbuffer) {
- kfree(data->rbuffer->buffer);
+ if (mode == O_RDONLY || mode == O_RDWR) {
+ vfree(data->rbuffer->buffer);
kfree(data->rbuffer);
}
- if (data->wbuffer) {
+ if (mode == O_WRONLY || mode == O_RDWR) {
if (entry->c.text.write) {
entry->c.text.write(entry, data->wbuffer);
if (data->wbuffer->error) {
data->wbuffer->error);
}
}
- kfree(data->wbuffer->buffer);
+ vfree(data->wbuffer->buffer);
kfree(data->wbuffer);
}
break;
if (len <= 0 || buffer->stop || buffer->error)
return 1;
while (--len > 0) {
- c = buffer->buffer[buffer->curr++];
+ c = *buffer->curr++;
if (c == '\n') {
- if (buffer->curr >= buffer->size)
+ if ((buffer->curr - buffer->buffer) >= (long)buffer->size) {
buffer->stop = 1;
+ }
break;
}
*line++ = c;
- if (buffer->curr >= buffer->size) {
+ if ((buffer->curr - buffer->buffer) >= (long)buffer->size) {
buffer->stop = 1;
break;
}
}
while (c != '\n' && !buffer->stop) {
- c = buffer->buffer[buffer->curr++];
- if (buffer->curr >= buffer->size)
+ c = *buffer->curr++;
+ if ((buffer->curr - buffer->buffer) >= (long)buffer->size) {
buffer->stop = 1;
+ }
}
*line = '\0';
return 0;
}
-EXPORT_SYMBOL(snd_info_get_line);
-
/**
* snd_info_get_str - parse a string token
* @dest: the buffer to store the string token
return src;
}
-EXPORT_SYMBOL(snd_info_get_str);
-
/**
* snd_info_create_entry - create an info entry
* @name: the proc file name
}
entry->mode = S_IFREG | S_IRUGO;
entry->content = SNDRV_INFO_CONTENT_TEXT;
- mutex_init(&entry->access);
+ init_MUTEX(&entry->access);
return entry;
}
return entry;
}
-EXPORT_SYMBOL(snd_info_create_module_entry);
-
/**
* snd_info_create_card_entry - create an info entry for the given card
* @card: the card instance
return entry;
}
-EXPORT_SYMBOL(snd_info_create_card_entry);
-
static int snd_info_dev_free_entry(struct snd_device *device)
{
struct snd_info_entry *entry = device->device_data;
return 0;
}
-EXPORT_SYMBOL(snd_card_proc_new);
-
/**
* snd_info_free_entry - release the info entry
* @entry: the info entry
kfree(entry);
}
-EXPORT_SYMBOL(snd_info_free_entry);
-
/**
* snd_info_register - register the info entry
* @entry: the info entry
snd_assert(entry != NULL, return -ENXIO);
root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
- mutex_lock(&info_mutex);
+ down(&info_mutex);
p = snd_create_proc_entry(entry->name, entry->mode, root);
if (!p) {
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
return -ENOMEM;
}
p->owner = entry->module;
p->size = entry->size;
p->data = entry;
entry->p = p;
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
return 0;
}
-EXPORT_SYMBOL(snd_info_register);
-
/**
* snd_info_unregister - de-register the info entry
* @entry: the info entry
snd_assert(entry->p != NULL, return -ENXIO);
root = entry->parent == NULL ? snd_proc_root : entry->parent->p;
snd_assert(root, return -ENXIO);
- mutex_lock(&info_mutex);
+ down(&info_mutex);
snd_remove_proc_entry(root, entry->p);
- mutex_unlock(&info_mutex);
+ up(&info_mutex);
snd_info_free_entry(entry);
return 0;
}
-EXPORT_SYMBOL(snd_info_unregister);
-
/*
*/
-static struct snd_info_entry *snd_info_version_entry;
+static struct snd_info_entry *snd_info_version_entry = NULL;
static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{
entry = snd_info_create_module_entry(THIS_MODULE, "version", NULL);
if (entry == NULL)
return -ENOMEM;
+ entry->c.text.read_size = 256;
entry->c.text.read = snd_info_version_read;
if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry);
git://git.onelab.eu / linux-2.6.git / blobdiff