X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fieee1394%2Fraw1394-private.h;h=a06aaad5b448da6072a0c4469b60cfa64eafa1e3;hb=450c622e9ff19888818d4e2c4d31adb97a5242b2;hp=c7731d1bcd89da69559e342be57f2fe6aa1fae3d;hpb=ccaa36f73544163ef6e15eb29a620130755f6001;p=linux-2.6 diff --git a/drivers/ieee1394/raw1394-private.h b/drivers/ieee1394/raw1394-private.h index c7731d1bcd..a06aaad5b4 100644 --- a/drivers/ieee1394/raw1394-private.h +++ b/drivers/ieee1394/raw1394-private.h @@ -27,20 +27,15 @@ struct file_info { struct hpsb_host *host; - struct list_head req_pending; - struct list_head req_complete; + struct list_head req_pending; /* protected by reqlists_lock */ + struct list_head req_complete; /* protected by reqlists_lock */ spinlock_t reqlists_lock; wait_queue_head_t wait_complete; - struct list_head addr_list; + struct list_head addr_list; /* protected by host_info_lock */ u8 __user *fcp_buffer; - /* old ISO API */ - u64 listen_channels; - quadlet_t __user *iso_buffer; - size_t iso_buffer_length; - u8 notification; /* (busreset-notification) RAW1394_NOTIFY_OFF/ON */ /* new rawiso API */ @@ -63,7 +58,7 @@ struct arm_addr { u8 client_transactions; u64 recvb; u16 rec_length; - u8 *addr_space_buffer; /* accessed by read/write/lock */ + u8 *addr_space_buffer; /* accessed by read/write/lock requests */ }; struct pending_request { @@ -79,7 +74,7 @@ struct pending_request { struct host_info { struct list_head list; struct hpsb_host *host; - struct list_head file_info_list; + struct list_head file_info_list; /* protected by host_info_lock */ }; #endif /* IEEE1394_RAW1394_PRIVATE_H */