Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d67c46b9 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 414ba022

sound/firewire/Makefile

+1 −1
Original line number Diff line number Diff line 
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-isight-objs := isight.o

snd-scs1x-objs := scs1x.o

sound/firewire/amdtp.c→sound/firewire/amdtp-stream.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/rawmidi.h>

#include "amdtp.h"

#include "amdtp-stream.h"



#define TICKS_PER_CYCLE		3072

#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);



	if (WARN_ON(amdtp_stream_running(s)) |

	    WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) |

	if (WARN_ON(amdtp_stream_running(s)) ||

	    WARN_ON(pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM) ||

	    WARN_ON(midi_channels > AMDTP_MAX_CHANNELS_FOR_MIDI))

		return -EINVAL;

sound/firewire/amdtp.h→sound/firewire/amdtp-stream.h

+0 −0

File moved.

View file

sound/firewire/bebob/bebob.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "../fcp.h"

#include "../packets-buffer.h"

#include "../iso-resources.h"

#include "../amdtp.h"

#include "../amdtp-stream.h"

#include "../cmp.h"



/* basic register addresses on DM1000/DM1100/DM1500 */

sound/firewire/dice/dice.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <sound/pcm_params.h>

#include <sound/rawmidi.h>



#include "../amdtp.h"

#include "../amdtp-stream.h"

#include "../iso-resources.h"

#include "../lib.h"

#include "dice-interface.h"