firewire: support S100B...S400B and link slower than PHY

[mv-sheeva.git] / drivers / firewire / fw-device.h

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index ba0e2463e4a7794f1eb47ed7777a16da125a5b94..d13e6a69707ffe6265a32fbd92efbfb0b31497d1 100644 (file)
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
@@ -1,7 +1,4 @@
-/*                                             -*- c-basic-offset: 8 -*-
- *
- * fw-device.h - Device probing and sysfs code.
- *
+/*
  * Copyright (C) 2005-2006  Kristian Hoegsberg <krh@bitplanet.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,19 +29,27 @@ enum fw_device_state {
        FW_DEVICE_SHUTDOWN,
 };
 
+struct fw_attribute_group {
+       struct attribute_group *groups[2];
+       struct attribute_group group;
+       struct attribute *attrs[11];
+};
+
 struct fw_device {
        atomic_t state;
        struct fw_node *node;
        int node_id;
        int generation;
+       unsigned max_speed;
        struct fw_card *card;
        struct device device;
        struct list_head link;
        struct list_head client_list;
-       __be32 *config_rom;
+       u32 *config_rom;
        size_t config_rom_length;
        int config_rom_retries;
        struct delayed_work work;
+       struct fw_attribute_group attribute_group;
 };
 
 static inline struct fw_device *
@@ -72,6 +77,7 @@ extern int fw_cdev_major;
 struct fw_unit {
        struct device device;
        u32 *directory;
+       struct fw_attribute_group attribute_group;
 };
 
 static inline struct fw_unit *
@@ -94,6 +100,7 @@ fw_unit(struct device *dev)
 #define CSR_DEPENDENT_INFO     0x14
 #define CSR_MODEL              0x17
 #define CSR_INSTANCE           0x18
+#define CSR_DIRECTORY_ID       0x20
 
 #define SBP2_COMMAND_SET_SPECIFIER     0x38
 #define SBP2_COMMAND_SET               0x39