X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Ffirewire%2Ffw-device.h;h=0854fe2bc11085943d0b7edcdef5884d8996c60c;hb=d870ec7281d8429ab17d2e0324f4d8ca3f3de62d;hp=b150adb42533a949b72ee7f85e92e85512a11271;hpb=5e20c282184fd5794661b6688883231ff5348abc;p=linux-2.6

diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h
index b150adb425..0854fe2bc1 100644
--- 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,25 +21,47 @@
 
 #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];
 };
 
+/*
+ * Note, fw_device.generation always has to be read before fw_device.node_id.
+ * Use SMP memory barriers to ensure this.  Otherwise requests will be sent
+ * to an outdated node_id if the generation was updated in the meantime due
+ * to a bus reset.
+ *
+ * Likewise, fw-core will take care to update .node_id before .generation so
+ * that whenever fw_device.generation is current WRT the actual bus generation,
+ * fw_device.node_id is guaranteed to be current too.
+ *
+ * The same applies to fw_device.card->node_id vs. fw_device.generation.
+ */
 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 *
@@ -51,13 +70,26 @@ fw_device(struct device *dev)
 	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 *
@@ -80,11 +112,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;