[ARM] 4732/1: GLAN Tank: register rtc-rs5c372 i2c device

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

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index 731abbe..894d4a9 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
@@ -24,46 +21,69 @@
 
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <asm/atomic.h>
 
 enum fw_device_state {
        FW_DEVICE_INITIALIZING,
        FW_DEVICE_RUNNING,
-       FW_DEVICE_SHUTDOWN
+       FW_DEVICE_SHUTDOWN,
+};
+
+struct fw_attribute_group {
+       struct attribute_group *groups[2];
+       struct attribute_group group;
+       struct attribute *attrs[11];
 };
 
 struct fw_device {
-       int state;
+       atomic_t state;
        struct fw_node *node;
        int node_id;
        int generation;
+       unsigned max_speed;
        struct fw_card *card;
        struct device device;
-       struct cdev cdev;
-       __be32 *config_rom;
+       struct list_head link;
+       struct list_head client_list;
+       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 *
 fw_device(struct device *dev)
 {
-        return container_of(dev, struct fw_device, device);
+       return container_of(dev, struct fw_device, device);
+}
+
+static inline int
+fw_device_is_shutdown(struct fw_device *device)
+{
+       return atomic_read(&device->state) == FW_DEVICE_SHUTDOWN;
 }
 
 struct fw_device *fw_device_get(struct fw_device *device);
 void fw_device_put(struct fw_device *device);
 int fw_device_enable_phys_dma(struct fw_device *device);
 
+void fw_device_cdev_update(struct fw_device *device);
+void fw_device_cdev_remove(struct fw_device *device);
+
+struct fw_device *fw_device_from_devt(dev_t devt);
+extern int fw_cdev_major;
+
 struct fw_unit {
        struct device device;
        u32 *directory;
+       struct fw_attribute_group attribute_group;
 };
 
 static inline struct fw_unit *
 fw_unit(struct device *dev)
 {
-        return container_of(dev, struct fw_unit, device);
+       return container_of(dev, struct fw_unit, device);
 }
 
 #define CSR_OFFSET     0x40
@@ -80,11 +100,7 @@ fw_unit(struct device *dev)
 #define CSR_DEPENDENT_INFO     0x14
 #define CSR_MODEL              0x17
 #define CSR_INSTANCE           0x18
-
-#define SBP2_COMMAND_SET_SPECIFIER     0x38
-#define SBP2_COMMAND_SET               0x39
-#define SBP2_COMMAND_SET_REVISION      0x3b
-#define SBP2_FIRMWARE_REVISION         0x3c
+#define CSR_DIRECTORY_ID       0x20
 
 struct fw_csr_iterator {
        u32 *p;
@@ -113,15 +129,15 @@ struct fw_driver {
        struct device_driver driver;
        /* Called when the parent device sits through a bus reset. */
        void (*update) (struct fw_unit *unit);
-       struct fw_device_id *id_table;
+       const struct fw_device_id *id_table;
 };
 
 static inline struct fw_driver *
 fw_driver(struct device_driver *drv)
 {
-        return container_of(drv, struct fw_driver, driver);
+       return container_of(drv, struct fw_driver, driver);
 }
 
-extern struct file_operations fw_device_ops;
+extern const struct file_operations fw_device_ops;
 
 #endif /* __fw_device_h */