Update of /cvsroot/alsa/alsa-driver/acore/seq/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv23829
Modified Files:
Makefile seq_oss.c
Log Message:
2.5 cleanups
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/seq/oss/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 17 Dec 2002 19:58:55 -0000 1.2
+++ Makefile 31 May 2003 11:13:02 -0000 1.3
@@ -3,7 +3,13 @@
include $(TOPDIR)/toplevel.config
include $(TOPDIR)/Makefile.conf
+EXTRA_CLEAN = seq_oss.c
+
TOPDIR = $(MAINSRCDIR)
include $(TOPDIR)/alsa-kernel/core/seq/oss/Makefile
+EXTRA_CFLAGS = -I$(TOPDIR)/alsa-kernel/core/seq/oss
+
include $(TOPDIR)/Rules.make
+
+seq_oss.c: seq_oss.patch $(TOPDIR)/alsa-kernel/core/seq/oss/seq_oss.c
Index: seq_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/seq/oss/seq_oss.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seq_oss.c 25 May 2002 10:25:37 -0000 1.2
+++ seq_oss.c 31 May 2003 11:13:02 -0000 1.3
@@ -1,2 +1,307 @@
-#include "../../../alsa-kernel/core/seq/oss/seq_oss.c"
+/*
+ * OSS compatible sequencer driver
+ *
+ * registration of device and proc
+ *
+ * Copyright (C) 1998,99 Takashi Iwai <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <sound/core.h>
+#include <sound/minors.h>
+#include <sound/initval.h>
+#include "seq_oss_device.h"
+#include "seq_oss_synth.h"
+
+/*
+ * module option
+ */
+MODULE_AUTHOR("Takashi Iwai <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("OSS-compatible sequencer module");
+MODULE_LICENSE("GPL");
+MODULE_CLASSES("{sound}");
+
+#ifdef SNDRV_SEQ_OSS_DEBUG
+MODULE_PARM(seq_oss_debug, "i");
+MODULE_PARM_DESC(seq_oss_debug, "debug option");
+int seq_oss_debug = 0;
+#endif
+
+
+/*
+ * prototypes
+ */
+static int register_device(void);
+static void unregister_device(void);
+static int register_proc(void);
+static void unregister_proc(void);
+
+static int odev_open(struct inode *inode, struct file *file);
+static int odev_release(struct inode *inode, struct file *file);
+static ssize_t odev_read(struct file *file, char *buf, size_t count, loff_t *offset);
+static ssize_t odev_write(struct file *file, const char *buf, size_t count, loff_t
*offset);
+static int odev_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg);
+static unsigned int odev_poll(struct file *file, poll_table * wait);
+#ifdef CONFIG_PROC_FS
+static void info_read(snd_info_entry_t *entry, snd_info_buffer_t *buf);
+#endif
+
+
+/*
+ * module interface
+ */
+
+static int __init alsa_seq_oss_init(void)
+{
+ int rc;
+ static snd_seq_dev_ops_t ops = {
+ snd_seq_oss_synth_register,
+ snd_seq_oss_synth_unregister,
+ };
+
+ if ((rc = register_device()) < 0)
+ return rc;
+ if ((rc = register_proc()) < 0) {
+ unregister_device();
+ return rc;
+ }
+ if ((rc = snd_seq_oss_create_client()) < 0) {
+ unregister_proc();
+ unregister_device();
+ return rc;
+ }
+
+ if ((rc = snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OSS, &ops,
+ sizeof(snd_seq_oss_reg_t))) < 0) {
+ snd_seq_oss_delete_client();
+ unregister_proc();
+ unregister_device();
+ return rc;
+ }
+
+ /* success */
+ snd_seq_oss_synth_init();
+ return 0;
+}
+
+static void __exit alsa_seq_oss_exit(void)
+{
+ snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_OSS);
+ snd_seq_oss_delete_client();
+ unregister_proc();
+ unregister_device();
+}
+
+module_init(alsa_seq_oss_init)
+module_exit(alsa_seq_oss_exit)
+
+/*
+ * ALSA minor device interface
+ */
+
+static DECLARE_MUTEX(register_mutex);
+
+static int
+odev_open(struct inode *inode, struct file *file)
+{
+ int level, rc;
+
+ if (minor(inode->i_rdev) == SNDRV_MINOR_OSS_MUSIC)
+ level = SNDRV_SEQ_OSS_MODE_MUSIC;
+ else
+ level = SNDRV_SEQ_OSS_MODE_SYNTH;
+
+ down(®ister_mutex);
+ rc = snd_seq_oss_open(file, level);
+ up(®ister_mutex);
+
+ return rc;
+}
+
+static int
+odev_release(struct inode *inode, struct file *file)
+{
+ seq_oss_devinfo_t *dp;
+
+ if ((dp = file->private_data) == NULL)
+ return 0;
+
+ snd_seq_oss_drain_write(dp);
+
+ down(®ister_mutex);
+ snd_seq_oss_release(dp);
+ up(®ister_mutex);
+
+ return 0;
+}
+
+static ssize_t
+odev_read(struct file *file, char *buf, size_t count, loff_t *offset)
+{
+ seq_oss_devinfo_t *dp;
+ dp = file->private_data;
+ snd_assert(dp != NULL, return -EIO);
+ return snd_seq_oss_read(dp, buf, count);
+}
+
+
+static ssize_t
+odev_write(struct file *file, const char *buf, size_t count, loff_t *offset)
+{
+ seq_oss_devinfo_t *dp;
+ dp = file->private_data;
+ snd_assert(dp != NULL, return -EIO);
+ return snd_seq_oss_write(dp, buf, count, file);
+}
+
+static int
+odev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long
arg)
+{
+ seq_oss_devinfo_t *dp;
+ dp = file->private_data;
+ snd_assert(dp != NULL, return -EIO);
+ return snd_seq_oss_ioctl(dp, cmd, arg);
+}
+
+
+static unsigned int
+odev_poll(struct file *file, poll_table * wait)
+{
+ seq_oss_devinfo_t *dp;
+ dp = file->private_data;
+ snd_assert(dp != NULL, return 0);
+ return snd_seq_oss_poll(dp, file, wait);
+}
+
+/*
+ * registration of sequencer minor device
+ */
+
+static struct file_operations seq_oss_f_ops =
+{
+#ifndef LINUX_2_2
+ .owner = THIS_MODULE,
+#endif
+ .read = odev_read,
+ .write = odev_write,
+ .open = odev_open,
+ .release = odev_release,
+ .poll = odev_poll,
+ .ioctl = odev_ioctl,
+};
+
+static snd_minor_t seq_oss_reg = {
+ .comment = "sequencer",
+ .f_ops = &seq_oss_f_ops,
+};
+
+static int __init
+register_device(void)
+{
+ int rc;
+
+ down(®ister_mutex);
+ if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER,
+ NULL, 0,
+ &seq_oss_reg,
+ SNDRV_SEQ_OSS_DEVNAME)) < 0) {
+ snd_printk(KERN_ERR "can't register device seq\n");
+ up(®ister_mutex);
+ return rc;
+ }
+ if ((rc = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC,
+ NULL, 0,
+ &seq_oss_reg,
+ SNDRV_SEQ_OSS_DEVNAME)) < 0) {
+ snd_printk(KERN_ERR "can't register device music\n");
+ snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0);
+ up(®ister_mutex);
+ return rc;
+ }
+ debug_printk(("device registered\n"));
+ up(®ister_mutex);
+ return 0;
+}
+
+static void
+unregister_device(void)
+{
+ down(®ister_mutex);
+ debug_printk(("device unregistered\n"));
+ if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MUSIC, NULL, 0) < 0)
+ snd_printk(KERN_ERR "error unregister device music\n");
+ if (snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_SEQUENCER, NULL, 0) < 0)
+ snd_printk(KERN_ERR "error unregister device seq\n");
+ up(®ister_mutex);
+}
+
+/*
+ * /proc interface
+ */
+
+#ifdef CONFIG_PROC_FS
+
+static snd_info_entry_t *info_entry;
+
+static void
+info_read(snd_info_entry_t *entry, snd_info_buffer_t *buf)
+{
+ down(®ister_mutex);
+ snd_iprintf(buf, "OSS sequencer emulation version %s\n",
SNDRV_SEQ_OSS_VERSION_STR);
+ snd_seq_oss_system_info_read(buf);
+ snd_seq_oss_synth_info_read(buf);
+ snd_seq_oss_midi_info_read(buf);
+ up(®ister_mutex);
+}
+
+#endif /* CONFIG_PROC_FS */
+
+static int __init
+register_proc(void)
+{
+#ifdef CONFIG_PROC_FS
+ snd_info_entry_t *entry;
+
+ entry = snd_info_create_module_entry(THIS_MODULE, SNDRV_SEQ_OSS_PROCNAME,
snd_seq_root);
+ if (entry == NULL)
+ return -ENOMEM;
+
+ entry->content = SNDRV_INFO_CONTENT_TEXT;
+ entry->private_data = NULL;
+ entry->c.text.read_size = 1024;
+ entry->c.text.read = info_read;
+ if (snd_info_register(entry) < 0) {
+ snd_info_free_entry(entry);
+ return -ENOMEM;
+ }
+ info_entry = entry;
+#endif
+ return 0;
+}
+
+static void
+unregister_proc(void)
+{
+#ifdef CONFIG_PROC_FS
+ if (info_entry)
+ snd_info_unregister(info_entry);
+ info_entry = NULL;
+#endif
+}
+
EXPORT_NO_SYMBOLS;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
