p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: firewire-lib: rename 'amdtp' to 'amdtp-stream' to prepare for functional separation 

In later commit, data block processing layer will be newly added. This
layer will be named as 'amdtp-am824'.

This commit renames current amdtp file to amdtp-stream, to distinguish it
from the new layer.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2015-09-19 11:21:54 +09:00 committed by Takashi Iwai
parent 414ba022a5
commit d67c46b953
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/firewire/Makefile
View File

@ -1,5 +1,5 @@
snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \ snd-firewire-lib-objs := lib.o iso-resources.o packets-buffer.o \
fcp.o cmp.o amdtp.o fcp.o cmp.o amdtp-stream.o
snd-oxfw-objs := oxfw.o snd-oxfw-objs := oxfw.o
snd-isight-objs := isight.o snd-isight-objs := isight.o
snd-scs1x-objs := scs1x.o snd-scs1x-objs := scs1x.o

6
sound/firewire/amdtp.c → sound/firewire/amdtp-stream.c
View File

@ -15,7 +15,7 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/rawmidi.h> #include <sound/rawmidi.h>
#include "amdtp.h" #include "amdtp-stream.h"
#define TICKS_PER_CYCLE 3072 #define TICKS_PER_CYCLE 3072
#define CYCLES_PER_SECOND 8000 #define CYCLES_PER_SECOND 8000
@ -210,8 +210,8 @@ int amdtp_stream_set_parameters(struct amdtp_stream *s,
midi_channels = DIV_ROUND_UP(midi_ports, 8); midi_channels = DIV_ROUND_UP(midi_ports, 8);
if (WARN_ON(amdtp_stream_running(s)) | if (WARN_ON(amdtp_stream_running(s)) ||
WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) | WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) ||
WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI)) WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI))
return -EINVAL; return -EINVAL;

0
sound/firewire/amdtp.h → sound/firewire/amdtp-stream.h
View File

2
sound/firewire/bebob/bebob.h
View File

@ -31,7 +31,7 @@
#include "../fcp.h" #include "../fcp.h"
#include "../packets-buffer.h" #include "../packets-buffer.h"
#include "../iso-resources.h" #include "../iso-resources.h"
#include "../amdtp.h" #include "../amdtp-stream.h"
#include "../cmp.h" #include "../cmp.h"
/* basic register addresses on DM1000/DM1100/DM1500 */ /* basic register addresses on DM1000/DM1100/DM1500 */

2
sound/firewire/dice/dice.h
View File

@ -34,7 +34,7 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/rawmidi.h> #include <sound/rawmidi.h>
#include "../amdtp.h" #include "../amdtp-stream.h"
#include "../iso-resources.h" #include "../iso-resources.h"
#include "../lib.h" #include "../lib.h"
#include "dice-interface.h" #include "dice-interface.h"

2
sound/firewire/fcp.c
View File

@ -17,7 +17,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include "fcp.h" #include "fcp.h"
#include "lib.h" #include "lib.h"
#include "amdtp.h" #include "amdtp-stream.h"
#define CTS_AVC 0x00 #define CTS_AVC 0x00

2
sound/firewire/fireworks/fireworks.h
View File

@ -29,7 +29,7 @@
#include "../packets-buffer.h" #include "../packets-buffer.h"
#include "../iso-resources.h" #include "../iso-resources.h"
#include "../amdtp.h" #include "../amdtp-stream.h"
#include "../cmp.h" #include "../cmp.h"
#include "../lib.h" #include "../lib.h"

2
sound/firewire/oxfw/oxfw.h
View File

@ -28,7 +28,7 @@
#include "../fcp.h" #include "../fcp.h"
#include "../packets-buffer.h" #include "../packets-buffer.h"
#include "../iso-resources.h" #include "../iso-resources.h"
#include "../amdtp.h" #include "../amdtp-stream.h"
#include "../cmp.h" #include "../cmp.h"
struct device_info { struct device_info {