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

Commit c731bc96 authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: snd-usb: move code from urb.c to endpoint.c 



No code altered at this point, simply preparing for upcoming
refactorizations.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e8e8babf

sound/usb/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ snd-usb-audio-objs := card.o \ 
			pcm.o \

			proc.o \

			quirks.o \

			stream.o \

			urb.o

			stream.o



snd-usbmidi-lib-objs := midi.o

sound/usb/card.c

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#include "helper.h"

#include "debug.h"

#include "pcm.h"

#include "urb.h"

#include "format.h"

#include "power.h"

#include "stream.h"

sound/usb/endpoint.c

+948 −0

File changed.

Preview size limit exceeded, changes collapsed.

sound/usb/endpoint.h

+17 −0
Original line number Diff line number Diff line 
#ifndef __USBAUDIO_ENDPOINT_H

#define __USBAUDIO_ENDPOINT_H



void snd_usb_init_substream(struct snd_usb_stream *as,

			    int stream,

			    struct audioformat *fp);



int snd_usb_init_substream_urbs(struct snd_usb_substream *subs,

				unsigned int period_bytes,

				unsigned int rate,

				unsigned int frame_bits);



void snd_usb_release_substream_urbs(struct snd_usb_substream *subs, int force);



int snd_usb_substream_prepare(struct snd_usb_substream *subs,

			      struct snd_pcm_runtime *runtime);



int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substream, int cmd);

int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, int cmd);



#endif /* __USBAUDIO_ENDPOINT_H */

sound/usb/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "card.h"

#include "quirks.h"

#include "debug.h"

#include "urb.h"

#include "endpoint.h"

#include "helper.h"

#include "pcm.h"

#include "clock.h"