Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (40caf5ea) · Commits · e / devices / android_kernel_sony_msm8994

drivers/ieee1394/Kconfig

+21 −31

Original line number	Original line	Diff line number	Diff line
	# -- shell-script --

	menu "IEEE 1394 (FireWire) support"		menu "IEEE 1394 (FireWire) support"

	config IEEE1394		config IEEE1394
	tristate "IEEE 1394 (FireWire) support"		tristate "IEEE 1394 (FireWire) support"
	depends on PCI \|\| BROKEN		depends on PCI \|\| BROKEN
	select NET
	help		help
	IEEE 1394 describes a high performance serial bus, which is also		IEEE 1394 describes a high performance serial bus, which is also
	known as FireWire(tm) or i.Link(tm) and is used for connecting all		known as FireWire(tm) or i.Link(tm) and is used for connecting all
	@@ -35,24 +32,7 @@ config IEEE1394_VERBOSEDEBUG
	Say Y if you really want or need the debugging output, everyone		Say Y if you really want or need the debugging output, everyone
	else says N.		else says N.

	config IEEE1394_EXTRA_CONFIG_ROMS		comment "Controllers"
	bool "Build in extra config rom entries for certain functionality"
	depends on IEEE1394
	help
	Some IEEE1394 functionality depends on extra config rom entries
	being available in the host adapters CSR. These options will
	allow you to choose which ones.

	config IEEE1394_CONFIG_ROM_IP1394
	bool "IP-1394 Entry"
	depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394
	help
	Adds an entry for using IP-over-1394. If you want to use your
	IEEE1394 bus as a network for IP systems (including interacting
	with MacOSX and WinXP IP-over-1394), enable this option and the
	eth1394 option below.

	comment "Device Drivers"
	depends on IEEE1394		depends on IEEE1394

	comment "Texas Instruments PCILynx requires I2C"		comment "Texas Instruments PCILynx requires I2C"
	@@ -70,6 +50,10 @@ config IEEE1394_PCILYNX
	To compile this driver as a module, say M here: the		To compile this driver as a module, say M here: the
	module will be called pcilynx.		module will be called pcilynx.

			Only some old and now very rare PCI and CardBus cards and
			PowerMacs G3 B&W contain the PCILynx controller. Therefore
			almost everybody can say N here.

	config IEEE1394_OHCI1394		config IEEE1394_OHCI1394
	tristate "OHCI-1394 support"		tristate "OHCI-1394 support"
	depends on PCI && IEEE1394		depends on PCI && IEEE1394
	@@ -83,7 +67,7 @@ config IEEE1394_OHCI1394
	To compile this driver as a module, say M here: the		To compile this driver as a module, say M here: the
	module will be called ohci1394.		module will be called ohci1394.

	comment "Protocol Drivers"		comment "Protocols"
	depends on IEEE1394		depends on IEEE1394

	config IEEE1394_VIDEO1394		config IEEE1394_VIDEO1394
	@@ -121,11 +105,15 @@ config IEEE1394_SBP2_PHYS_DMA
	This option is buggy and currently broken on some architectures.		This option is buggy and currently broken on some architectures.
	If unsure, say N.		If unsure, say N.

			config IEEE1394_ETH1394_ROM_ENTRY
			depends on IEEE1394
			bool
			default n

	config IEEE1394_ETH1394		config IEEE1394_ETH1394
	tristate "Ethernet over 1394"		tristate "IP over 1394"
	depends on IEEE1394 && EXPERIMENTAL && INET		depends on IEEE1394 && EXPERIMENTAL && INET
	select IEEE1394_CONFIG_ROM_IP1394		select IEEE1394_ETH1394_ROM_ENTRY
	select IEEE1394_EXTRA_CONFIG_ROMS
	help		help
	This driver implements a functional majority of RFC 2734: IPv4 over		This driver implements a functional majority of RFC 2734: IPv4 over
	1394. It will provide IP connectivity with implementations of RFC		1394. It will provide IP connectivity with implementations of RFC
	@@ -134,6 +122,8 @@ config IEEE1394_ETH1394
	This driver is still considered experimental. It does not yet support		This driver is still considered experimental. It does not yet support
	MCAP, therefore multicast support is significantly limited.		MCAP, therefore multicast support is significantly limited.

			The module is called eth1394 although it does not emulate Ethernet.

	config IEEE1394_DV1394		config IEEE1394_DV1394
	tristate "OHCI-DV I/O support (deprecated)"		tristate "OHCI-DV I/O support (deprecated)"
	depends on IEEE1394 && IEEE1394_OHCI1394		depends on IEEE1394 && IEEE1394_OHCI1394
	@@ -146,12 +136,12 @@ config IEEE1394_RAWIO
	tristate "Raw IEEE1394 I/O support"		tristate "Raw IEEE1394 I/O support"
	depends on IEEE1394		depends on IEEE1394
	help		help
	Say Y here if you want support for the raw device. This is generally		This option adds support for the raw1394 device file which enables
	a good idea, so you should say Y here. The raw device enables		direct communication of user programs with the IEEE 1394 bus and thus
	direct communication of user programs with the IEEE 1394 bus and		with the attached peripherals. Almost all application programs which
	thus with the attached peripherals.		access FireWire require this option.

	To compile this driver as a module, say M here: the		To compile this driver as a module, say M here: the module will be
	module will be called raw1394.		called raw1394.

	endmenu		endmenu

drivers/ieee1394/config_roms.c

+26 −67

Original line number	Original line	Diff line number	Diff line
	@@ -26,12 +26,6 @@ struct hpsb_config_rom_entry {
	/* Base initialization, called at module load */		/* Base initialization, called at module load */
	int (*init)(void);		int (*init)(void);

	/* Add entry to specified host */
	int (add)(struct hpsb_host host);

	/* Remove entry from specified host */
	void (remove)(struct hpsb_host host);

	/* Cleanup called at module exit */		/* Cleanup called at module exit */
	void (*cleanup)(void);		void (*cleanup)(void);

	@@ -39,7 +33,7 @@ struct hpsb_config_rom_entry {
	unsigned int flag;		unsigned int flag;
	};		};

			/* The default host entry. This must succeed. */
	int hpsb_default_host_entry(struct hpsb_host *host)		int hpsb_default_host_entry(struct hpsb_host *host)
	{		{
	struct csr1212_keyval *root;		struct csr1212_keyval *root;
	@@ -63,9 +57,9 @@ int hpsb_default_host_entry(struct hpsb_host *host)
	return -ENOMEM;		return -ENOMEM;
	}		}

	ret = csr1212_associate_keyval(vend_id, text);		csr1212_associate_keyval(vend_id, text);
	csr1212_release_keyval(text);		csr1212_release_keyval(text);
	ret \|= csr1212_attach_keyval_to_directory(root, vend_id);		ret = csr1212_attach_keyval_to_directory(root, vend_id);
	csr1212_release_keyval(vend_id);		csr1212_release_keyval(vend_id);
	if (ret != CSR1212_SUCCESS) {		if (ret != CSR1212_SUCCESS) {
	csr1212_destroy_csr(host->csr.rom);		csr1212_destroy_csr(host->csr.rom);
	@@ -78,7 +72,7 @@ int hpsb_default_host_entry(struct hpsb_host *host)
	}		}


	#ifdef CONFIG_IEEE1394_CONFIG_ROM_IP1394		#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
	#include "eth1394.h"		#include "eth1394.h"

	static struct csr1212_keyval *ip1394_ud;		static struct csr1212_keyval *ip1394_ud;
	@@ -103,10 +97,12 @@ static int config_rom_ip1394_init(void)
	if (!ip1394_ud \|\| !spec_id \|\| !spec_desc \|\| !ver \|\| !ver_desc)		if (!ip1394_ud \|\| !spec_id \|\| !spec_desc \|\| !ver \|\| !ver_desc)
	goto ip1394_fail;		goto ip1394_fail;

	if (csr1212_associate_keyval(spec_id, spec_desc) == CSR1212_SUCCESS &&		csr1212_associate_keyval(spec_id, spec_desc);
	csr1212_associate_keyval(ver, ver_desc) == CSR1212_SUCCESS &&		csr1212_associate_keyval(ver, ver_desc);
	csr1212_attach_keyval_to_directory(ip1394_ud, spec_id) == CSR1212_SUCCESS &&		if (csr1212_attach_keyval_to_directory(ip1394_ud, spec_id)
	csr1212_attach_keyval_to_directory(ip1394_ud, ver) == CSR1212_SUCCESS)		== CSR1212_SUCCESS &&
			csr1212_attach_keyval_to_directory(ip1394_ud, ver)
			== CSR1212_SUCCESS)
	ret = 0;		ret = 0;

	ip1394_fail:		ip1394_fail:
	@@ -135,7 +131,7 @@ static void config_rom_ip1394_cleanup(void)
	}		}
	}		}

	static int config_rom_ip1394_add(struct hpsb_host *host)		int hpsb_config_rom_ip1394_add(struct hpsb_host *host)
	{		{
	if (!ip1394_ud)		if (!ip1394_ud)
	return -ENODEV;		return -ENODEV;
	@@ -144,92 +140,55 @@ static int config_rom_ip1394_add(struct hpsb_host *host)
	ip1394_ud) != CSR1212_SUCCESS)		ip1394_ud) != CSR1212_SUCCESS)
	return -ENOMEM;		return -ENOMEM;

			host->config_roms \|= HPSB_CONFIG_ROM_ENTRY_IP1394;
			host->update_config_rom = 1;
	return 0;		return 0;
	}		}
			EXPORT_SYMBOL_GPL(hpsb_config_rom_ip1394_add);

	static void config_rom_ip1394_remove(struct hpsb_host *host)		void hpsb_config_rom_ip1394_remove(struct hpsb_host *host)
	{		{
	csr1212_detach_keyval_from_directory(host->csr.rom->root_kv, ip1394_ud);		csr1212_detach_keyval_from_directory(host->csr.rom->root_kv, ip1394_ud);
			host->config_roms &= ~HPSB_CONFIG_ROM_ENTRY_IP1394;
			host->update_config_rom = 1;
	}		}
			EXPORT_SYMBOL_GPL(hpsb_config_rom_ip1394_remove);

	static struct hpsb_config_rom_entry ip1394_entry = {		static struct hpsb_config_rom_entry ip1394_entry = {
	.name = "ip1394",		.name = "ip1394",
	.init = config_rom_ip1394_init,		.init = config_rom_ip1394_init,
	.add = config_rom_ip1394_add,
	.remove = config_rom_ip1394_remove,
	.cleanup = config_rom_ip1394_cleanup,		.cleanup = config_rom_ip1394_cleanup,
	.flag = HPSB_CONFIG_ROM_ENTRY_IP1394,		.flag = HPSB_CONFIG_ROM_ENTRY_IP1394,
	};		};
	#endif /* CONFIG_IEEE1394_CONFIG_ROM_IP1394 */

			#endif /* CONFIG_IEEE1394_ETH1394_ROM_ENTRY */

	static struct hpsb_config_rom_entry *const config_rom_entries[] = {		static struct hpsb_config_rom_entry *const config_rom_entries[] = {
	#ifdef CONFIG_IEEE1394_CONFIG_ROM_IP1394		#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
	&ip1394_entry,		&ip1394_entry,
	#endif		#endif
	NULL,
	};		};

			/* Initialize all config roms */
	int hpsb_init_config_roms(void)		int hpsb_init_config_roms(void)
	{		{
	int i, error = 0;		int i, error = 0;

	for (i = 0; config_rom_entries[i]; i++) {		for (i = 0; i < ARRAY_SIZE(config_rom_entries); i++)
	if (!config_rom_entries[i]->init)
	continue;

	if (config_rom_entries[i]->init()) {		if (config_rom_entries[i]->init()) {
	HPSB_ERR("Failed to initialize config rom entry `%s'",		HPSB_ERR("Failed to initialize config rom entry `%s'",
	config_rom_entries[i]->name);		config_rom_entries[i]->name);
	error = -1;		error = -1;
	} else
	HPSB_DEBUG("Initialized config rom entry `%s'",
	config_rom_entries[i]->name);
	}		}

	return error;		return error;
	}		}

			/* Cleanup all config roms */
	void hpsb_cleanup_config_roms(void)		void hpsb_cleanup_config_roms(void)
	{		{
	int i;		int i;

	for (i = 0; config_rom_entries[i]; i++) {		for (i = 0; i < ARRAY_SIZE(config_rom_entries); i++)
	if (config_rom_entries[i]->cleanup)
	config_rom_entries[i]->cleanup();		config_rom_entries[i]->cleanup();
	}		}
	}

	int hpsb_add_extra_config_roms(struct hpsb_host *host)
	{
	int i, error = 0;

	for (i = 0; config_rom_entries[i]; i++) {
	if (config_rom_entries[i]->add(host)) {
	HPSB_ERR("fw-host%d: Failed to attach config rom entry `%s'",
	host->id, config_rom_entries[i]->name);
	error = -1;
	} else {
	host->config_roms \|= config_rom_entries[i]->flag;
	host->update_config_rom = 1;
	}
	}

	return error;
	}

	void hpsb_remove_extra_config_roms(struct hpsb_host *host)
	{
	int i;

	for (i = 0; config_rom_entries[i]; i++) {
	if (!(host->config_roms & config_rom_entries[i]->flag))
	continue;

	config_rom_entries[i]->remove(host);

	host->config_roms &= ~config_rom_entries[i]->flag;
	host->update_config_rom = 1;
	}
	}

drivers/ieee1394/config_roms.h

+6 −14

Original line number	Original line	Diff line number	Diff line
	#ifndef _IEEE1394_CONFIG_ROMS_H		#ifndef _IEEE1394_CONFIG_ROMS_H
	#define _IEEE1394_CONFIG_ROMS_H		#define _IEEE1394_CONFIG_ROMS_H

	#include "ieee1394_types.h"		struct hpsb_host;
	#include "hosts.h"

	/* The default host entry. This must succeed. */
	int hpsb_default_host_entry(struct hpsb_host *host);		int hpsb_default_host_entry(struct hpsb_host *host);

	/* Initialize all config roms */
	int hpsb_init_config_roms(void);		int hpsb_init_config_roms(void);

	/* Cleanup all config roms */
	void hpsb_cleanup_config_roms(void);		void hpsb_cleanup_config_roms(void);

	/* Add extra config roms to specified host */
	int hpsb_add_extra_config_roms(struct hpsb_host *host);

	/* Remove extra config roms from specified host */
	void hpsb_remove_extra_config_roms(struct hpsb_host *host);


	/* List of flags to check if a host contains a certain extra config rom		/* List of flags to check if a host contains a certain extra config rom
	* entry. Available in the host->config_roms member. */		* entry. Available in the host->config_roms member. */
	#define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001		#define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001

			#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
			int hpsb_config_rom_ip1394_add(struct hpsb_host *host);
			void hpsb_config_rom_ip1394_remove(struct hpsb_host *host);
			#endif

	#endif /* _IEEE1394_CONFIG_ROMS_H */		#endif /* _IEEE1394_CONFIG_ROMS_H */

drivers/ieee1394/csr1212.c

+352 −518

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ieee1394/csr1212.h

+71 −412

File changed.

Preview size limit exceeded, changes collapsed.