From 6416c48053147735c33e9fd0f2e770c9e3316b51 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 1 Apr 2009 19:05:39 +0200 Subject: [PATCH] --- yaml --- r: 143374 b: refs/heads/master c: 936e7d03394bc6238091db10d060326622c87ed7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/caiaq/Makefile | 4 ++-- trunk/sound/usb/caiaq/{caiaq-audio.c => audio.c} | 4 ++-- trunk/sound/usb/caiaq/{caiaq-audio.h => audio.h} | 0 trunk/sound/usb/caiaq/{caiaq-control.c => control.c} | 4 ++-- trunk/sound/usb/caiaq/{caiaq-control.h => control.h} | 0 trunk/sound/usb/caiaq/{caiaq-device.c => device.c} | 10 +++++----- trunk/sound/usb/caiaq/{caiaq-device.h => device.h} | 0 trunk/sound/usb/caiaq/{caiaq-input.c => input.c} | 5 +++-- trunk/sound/usb/caiaq/{caiaq-input.h => input.h} | 0 trunk/sound/usb/caiaq/{caiaq-midi.c => midi.c} | 4 ++-- trunk/sound/usb/caiaq/{caiaq-midi.h => midi.h} | 0 12 files changed, 17 insertions(+), 16 deletions(-) rename trunk/sound/usb/caiaq/{caiaq-audio.c => audio.c} (99%) rename trunk/sound/usb/caiaq/{caiaq-audio.h => audio.h} (100%) rename trunk/sound/usb/caiaq/{caiaq-control.c => control.c} (99%) rename trunk/sound/usb/caiaq/{caiaq-control.h => control.h} (100%) rename trunk/sound/usb/caiaq/{caiaq-device.c => device.c} (99%) rename trunk/sound/usb/caiaq/{caiaq-device.h => device.h} (100%) rename trunk/sound/usb/caiaq/{caiaq-input.c => input.c} (99%) rename trunk/sound/usb/caiaq/{caiaq-input.h => input.h} (100%) rename trunk/sound/usb/caiaq/{caiaq-midi.c => midi.c} (98%) rename trunk/sound/usb/caiaq/{caiaq-midi.h => midi.h} (100%) diff --git a/[refs] b/[refs] index 247f8eeb8403..ebf88068de5a 100644 --- 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 index 23dadd5a11cd..388999653aaa 100644 --- 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 b/trunk/sound/usb/caiaq/audio.c similarity index 99% rename from trunk/sound/usb/caiaq/caiaq-audio.c rename to trunk/sound/usb/caiaq/audio.c index cf3733110862..3f45c0fe61ab 100644 --- a/trunk/sound/usb/caiaq/caiaq-audio.c +++ b/trunk/sound/usb/caiaq/audio.c @@ -22,8 +22,8 @@ #include #include -#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 b/trunk/sound/usb/caiaq/audio.h similarity index 100% rename from trunk/sound/usb/caiaq/caiaq-audio.h rename to trunk/sound/usb/caiaq/audio.h diff --git a/trunk/sound/usb/caiaq/caiaq-control.c b/trunk/sound/usb/caiaq/control.c similarity index 99% rename from trunk/sound/usb/caiaq/caiaq-control.c rename to trunk/sound/usb/caiaq/control.c index bb21fcf0726e..537102ba6b9d 100644 --- a/trunk/sound/usb/caiaq/caiaq-control.c +++ b/trunk/sound/usb/caiaq/control.c @@ -23,8 +23,8 @@ #include #include -#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 b/trunk/sound/usb/caiaq/control.h similarity index 100% rename from trunk/sound/usb/caiaq/caiaq-control.h rename to trunk/sound/usb/caiaq/control.h diff --git a/trunk/sound/usb/caiaq/caiaq-device.c b/trunk/sound/usb/caiaq/device.c similarity index 99% rename from trunk/sound/usb/caiaq/caiaq-device.c rename to trunk/sound/usb/caiaq/device.c index 89f8b68058e1..6d517705da0e 100644 --- a/trunk/sound/usb/caiaq/caiaq-device.c +++ b/trunk/sound/usb/caiaq/device.c @@ -28,11 +28,11 @@ #include #include -#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 "); MODULE_DESCRIPTION("caiaq USB audio, version 1.3.13"); diff --git a/trunk/sound/usb/caiaq/caiaq-device.h b/trunk/sound/usb/caiaq/device.h similarity index 100% rename from trunk/sound/usb/caiaq/caiaq-device.h rename to trunk/sound/usb/caiaq/device.h diff --git a/trunk/sound/usb/caiaq/caiaq-input.c b/trunk/sound/usb/caiaq/input.c similarity index 99% rename from trunk/sound/usb/caiaq/caiaq-input.c rename to trunk/sound/usb/caiaq/input.c index 4451775f82e6..a48d309bd94c 100644 --- a/trunk/sound/usb/caiaq/caiaq-input.c +++ b/trunk/sound/usb/caiaq/input.c @@ -20,8 +20,9 @@ #include #include #include -#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 b/trunk/sound/usb/caiaq/input.h similarity index 100% rename from trunk/sound/usb/caiaq/caiaq-input.h rename to trunk/sound/usb/caiaq/input.h diff --git a/trunk/sound/usb/caiaq/caiaq-midi.c b/trunk/sound/usb/caiaq/midi.c similarity index 98% rename from trunk/sound/usb/caiaq/caiaq-midi.c rename to trunk/sound/usb/caiaq/midi.c index 79424c198912..8fa8cd88d763 100644 --- a/trunk/sound/usb/caiaq/caiaq-midi.c +++ b/trunk/sound/usb/caiaq/midi.c @@ -21,8 +21,8 @@ #include #include -#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 b/trunk/sound/usb/caiaq/midi.h similarity index 100% rename from trunk/sound/usb/caiaq/caiaq-midi.h rename to trunk/sound/usb/caiaq/midi.h