ALSA: usx2y: Move UAPI definition into include/uapi/sound/usb_stream.h

The user-space API definition for usb_stream stuff should be moved
to include/uapi/sound to be exposed publicly.

While we're at it, add the missing ifdef guard for double inclusion,
too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/uapi/sound/usb_stream.h b/include/uapi/sound/usb_stream.h
new file mode 100644 (file)
index 0000000..cfe8fba
--- /dev/null
+++ b/include/uapi/sound/usb_stream.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2007, 2008 Karsten Wiese <fzu@wemgehoertderstaat.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _UAPI__SOUND_USB_STREAM_H
+#define _UAPI__SOUND_USB_STREAM_H
+
+#define USB_STREAM_INTERFACE_VERSION 2
+
+#define SNDRV_USB_STREAM_IOCTL_SET_PARAMS \
+       _IOW('H', 0x90, struct usb_stream_config)
+
+struct usb_stream_packet {
+       unsigned offset;
+       unsigned length;
+};
+
+
+struct usb_stream_config {
+       unsigned version;
+       unsigned sample_rate;
+       unsigned period_frames;
+       unsigned frame_size;
+};
+
+struct usb_stream {
+       struct usb_stream_config cfg;
+       unsigned read_size;
+       unsigned write_size;
+
+       int period_size;
+
+       unsigned state;
+
+       int idle_insize;
+       int idle_outsize;
+       int sync_packet;
+       unsigned insize_done;
+       unsigned periods_done;
+       unsigned periods_polled;
+
+       struct usb_stream_packet outpacket[2];
+       unsigned                 inpackets;
+       unsigned                 inpacket_head;
+       unsigned                 inpacket_split;
+       unsigned                 inpacket_split_at;
+       unsigned                 next_inpacket_split;
+       unsigned                 next_inpacket_split_at;
+       struct usb_stream_packet inpacket[0];
+};
+
+enum usb_stream_state {
+       usb_stream_invalid,
+       usb_stream_stopped,
+       usb_stream_sync0,
+       usb_stream_sync1,
+       usb_stream_ready,
+       usb_stream_running,
+       usb_stream_xrun,
+};
+
+#endif /* _UAPI__SOUND_USB_STREAM_H */

diff --git a/sound/usb/usx2y/usb_stream.h b/sound/usb/usx2y/usb_stream.h
index 4dd74ab1e9cce87093631ff64a6c52d44dfed134..90369001eab6612ba4cd1a0a774387042ccfd462 100644 (file)
--- a/sound/usb/usx2y/usb_stream.h
+++ b/sound/usb/usx2y/usb_stream.h
@@ -1,76 +1,7 @@
-/*
- * Copyright (C) 2007, 2008 Karsten Wiese <fzu@wemgehoertderstaat.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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+#ifndef __USB_STREAM_H
+#define __USB_STREAM_H
 
-#define USB_STREAM_INTERFACE_VERSION 2
-
-#define SNDRV_USB_STREAM_IOCTL_SET_PARAMS \
-       _IOW('H', 0x90, struct usb_stream_config)
-
-struct usb_stream_packet {
-       unsigned offset;
-       unsigned length;
-};
-
-
-struct usb_stream_config {
-       unsigned version;
-       unsigned sample_rate;
-       unsigned period_frames;
-       unsigned frame_size;
-};
-
-struct usb_stream {
-       struct usb_stream_config cfg;
-       unsigned read_size;
-       unsigned write_size;
-
-       int period_size;
-
-       unsigned state;
-
-       int idle_insize;
-       int idle_outsize;
-       int sync_packet;
-       unsigned insize_done;
-       unsigned periods_done;
-       unsigned periods_polled;
-
-       struct usb_stream_packet outpacket[2];
-       unsigned                 inpackets;
-       unsigned                 inpacket_head;
-       unsigned                 inpacket_split;
-       unsigned                 inpacket_split_at;
-       unsigned                 next_inpacket_split;
-       unsigned                 next_inpacket_split_at;
-       struct usb_stream_packet inpacket[0];
-};
-
-enum usb_stream_state {
-       usb_stream_invalid,
-       usb_stream_stopped,
-       usb_stream_sync0,
-       usb_stream_sync1,
-       usb_stream_ready,
-       usb_stream_running,
-       usb_stream_xrun,
-};
-
-#if __KERNEL__
+#include <uapi/sound/usb_stream.h>
 
 #define USB_STREAM_NURBS 4
 #define USB_STREAM_URBDEPTH 4
@@ -108,5 +39,4 @@ void usb_stream_free(struct usb_stream_kernel *);
 int usb_stream_start(struct usb_stream_kernel *);
 void usb_stream_stop(struct usb_stream_kernel *);
 
-
-#endif
+#endif /* __USB_STREAM_H */