genhd: send async notification on media change

[linux-2.6-omap-h63xx.git] / drivers / firewire / fw-topology.h

diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index ab03059a0da1b6b3c072de0d55d5971a958e63b3..363b6cbcd0b335087fba9701cd22b7bc2ea04975 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
@@ -22,6 +19,12 @@
 #ifndef __fw_topology_h
 #define __fw_topology_h
 
+enum {
+       FW_TOPOLOGY_A =         0x01,
+       FW_TOPOLOGY_B =         0x02,
+       FW_TOPOLOGY_MIXED =     0x03,
+};
+
 enum {
        FW_NODE_CREATED =   0x00,
        FW_NODE_UPDATED =   0x01,
@@ -42,10 +45,11 @@ struct fw_node {
        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 phy_speed : 3; /* As in the self ID packet. */
+       u8 max_speed : 5; /* Minimum of all phy-speeds and port 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. */
@@ -60,7 +64,7 @@ struct fw_node {
 static inline struct fw_node *
 fw_node(struct list_head *l)
 {
-       return list_entry (l, struct fw_node, link);
+       return list_entry(l, struct fw_node, link);
 }
 
 static inline struct fw_node *
@@ -81,4 +85,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 */