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

Commit 64106104 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: fix host device registering when nodemgr disabled
  ieee1394: video1394: DMA fix
  ieee1394: raw1394: prevent unloading of low-level driver
  ieee1394: dv1394: tidy up card removal
  ieee1394: dv1394: fix CardBus card ejection
  ieee1394: sbp2: lower block queue alignment requirement
  ieee1394: sbp2: remove bogus "emulated" host flag
  ieee1394: save one word in struct hpsb_host
  ieee1394: restore config ROM when resuming
  ieee1394: ohci1394: drop pcmcia-cs compatibility code
  ieee1394: nodemgr: check info_length in ROM header earlier
  the scheduled IEEE1394_OUI_DB removal
  the scheduled IEEE1394_EXPORT_FULL_API removal
  ieee1394: sbp2: use a better wildcard for blacklist
  Add PCI class ID for firewire OHCI controllers.
  ieee1394: modified csr1212_key_id_type_map to support lisight
parents beda9f3a 91efa462

Documentation/feature-removal-schedule.txt

+0 −16
Original line number Original line Diff line number Diff line
@@ -50,22 +50,6 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de> 




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

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





What:	ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API)

When:	January 2007

Why:	There are no projects known to use these exported symbols, except

	dfg1394 (uses one symbol whose functionality is core-internal now).

Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>



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



What:	ieee1394's *_oui sysfs attributes (CONFIG_IEEE1394_OUI_DB)

When:	January 2007

Files:	drivers/ieee1394/: oui.db, oui2c.sh

Why:	big size, little value

Who:	Stefan Richter <stefanr@s5r6.in-berlin.de>



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



What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.

What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.

When:	December 2006

When:	December 2006

Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6

Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6

drivers/ieee1394/.gitignore

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line 
oui.c

drivers/ieee1394/Kconfig

+0 −21
Original line number Original line Diff line number Diff line
@@ -35,20 +35,6 @@ 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_OUI_DB

	bool "OUI Database built-in (deprecated)"

	depends on IEEE1394

	help

	  If you say Y here, then an OUI list (vendor unique ID's) will be

	  compiled into the ieee1394 module. This doesn't really do much

	  except being able to display the vendor of a hardware node. The

	  downside is that it adds about 300k to the size of the module,

	  or kernel (depending on whether you compile ieee1394 as a

	  module, or static in the kernel).



	  This option is not needed for userspace programs like gscanbus

	  to show this information.



config IEEE1394_EXTRA_CONFIG_ROMS

config IEEE1394_EXTRA_CONFIG_ROMS

	bool "Build in extra config rom entries for certain functionality"

	bool "Build in extra config rom entries for certain functionality"

	depends on IEEE1394

	depends on IEEE1394
@@ -66,13 +52,6 @@ config IEEE1394_CONFIG_ROM_IP1394 
	  with MacOSX and WinXP IP-over-1394), enable this option and the

	  with MacOSX and WinXP IP-over-1394), enable this option and the

	  eth1394 option below.

	  eth1394 option below.





config IEEE1394_EXPORT_FULL_API

	bool "Export all symbols of ieee1394's API (deprecated)"

	depends on IEEE1394

	default n

	help

	  This option will be removed soon.  Don't worry, say N.



comment "Device Drivers"

comment "Device Drivers"

	depends on IEEE1394

	depends on IEEE1394

drivers/ieee1394/Makefile

+0 −10
Original line number Original line Diff line number Diff line
@@ -5,9 +5,6 @@ 
ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \

ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \

		 highlevel.o csr.o nodemgr.o dma.o iso.o \

		 highlevel.o csr.o nodemgr.o dma.o iso.o \

		 csr1212.o config_roms.o

		 csr1212.o config_roms.o

ifdef CONFIG_IEEE1394_OUI_DB

ieee1394-objs += oui.o

endif





obj-$(CONFIG_IEEE1394) += ieee1394.o

obj-$(CONFIG_IEEE1394) += ieee1394.o

obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o

obj-$(CONFIG_IEEE1394_PCILYNX) += pcilynx.o
@@ -18,10 +15,3 @@ obj-$(CONFIG_IEEE1394_SBP2) += sbp2.o 
obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o

obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o

obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o

obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o

quiet_cmd_oui2c = OUI2C   $@

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



targets := oui.c

$(obj)/oui.o: $(obj)/oui.c

$(obj)/oui.c: $(src)/oui.db $(src)/oui2c.sh FORCE

	$(call if_changed,oui2c)

drivers/ieee1394/csr1212.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -47,14 +47,14 @@ 
#define __D (1 << CSR1212_KV_TYPE_DIRECTORY)

#define __D (1 << CSR1212_KV_TYPE_DIRECTORY)

#define __L (1 << CSR1212_KV_TYPE_LEAF)

#define __L (1 << CSR1212_KV_TYPE_LEAF)

static const u_int8_t csr1212_key_id_type_map[0x30] = {

static const u_int8_t csr1212_key_id_type_map[0x30] = {

	0,			/* Reserved */

	__C,			/* used by Apple iSight */

	__D | __L,		/* Descriptor */

	__D | __L,		/* Descriptor */

	__I | __D | __L,	/* Bus_Dependent_Info */

	__I | __D | __L,	/* Bus_Dependent_Info */

	__I | __D | __L,	/* Vendor */

	__I | __D | __L,	/* Vendor */

	__I,			/* Hardware_Version */

	__I,			/* Hardware_Version */

	0, 0,			/* Reserved */

	0, 0,			/* Reserved */

	__D | __L,		/* Module */

	__D | __L | __I,	/* Module */

	0, 0, 0, 0,		/* Reserved */

	__I, 0, 0, 0,		/* used by Apple iSight, Reserved */

	__I,			/* Node_Capabilities */

	__I,			/* Node_Capabilities */

	__L,			/* EUI_64 */

	__L,			/* EUI_64 */

	0, 0, 0,		/* Reserved */

	0, 0, 0,		/* Reserved */
@@ -1234,6 +1234,12 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr) 
					 csr->private);

					 csr->private);

		if (ret != CSR1212_SUCCESS)

		if (ret != CSR1212_SUCCESS)

			return ret;

			return ret;



		/* check ROM header's info_length */

		if (i == 0 &&

		    CSR1212_BE32_TO_CPU(csr->cache_head->data[0]) >> 24 !=

		    bytes_to_quads(csr->bus_info_len) - 1)

			return CSR1212_EINVAL;

	}

	}





	bi = (struct csr1212_bus_info_block_img*)csr->cache_head->data;

	bi = (struct csr1212_bus_info_block_img*)csr->cache_head->data;
@@ -1250,9 +1256,6 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr) 
			return ret;

			return ret;

	}

	}





	if (bytes_to_quads(csr->bus_info_len - sizeof(csr1212_quad_t)) != bi->length)

		return CSR1212_EINVAL;



#if 0

#if 0

	/* Apparently there are too many differnt wrong implementations of the

	/* Apparently there are too many differnt wrong implementations of the

	 * CRC algorithm that verifying them is moot. */

	 * CRC algorithm that verifying them is moot. */