Skip to content

L
linux
Commit 424a9642 authored by Stefan Richter's avatar Stefan Richter
Browse files
Options

ieee1394: sbp2: coding style of some macros 

Adjust parentheses, indentation, line lengths.
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent edf1fb21
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 77 deletions
drivers/ieee1394/sbp2.h
View file @ 424a9642
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
#define ORB_DIRECTION_READ_FROM_MEDIA 0x1 #define ORB_DIRECTION_READ_FROM_MEDIA 0x1
#define ORB_DIRECTION_NO_DATA_TRANSFER 0x2 #define ORB_DIRECTION_NO_DATA_TRANSFER 0x2
#define ORB_SET_NULL_PTR(value) ((value & 0x1) << 31) #define ORB_SET_NULL_PTR(v) (((v) & 0x1) << 31)
#define ORB_SET_NOTIFY(value) ((value & 0x1) << 31) #define ORB_SET_NOTIFY(v) (((v) & 0x1) << 31)
#define ORB_SET_RQ_FMT(value) ((value & 0x3) << 29) /* unused ? */ #define ORB_SET_RQ_FMT(v) (((v) & 0x3) << 29)
#define ORB_SET_NODE_ID(value) ((value & 0xffff) << 16) #define ORB_SET_NODE_ID(v) (((v) & 0xffff) << 16)
#define ORB_SET_STATUS_FIFO_HI(value, id) (value >> 32 | ORB_SET_NODE_ID(id)) #define ORB_SET_STATUS_FIFO_HI(v, id) ((v) >> 32 | ORB_SET_NODE_ID(id))
#define ORB_SET_STATUS_FIFO_LO(value) (value & 0xffffffff) #define ORB_SET_STATUS_FIFO_LO(v) ((v) & 0xffffffff)
#define ORB_SET_DATA_SIZE(value) (value & 0xffff) #define ORB_SET_DATA_SIZE(v) ((v) & 0xffff)
#define ORB_SET_PAGE_SIZE(value) ((value & 0x7) << 16) #define ORB_SET_PAGE_SIZE(v) (((v) & 0x7) << 16)
#define ORB_SET_PAGE_TABLE_PRESENT(value) ((value & 0x1) << 19) #define ORB_SET_PAGE_TABLE_PRESENT(v) (((v) & 0x1) << 19)
#define ORB_SET_MAX_PAYLOAD(value) ((value & 0xf) << 20) #define ORB_SET_MAX_PAYLOAD(v) (((v) & 0xf) << 20)
#define ORB_SET_SPEED(value) ((value & 0x7) << 24) #define ORB_SET_SPEED(v) (((v) & 0x7) << 24)
#define ORB_SET_DIRECTION(value) ((value & 0x1) << 27) #define ORB_SET_DIRECTION(v) (((v) & 0x1) << 27)
struct sbp2_command_orb { struct sbp2_command_orb {
u32 next_ORB_hi; u32 next_ORB_hi;
...@@ -64,12 +64,12 @@ struct sbp2_command_orb { ...@@ -64,12 +64,12 @@ struct sbp2_command_orb {
#define SBP2_LOGICAL_UNIT_RESET 0xe #define SBP2_LOGICAL_UNIT_RESET 0xe
#define SBP2_TARGET_RESET_REQUEST 0xf #define SBP2_TARGET_RESET_REQUEST 0xf
#define ORB_SET_LUN(value) (value & 0xffff) #define ORB_SET_LUN(v) ((v) & 0xffff)
#define ORB_SET_FUNCTION(value) ((value & 0xf) << 16) #define ORB_SET_FUNCTION(v) (((v) & 0xf) << 16)
#define ORB_SET_RECONNECT(value) ((value & 0xf) << 20) #define ORB_SET_RECONNECT(v) (((v) & 0xf) << 20)
#define ORB_SET_EXCLUSIVE(value) ((value & 0x1) << 28) #define ORB_SET_EXCLUSIVE(v) (((v) & 0x1) << 28)
#define ORB_SET_LOGIN_RESP_LENGTH(value) (value & 0xffff) #define ORB_SET_LOGIN_RESP_LENGTH(v) ((v) & 0xffff)
#define ORB_SET_PASSWD_LENGTH(value) ((value & 0xffff) << 16) #define ORB_SET_PASSWD_LENGTH(v) (((v) & 0xffff) << 16)
struct sbp2_login_orb { struct sbp2_login_orb {
u32 password_hi; u32 password_hi;
...@@ -82,9 +82,9 @@ struct sbp2_login_orb { ...@@ -82,9 +82,9 @@ struct sbp2_login_orb {
u32 status_fifo_lo; u32 status_fifo_lo;
} __attribute__((packed)); } __attribute__((packed));
#define RESPONSE_GET_LOGIN_ID(value) (value & 0xffff) #define RESPONSE_GET_LOGIN_ID(v) ((v) & 0xffff)
#define RESPONSE_GET_LENGTH(value) ((value >> 16) & 0xffff) #define RESPONSE_GET_LENGTH(v) (((v) >> 16) & 0xffff)
#define RESPONSE_GET_RECONNECT_HOLD(value) (value & 0xffff) #define RESPONSE_GET_RECONNECT_HOLD(v) ((v) & 0xffff)
struct sbp2_login_response { struct sbp2_login_response {
u32 length_login_ID; u32 length_login_ID;
...@@ -93,9 +93,8 @@ struct sbp2_login_response { ...@@ -93,9 +93,8 @@ struct sbp2_login_response {
u32 reconnect_hold; u32 reconnect_hold;
} __attribute__((packed)); } __attribute__((packed));
#define ORB_SET_LOGIN_ID(value) (value & 0xffff) #define ORB_SET_LOGIN_ID(v) ((v) & 0xffff)
#define ORB_SET_QUERY_LOGINS_RESP_LENGTH(v) ((v) & 0xffff)
#define ORB_SET_QUERY_LOGINS_RESP_LENGTH(value) (value & 0xffff)
struct sbp2_query_logins_orb { struct sbp2_query_logins_orb {
u32 reserved1; u32 reserved1;
...@@ -108,8 +107,8 @@ struct sbp2_query_logins_orb { ...@@ -108,8 +107,8 @@ struct sbp2_query_logins_orb {
u32 status_fifo_lo; u32 status_fifo_lo;
} __attribute__((packed)); } __attribute__((packed));
#define RESPONSE_GET_MAX_LOGINS(value) (value & 0xffff) #define RESPONSE_GET_MAX_LOGINS(v) ((v) & 0xffff)
#define RESPONSE_GET_ACTIVE_LOGINS(value) ((RESPONSE_GET_LENGTH(value) - 4) / 12) #define RESPONSE_GET_ACTIVE_LOGINS(v) ((RESPONSE_GET_LENGTH((v)) - 4) / 12)
struct sbp2_query_logins_response { struct sbp2_query_logins_response {
u32 length_max_logins; u32 length_max_logins;
...@@ -140,8 +139,8 @@ struct sbp2_logout_orb { ...@@ -140,8 +139,8 @@ struct sbp2_logout_orb {
u32 status_fifo_lo; u32 status_fifo_lo;
} __attribute__((packed)); } __attribute__((packed));
#define PAGE_TABLE_SET_SEGMENT_BASE_HI(value) (value & 0xffff) #define PAGE_TABLE_SET_SEGMENT_BASE_HI(v) ((v) & 0xffff)
#define PAGE_TABLE_SET_SEGMENT_LENGTH(value) ((value & 0xffff) << 16) #define PAGE_TABLE_SET_SEGMENT_LENGTH(v) (((v) & 0xffff) << 16)
struct sbp2_unrestricted_page_table { struct sbp2_unrestricted_page_table {
u32 length_segment_base_hi; u32 length_segment_base_hi;
...@@ -171,23 +170,14 @@ struct sbp2_unrestricted_page_table { ...@@ -171,23 +170,14 @@ struct sbp2_unrestricted_page_table {
#define SFMT_DEFERRED_ERROR 0x1 #define SFMT_DEFERRED_ERROR 0x1
#define SFMT_VENDOR_DEPENDENT_STATUS 0x3 #define SFMT_VENDOR_DEPENDENT_STATUS 0x3
#define SBP2_SCSI_STATUS_GOOD 0x0 #define STATUS_GET_SRC(v) (((v) >> 30) & 0x3)
#define SBP2_SCSI_STATUS_CHECK_CONDITION 0x2 #define STATUS_GET_RESP(v) (((v) >> 28) & 0x3)
#define SBP2_SCSI_STATUS_CONDITION_MET 0x4 #define STATUS_GET_LEN(v) (((v) >> 24) & 0x7)
#define SBP2_SCSI_STATUS_BUSY 0x8 #define STATUS_GET_SBP_STATUS(v) (((v) >> 16) & 0xff)
#define SBP2_SCSI_STATUS_RESERVATION_CONFLICT 0x18 #define STATUS_GET_ORB_OFFSET_HI(v) ((v) & 0x0000ffff)
#define SBP2_SCSI_STATUS_COMMAND_TERMINATED 0x22 #define STATUS_TEST_DEAD(v) ((v) & 0x08000000)
#define SBP2_SCSI_STATUS_SELECTION_TIMEOUT 0xff
#define STATUS_GET_SRC(value) (((value) >> 30) & 0x3)
#define STATUS_GET_RESP(value) (((value) >> 28) & 0x3)
#define STATUS_GET_LEN(value) (((value) >> 24) & 0x7)
#define STATUS_GET_SBP_STATUS(value) (((value) >> 16) & 0xff)
#define STATUS_GET_ORB_OFFSET_HI(value) ((value) & 0x0000ffff)
#define STATUS_TEST_DEAD(value) ((value) & 0x08000000)
/* test 'resp' | 'dead' | 'sbp2_status' */ /* test 'resp' | 'dead' | 'sbp2_status' */
#define STATUS_TEST_RDS(value) ((value) & 0x38ff0000) #define STATUS_TEST_RDS(v) ((v) & 0x38ff0000)
struct sbp2_status_block { struct sbp2_status_block {
u32 ORB_offset_hi_misc; u32 ORB_offset_hi_misc;
...@@ -233,15 +223,19 @@ struct sbp2_status_block { ...@@ -233,15 +223,19 @@ struct sbp2_status_block {
*/ */
#define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000 #define SBP2_MAX_SG_ELEMENT_LENGTH 0xf000
#define SBP2_MAX_SECTORS 255 /* Max sectors supported */ #define SBP2_MAX_SECTORS 255
#define SBP2_MAX_CMDS 8 /* This should be safe */ /* There is no real limitation of the queue depth (i.e. length of the linked
* list of command ORBs) at the target. The chosen depth is merely an
* implementation detail of the sbp2 driver. */
#define SBP2_MAX_CMDS 8
/* Flags for detected oddities and brokeness */ #define SBP2_SCSI_STATUS_GOOD 0x0
#define SBP2_WORKAROUND_128K_MAX_TRANS 0x1 #define SBP2_SCSI_STATUS_CHECK_CONDITION 0x2
#define SBP2_WORKAROUND_INQUIRY_36 0x2 #define SBP2_SCSI_STATUS_CONDITION_MET 0x4
#define SBP2_WORKAROUND_MODE_SENSE_8 0x4 #define SBP2_SCSI_STATUS_BUSY 0x8
#define SBP2_WORKAROUND_FIX_CAPACITY 0x8 #define SBP2_SCSI_STATUS_RESERVATION_CONFLICT 0x18
#define SBP2_WORKAROUND_OVERRIDE 0x100 #define SBP2_SCSI_STATUS_COMMAND_TERMINATED 0x22
#define SBP2_SCSI_STATUS_SELECTION_TIMEOUT 0xff
/* This is the two dma types we use for cmd_dma below */ /* This is the two dma types we use for cmd_dma below */
enum cmd_dma_types { enum cmd_dma_types {
...@@ -364,4 +358,11 @@ struct sbp2scsi_host_info { ...@@ -364,4 +358,11 @@ struct sbp2scsi_host_info {
struct list_head scsi_ids; /* List of scsi ids on this host */ struct list_head scsi_ids; /* List of scsi ids on this host */
}; };
/* Flags for detected oddities and brokeness */
#define SBP2_WORKAROUND_128K_MAX_TRANS 0x1
#define SBP2_WORKAROUND_INQUIRY_36 0x2
#define SBP2_WORKAROUND_MODE_SENSE_8 0x4
#define SBP2_WORKAROUND_FIX_CAPACITY 0x8
#define SBP2_WORKAROUND_OVERRIDE 0x100
#endif /* SBP2_H */ #endif /* SBP2_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7