---

yaml --- r: 143374 b: refs/heads/master c: 936e7d0 h: refs/heads/master v: v3
git-mirror · Apr 14, 2009 · 6416c48 · 6416c48
1 parent f99e947
commit 6416c48
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e431cf45687d1ccb7c7d818defc2af34bd783db2
+refs/heads/master: 936e7d03394bc6238091db10d060326622c87ed7
diff --git a/trunk/sound/usb/caiaq/Makefile b/trunk/sound/usb/caiaq/Makefile
@@ -1,4 +1,4 @@
-snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o
-snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o
+snd-usb-caiaq-y := device.o audio.o midi.o control.o
+snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += input.o
 
 obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o
diff --git a/trunk/sound/usb/caiaq/caiaq-audio.c → trunk/sound/usb/caiaq/audio.c b/trunk/sound/usb/caiaq/caiaq-audio.c → trunk/sound/usb/caiaq/audio.c
@@ -22,8 +22,8 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 
-#include "caiaq-device.h"
-#include "caiaq-audio.h"
+#include "device.h"
+#include "audio.h"
 
 #define N_URBS			32
 #define CLOCK_DRIFT_TOLERANCE	5

diff --git a/trunk/sound/usb/caiaq/caiaq-audio.h → trunk/sound/usb/caiaq/audio.h b/trunk/sound/usb/caiaq/caiaq-audio.h → trunk/sound/usb/caiaq/audio.h
diff --git a/trunk/sound/usb/caiaq/caiaq-control.c → trunk/sound/usb/caiaq/control.c b/trunk/sound/usb/caiaq/caiaq-control.c → trunk/sound/usb/caiaq/control.c
@@ -23,8 +23,8 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 
-#include "caiaq-device.h"
-#include "caiaq-control.h"
+#include "device.h"
+#include "control.h"
 
 #define CNT_INTVAL 0x10000
 

diff --git a/trunk/sound/usb/caiaq/caiaq-control.h → trunk/sound/usb/caiaq/control.h b/trunk/sound/usb/caiaq/caiaq-control.h → trunk/sound/usb/caiaq/control.h
diff --git a/trunk/sound/usb/caiaq/caiaq-device.c → trunk/sound/usb/caiaq/device.c b/trunk/sound/usb/caiaq/caiaq-device.c → trunk/sound/usb/caiaq/device.c
@@ -28,11 +28,11 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 
-#include "caiaq-device.h"
-#include "caiaq-audio.h"
-#include "caiaq-midi.h"
-#include "caiaq-control.h"
-#include "caiaq-input.h"
+#include "device.h"
+#include "audio.h"
+#include "midi.h"
+#include "control.h"
+#include "input.h"
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
 MODULE_DESCRIPTION("caiaq USB audio, version 1.3.13");

diff --git a/trunk/sound/usb/caiaq/caiaq-device.h → trunk/sound/usb/caiaq/device.h b/trunk/sound/usb/caiaq/caiaq-device.h → trunk/sound/usb/caiaq/device.h
diff --git a/trunk/sound/usb/caiaq/caiaq-input.c → trunk/sound/usb/caiaq/input.c b/trunk/sound/usb/caiaq/caiaq-input.c → trunk/sound/usb/caiaq/input.c
@@ -20,8 +20,9 @@
 #include <linux/usb.h>
 #include <linux/usb/input.h>
 #include <sound/pcm.h>
-#include "caiaq-device.h"
-#include "caiaq-input.h"
+
+#include "device.h"
+#include "input.h"
 
 static unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
 static unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

diff --git a/trunk/sound/usb/caiaq/caiaq-input.h → trunk/sound/usb/caiaq/input.h b/trunk/sound/usb/caiaq/caiaq-input.h → trunk/sound/usb/caiaq/input.h
diff --git a/trunk/sound/usb/caiaq/caiaq-midi.c → trunk/sound/usb/caiaq/midi.c b/trunk/sound/usb/caiaq/caiaq-midi.c → trunk/sound/usb/caiaq/midi.c
@@ -21,8 +21,8 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 
-#include "caiaq-device.h"
-#include "caiaq-midi.h"
+#include "device.h"
+#include "midi.h"
 
 static int snd_usb_caiaq_midi_input_open(struct snd_rawmidi_substream *substream)
 {

diff --git a/trunk/sound/usb/caiaq/caiaq-midi.h → trunk/sound/usb/caiaq/midi.h b/trunk/sound/usb/caiaq/caiaq-midi.h → trunk/sound/usb/caiaq/midi.h