patch-2.4.22 linux-2.4.22/drivers/ieee1394/sbp2.h
Next file: linux-2.4.22/drivers/ieee1394/video1394.c
Previous file: linux-2.4.22/drivers/ieee1394/sbp2.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/ieee1394/sbp2.h
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/ieee1394/sbp2.h linux-2.4.22/drivers/ieee1394/sbp2.h
@@ -388,7 +388,6 @@
/*
* Values pulled from the device's unit directory
*/
- struct unit_directory *ud;
u32 sbp2_command_set_spec_id;
u32 sbp2_command_set;
u32 sbp2_unit_characteristics;
@@ -407,6 +406,8 @@
struct list_head sbp2_command_orb_inuse;
struct list_head sbp2_command_orb_completed;
+ struct list_head list;
+
/* Node entry, as retrieved from NodeMgr entries */
struct node_entry *ne;
@@ -417,6 +418,13 @@
u32 workarounds;
};
+
+/* Describes a per-ud scsi_id group */
+struct scsi_id_group {
+ struct list_head scsi_id_list;
+};
+
+
/*
* Sbp2 host data structure (one per sbp2 host)
*/
@@ -461,14 +469,15 @@
/*
* IEEE-1394 core driver related prototypes
*/
-static void sbp2_add_host(struct hpsb_host *host);
+static struct sbp2scsi_host_info *sbp2_add_host(struct hpsb_host *host);
static void sbp2_remove_host(struct hpsb_host *host);
static int sbp2_probe(struct unit_directory *ud);
static void sbp2_disconnect(struct unit_directory *ud);
static void sbp2_update(struct unit_directory *ud);
-static int sbp2_start_device(struct sbp2scsi_host_info *hi,
- struct unit_directory *ud);
+static int sbp2_start_ud(struct sbp2scsi_host_info *hi,
+ struct unit_directory *ud);
+static int sbp2_start_device(struct scsi_id_instance_data *scsi_id);
static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id);
#ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA
@@ -502,7 +511,8 @@
static unsigned int sbp2_status_to_sense_data(unchar *sbp2_status, unchar *sense_data);
static void sbp2_check_sbp2_command(struct scsi_id_instance_data *scsi_id, unchar *cmd);
static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, Scsi_Cmnd *SCpnt);
-static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id);
+static void sbp2_parse_unit_directory(struct scsi_id_group *scsi_group,
+ struct unit_directory *ud);
static int sbp2_set_busy_timeout(struct scsi_id_instance_data *scsi_id);
static int sbp2_max_speed_and_size(struct scsi_id_instance_data *scsi_id);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)