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

Commit 18b5b3b5 authored Feb 02, 2012 by Jassi Brar Committed by Felipe Balbi Feb 15, 2012

usb: gadget: Rename audio function to uac1



The extant USB-Audio function driver complies to UAC_1 spec.
So name the files accordingly, paving way for inclusion of
a new UAC_2 specified driver.

Signed-off-by: Yadi Brar <yadi.brar01@gmail.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 6e4b74e4

drivers/usb/gadget/audio.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/utsname.h>		#include <linux/utsname.h>

	#include "u_audio.h"		#include "u_uac1.h"

	#define DRIVER_DESC "Linux USB Audio Gadget"		#define DRIVER_DESC "Linux USB Audio Gadget"
	#define DRIVER_VERSION "Dec 18, 2008"		#define DRIVER_VERSION "Dec 18, 2008"
	@@ -33,8 +33,8 @@
	#include "config.c"		#include "config.c"
	#include "epautoconf.c"		#include "epautoconf.c"

	#include "u_audio.c"		#include "u_uac1.c"
	#include "f_audio.c"		#include "f_uac1.c"

	/-------------------------------------------------------------------------/		/-------------------------------------------------------------------------/

drivers/usb/gadget/f_audio.c→drivers/usb/gadget/f_uac1.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	#include <linux/device.h>		#include <linux/device.h>
	#include <linux/atomic.h>		#include <linux/atomic.h>

	#include "u_audio.h"		#include "u_uac1.h"

	#define OUT_EP_MAX_PACKET_SIZE 200		#define OUT_EP_MAX_PACKET_SIZE 200
	static int req_buf_size = OUT_EP_MAX_PACKET_SIZE;		static int req_buf_size = OUT_EP_MAX_PACKET_SIZE;

drivers/usb/gadget/u_audio.c→drivers/usb/gadget/u_uac1.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* u_audio.c -- ALSA audio utilities for Gadget stack		* u_uac1.c -- ALSA audio utilities for Gadget stack
	*		*
	* Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>		* Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
	* Copyright (C) 2008 Analog Devices, Inc		* Copyright (C) 2008 Analog Devices, Inc
	@@ -17,7 +17,7 @@
	#include <linux/random.h>		#include <linux/random.h>
	#include <linux/syscalls.h>		#include <linux/syscalls.h>

	#include "u_audio.h"		#include "u_uac1.h"

	/*		/*
	* This component encapsulates the ALSA devices for USB audio gadget		* This component encapsulates the ALSA devices for USB audio gadget

drivers/usb/gadget/u_audio.h→drivers/usb/gadget/u_uac1.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* u_audio.h -- interface to USB gadget "ALSA AUDIO" utilities		* u_uac1.h -- interface to USB gadget "ALSA AUDIO" utilities
	*		*
	* Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>		* Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
	* Copyright (C) 2008 Analog Devices, Inc		* Copyright (C) 2008 Analog Devices, Inc