Skip to content

Commit

Permalink
ieee1394: consolidate uses of IEEE1934_BUSID_MAGIC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Harvey Harrison authored and Stefan Richter committed Jan 4, 2009
1 parent cbe7dd6 commit c1fc58d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/ieee1394/csr.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ static void add_host(struct hpsb_host *host)

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) |
(1 << CSR_CMC_SHIFT) |
(1 << CSR_ISC_SHIFT) |
Expand Down Expand Up @@ -250,7 +250,7 @@ static void remove_host(struct hpsb_host *host)
{
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) |
(0 << CSR_CMC_SHIFT) |
(0 << CSR_ISC_SHIFT) |
Expand Down
3 changes: 3 additions & 0 deletions drivers/ieee1394/ieee1394.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ extern const char *hpsb_speedto_str[];

#include <asm/byteorder.h>

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

#ifdef __BIG_ENDIAN_BITFIELD

struct selfid {
Expand Down
3 changes: 0 additions & 3 deletions drivers/ieee1394/nodemgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ struct csr1212_keyval;
struct hpsb_host;
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
* for which to gather info from the Node Manager about devices attached
* to the bus. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/ieee1394/pcilynx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
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");
} else {
Expand Down

0 comments on commit c1fc58d

Please sign in to comment.