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

Commit 7301c8d3 authored by Jody McIntyre's avatar Jody McIntyre Committed by Jody McIntyre
Browse files

Remove amdtp, cmp drivers. 

Remove the Audio and Music Data Transmission Protocol driver and the
Connection Management Procedures driver.  These are incomplete, have never
worked, and are better implemented in userland via raw1394 (see
http://freebob.sourceforge.net/

 for example.)

Signed-off-by: default avatarJody McIntyre <scjody@steamballoon.com>
Cc: Adrian Bunk <bunk@stusta.de>
parent ef797546

Documentation/feature-removal-schedule.txt

+0 −11
Original line number Diff line number Diff line
@@ -40,17 +40,6 @@ Who: Paul E. McKenney <paulmck@us.ibm.com> 


---------------------------



What:	IEEE1394 Audio and Music Data Transmission Protocol driver,

	Connection Management Procedures driver

When:	November 2005

Files:	drivers/ieee1394/{amdtp,cmp}*

Why:	These are incomplete, have never worked, and are better implemented

	in userland via raw1394 (see http://freebob.sourceforge.net/ for

	example.)

Who:	Jody McIntyre <scjody@steamballoon.com>



---------------------------



What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN

When:	November 2005

Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is

drivers/ieee1394/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -169,27 +169,4 @@ config IEEE1394_RAWIO 
	  To compile this driver as a module, say M here: the

	  module will be called raw1394.



config IEEE1394_CMP

	tristate "IEC61883-1 Plug support"

	depends on IEEE1394

	help

	  This option enables the Connection Management Procedures

	  (IEC61883-1) driver, which implements input and output plugs.



	  To compile this driver as a module, say M here: the

	  module will be called cmp.



config IEEE1394_AMDTP

	tristate "IEC61883-6 (Audio transmission) support"

	depends on IEEE1394 && IEEE1394_OHCI1394 && IEEE1394_CMP

	help

	  This option enables the Audio & Music Data Transmission Protocol

	  (IEC61883-6) driver, which implements audio transmission over

	  IEEE1394.



	  The userspace interface is documented in amdtp.h.



	  To compile this driver as a module, say M here: the

	  module will be called amdtp.



endmenu

drivers/ieee1394/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ obj-$(CONFIG_IEEE1394_RAWIO) += raw1394.o 
obj-$(CONFIG_IEEE1394_SBP2) += sbp2.o

obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o

obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o

obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o

obj-$(CONFIG_IEEE1394_CMP) += cmp.o



quiet_cmd_oui2c = OUI2C   $@

      cmd_oui2c = $(CONFIG_SHELL) $(srctree)/$(src)/oui2c.sh < $< > $@

drivers/ieee1394/ieee1394-ioctl.h

+0 −8
Original line number Diff line number Diff line
@@ -7,14 +7,6 @@ 
#include <linux/ioctl.h>

#include <linux/types.h>





/* AMDTP Gets 6 */

#define AMDTP_IOC_CHANNEL	_IOW('#', 0x00, struct amdtp_ioctl)

#define AMDTP_IOC_PLUG		_IOW('#', 0x01, struct amdtp_ioctl)

#define AMDTP_IOC_PING		_IOW('#', 0x02, struct amdtp_ioctl)

#define AMDTP_IOC_ZAP		_IO ('#', 0x03)





/* DV1394 Gets 10 */



/* Get the driver ready to transmit video.  pass a struct dv1394_init* as

drivers/ieee1394/ohci1394.h

+2 −2
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ struct ti_ohci { 


	int self_id_errors;



	/* Tasklets for iso receive and transmit, used by video1394,

	 * amdtp and dv1394 */

	/* Tasklets for iso receive and transmit, used by video1394

	 * and dv1394 */



	struct list_head iso_tasklet_list;

	spinlock_t iso_tasklet_list_lock;