mfd: add support for WM8351 revision B

[safe/jmp/linux-2.6] / drivers / firewire / fw-topology.h

diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index 32ea7cd..addb9f8 100644 (file)
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -1,7 +1,4 @@
-/*                                             -*- c-basic-offset: 8 -*-
- *
- * fw-topology.h -- Incremental bus scan, based on bus topology
- *
+/*
  * Copyright (C) 2003-2006 Kristian Hoegsberg <krh@bitplanet.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,47 +20,38 @@
 #define __fw_topology_h
 
 enum {
-       FW_NODE_CREATED =   0x00,
-       FW_NODE_UPDATED =   0x01,
-       FW_NODE_DESTROYED = 0x02,
-       FW_NODE_LINK_ON =   0x03,
-       FW_NODE_LINK_OFF =  0x04
-};
-
-struct fw_port {
-       struct fw_node *node;
-       unsigned speed : 3; /* S100, S200, ... S3200 */
+       FW_NODE_CREATED,
+       FW_NODE_UPDATED,
+       FW_NODE_DESTROYED,
+       FW_NODE_LINK_ON,
+       FW_NODE_LINK_OFF,
+       FW_NODE_INITIATED_RESET,
 };
 
 struct fw_node {
        u16 node_id;
-        u8 color;
+       u8 color;
        u8 port_count;
-       unsigned link_on : 1;
-       unsigned initiated_reset : 1;
-       unsigned b_path : 1;
-       u8 phy_speed; /* As in the self ID packet. */
-       u8 max_speed; /* Minimum of all phy-speeds and port speeds on
-                      * the path from the local node to this node. */
-
+       u8 link_on : 1;
+       u8 initiated_reset : 1;
+       u8 b_path : 1;
+       u8 phy_speed : 2; /* As in the self ID packet. */
+       u8 max_speed : 2; /* Minimum of all phy-speeds on the path from the
+                          * local node to this node. */
+       u8 max_depth : 4; /* Maximum depth to any leaf node */
+       u8 max_hops : 4;  /* Max hops in this sub tree */
        atomic_t ref_count;
 
-        /* For serializing node topology into a list. */
+       /* For serializing node topology into a list. */
        struct list_head link;
 
        /* Upper layer specific data. */
        void *data;
 
-        struct fw_port ports[0];
+       struct fw_node *ports[0];
 };
 
-extern inline struct fw_node *
-fw_node(struct list_head *l)
-{
-        return list_entry (l, struct fw_node, link);
-}
-
-extern inline struct fw_node *
+static inline struct fw_node *
 fw_node_get(struct fw_node *node)
 {
        atomic_inc(&node->ref_count);
@@ -71,7 +59,7 @@ fw_node_get(struct fw_node *node)
        return node;
 }
 
-extern inline void
+static inline void
 fw_node_put(struct fw_node *node)
 {
        if (atomic_dec_and_test(&node->ref_count))
@@ -81,4 +69,8 @@ fw_node_put(struct fw_node *node)
 void
 fw_destroy_nodes(struct fw_card *card);
 
+int
+fw_compute_block_crc(u32 *block);
+
+
 #endif /* __fw_topology_h */