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

Commit c1fc58d6 authored Dec 12, 2008 by Harvey Harrison Committed by Stefan Richter Jan 04, 2009

ieee1394: consolidate uses of IEEE1934_BUSID_MAGIC



Move the definition out of nodemgr.h and use it in csr.c/pcilynx.c

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

parent cbe7dd69

drivers/ieee1394/csr.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -217,7 +217,7 @@ static void add_host(struct hpsb_host *host)

	host->csr.generation = 2;		host->csr.generation = 2;

	bus_info[1] = __constant_cpu_to_be32(0x31333934);		bus_info[1] = IEEE1394_BUSID_MAGIC;
	bus_info[2] = cpu_to_be32((hpsb_disable_irm ? 0 : 1 << CSR_IRMC_SHIFT) \|		bus_info[2] = cpu_to_be32((hpsb_disable_irm ? 0 : 1 << CSR_IRMC_SHIFT) \|
	(1 << CSR_CMC_SHIFT) \|		(1 << CSR_CMC_SHIFT) \|
	(1 << CSR_ISC_SHIFT) \|		(1 << CSR_ISC_SHIFT) \|
	@@ -250,7 +250,7 @@ static void remove_host(struct hpsb_host *host)
	{		{
	quadlet_t bus_info[CSR_BUS_INFO_SIZE];		quadlet_t bus_info[CSR_BUS_INFO_SIZE];

	bus_info[1] = __constant_cpu_to_be32(0x31333934);		bus_info[1] = IEEE1394_BUSID_MAGIC;
	bus_info[2] = cpu_to_be32((0 << CSR_IRMC_SHIFT) \|		bus_info[2] = cpu_to_be32((0 << CSR_IRMC_SHIFT) \|
	(0 << CSR_CMC_SHIFT) \|		(0 << CSR_CMC_SHIFT) \|
	(0 << CSR_ISC_SHIFT) \|		(0 << CSR_ISC_SHIFT) \|

drivers/ieee1394/ieee1394.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,9 @@ extern const char *hpsb_speedto_str[];

	#include <asm/byteorder.h>		#include <asm/byteorder.h>

			/* '1' '3' '9' '4' in ASCII */
			#define IEEE1394_BUSID_MAGIC cpu_to_be32(0x31333934)

	#ifdef __BIG_ENDIAN_BITFIELD		#ifdef __BIG_ENDIAN_BITFIELD

	struct selfid {		struct selfid {

drivers/ieee1394/nodemgr.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,6 @@ struct csr1212_keyval;
	struct hpsb_host;		struct hpsb_host;
	struct ieee1394_device_id;		struct ieee1394_device_id;

	/* '1' '3' '9' '4' in ASCII */
	#define IEEE1394_BUSID_MAGIC __constant_cpu_to_be32(0x31333934)

	/* This is the start of a Node entry structure. It should be a stable API		/* This is the start of a Node entry structure. It should be a stable API
	* for which to gather info from the Node Manager about devices attached		* for which to gather info from the Node Manager about devices attached
	* to the bus. */		* to the bus. */

drivers/ieee1394/pcilynx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1463,7 +1463,7 @@ static int __devinit add_card(struct pci_dev *dev,

	/* info_length, crc_length and 1394 magic number to check, if it is really a bus info block */		/* info_length, crc_length and 1394 magic number to check, if it is really a bus info block */
	if (((be32_to_cpu(lynx->bus_info_block[0]) & 0xffff0000) == 0x04040000) &&		if (((be32_to_cpu(lynx->bus_info_block[0]) & 0xffff0000) == 0x04040000) &&
	(lynx->bus_info_block[1] == __constant_cpu_to_be32(0x31333934)))		(lynx->bus_info_block[1] == IEEE1394_BUSID_MAGIC))
	{		{
	PRINT(KERN_DEBUG, lynx->id, "read a valid bus info block from");		PRINT(KERN_DEBUG, lynx->id, "read a valid bus info block from");
	} else {		} else {