Linux-2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 120 insertions, 0 deletions

diff --git a/sound/core/rawmidi_compat.c b/sound/core/rawmidi_compat.c
new file mode 100644
index 00000000000..d97631c3f3a
--- /dev/null
+++ b/sound/core/rawmidi_compat.c
@@ -0,0 +1,120 @@
+/*
+ *   32bit -> 64bit ioctl wrapper for raw MIDI API
+ *   Copyright (c) by Takashi Iwai <tiwai@suse.de>
+ *
+ *   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
+ *
+ */
+
+/* This file included from rawmidi.c */
+
+#include <linux/compat.h>
+
+struct sndrv_rawmidi_params32 {
+        s32 stream;
+        u32 buffer_size;
+        u32 avail_min;
+        unsigned int no_active_sensing; /* avoid bit-field */
+        unsigned char reserved[16];
+} __attribute__((packed));
+
+static int snd_rawmidi_ioctl_params_compat(snd_rawmidi_file_t *rfile,
+                                           struct sndrv_rawmidi_params32 __user *src)
+{
+        snd_rawmidi_params_t params;
+        unsigned int val;
+
+        if (rfile->output == NULL)
+                return -EINVAL;
+        if (get_user(params.stream, &src->stream) ||
+            get_user(params.buffer_size, &src->buffer_size) ||
+            get_user(params.avail_min, &src->avail_min) ||
+            get_user(val, &src->no_active_sensing))
+                return -EFAULT;
+        params.no_active_sensing = val;
+        switch (params.stream) {
+        case SNDRV_RAWMIDI_STREAM_OUTPUT:
+                return snd_rawmidi_output_params(rfile->output, &params);
+        case SNDRV_RAWMIDI_STREAM_INPUT:
+                return snd_rawmidi_input_params(rfile->input, &params);
+        }
+        return -EINVAL;
+}
+
+struct sndrv_rawmidi_status32 {
+        s32 stream;
+        struct compat_timespec tstamp;
+        u32 avail;
+        u32 xruns;
+        unsigned char reserved[16];
+} __attribute__((packed));
+
+static int snd_rawmidi_ioctl_status_compat(snd_rawmidi_file_t *rfile,
+                                           struct sndrv_rawmidi_status32 __user *src)
+{
+        int err;
+        snd_rawmidi_status_t status;
+
+        if (rfile->output == NULL)
+                return -EINVAL;
+        if (get_user(status.stream, &src->stream))
+                return -EFAULT;
+
+        switch (status.stream) {
+        case SNDRV_RAWMIDI_STREAM_OUTPUT:
+                err = snd_rawmidi_output_status(rfile->output, &status);
+                break;
+        case SNDRV_RAWMIDI_STREAM_INPUT:
+                err = snd_rawmidi_input_status(rfile->input, &status);
+                break;
+        default:
+                return -EINVAL;
+        }
+        if (err < 0)
+                return err;
+
+        if (put_user(status.tstamp.tv_sec, &src->tstamp.tv_sec) ||
+            put_user(status.tstamp.tv_nsec, &src->tstamp.tv_nsec) ||
+            put_user(status.avail, &src->avail) ||
+            put_user(status.xruns, &src->xruns))
+                return -EFAULT;
+
+        return 0;
+}
+
+enum {
+        SNDRV_RAWMIDI_IOCTL_PARAMS32 = _IOWR('W', 0x10, struct sndrv_rawmidi_params32),
+        SNDRV_RAWMIDI_IOCTL_STATUS32 = _IOWR('W', 0x20, struct sndrv_rawmidi_status32),
+};
+
+static long snd_rawmidi_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        snd_rawmidi_file_t *rfile;
+        void __user *argp = compat_ptr(arg);
+
+        rfile = file->private_data;
+        switch (cmd) {
+        case SNDRV_RAWMIDI_IOCTL_PVERSION:
+        case SNDRV_RAWMIDI_IOCTL_INFO:
+        case SNDRV_RAWMIDI_IOCTL_DROP:
+        case SNDRV_RAWMIDI_IOCTL_DRAIN:
+                return snd_rawmidi_ioctl(file, cmd, (unsigned long)argp);
+        case SNDRV_RAWMIDI_IOCTL_PARAMS32:
+                return snd_rawmidi_ioctl_params_compat(rfile, argp);
+        case SNDRV_RAWMIDI_IOCTL_STATUS32:
+                return snd_rawmidi_ioctl_status_compat(rfile, argp);
+        }
+        return -ENOIOCTLCMD;
+}