@@ -68,9 +68,9 @@ struct ssam_device_uid {
6868 * match_flags member of the device ID structure. Do not use them directly
6969 * with struct ssam_device_id or struct ssam_device_uid.
7070 */
71- #define SSAM_ANY_TID 0xffff
72- #define SSAM_ANY_IID 0xffff
73- #define SSAM_ANY_FUN 0xffff
71+ #define SSAM_SSH_TID_ANY 0xffff
72+ #define SSAM_SSH_IID_ANY 0xffff
73+ #define SSAM_SSH_FUN_ANY 0xffff
7474
7575/**
7676 * SSAM_DEVICE() - Initialize a &struct ssam_device_id with the given
@@ -83,25 +83,25 @@ struct ssam_device_uid {
8383 *
8484 * Initializes a &struct ssam_device_id with the given parameters. See &struct
8585 * ssam_device_uid for details regarding the parameters. The special values
86- * %SSAM_ANY_TID , %SSAM_ANY_IID , and %SSAM_ANY_FUN can be used to specify that
86+ * %SSAM_SSH_TID_ANY , %SSAM_SSH_IID_ANY , and %SSAM_SSH_FUN_ANY can be used to specify that
8787 * matching should ignore target ID, instance ID, and/or sub-function,
8888 * respectively. This macro initializes the ``match_flags`` field based on the
8989 * given parameters.
9090 *
9191 * Note: The parameters @d and @cat must be valid &u8 values, the parameters
92- * @tid, @iid, and @fun must be either valid &u8 values or %SSAM_ANY_TID ,
93- * %SSAM_ANY_IID , or %SSAM_ANY_FUN , respectively. Other non-&u8 values are not
92+ * @tid, @iid, and @fun must be either valid &u8 values or %SSAM_SSH_TID_ANY ,
93+ * %SSAM_SSH_IID_ANY , or %SSAM_SSH_FUN_ANY , respectively. Other non-&u8 values are not
9494 * allowed.
9595 */
9696#define SSAM_DEVICE (d , cat , tid , iid , fun ) \
97- .match_flags = (((tid) != SSAM_ANY_TID ) ? SSAM_MATCH_TARGET : 0) \
98- | (((iid) != SSAM_ANY_IID ) ? SSAM_MATCH_INSTANCE : 0) \
99- | (((fun) != SSAM_ANY_FUN ) ? SSAM_MATCH_FUNCTION : 0), \
97+ .match_flags = (((tid) != SSAM_SSH_TID_ANY ) ? SSAM_MATCH_TARGET : 0) \
98+ | (((iid) != SSAM_SSH_IID_ANY ) ? SSAM_MATCH_INSTANCE : 0) \
99+ | (((fun) != SSAM_SSH_FUN_ANY ) ? SSAM_MATCH_FUNCTION : 0), \
100100 .domain = d, \
101101 .category = cat, \
102- .target = __builtin_choose_expr((tid) != SSAM_ANY_TID , (tid), 0), \
103- .instance = __builtin_choose_expr((iid) != SSAM_ANY_IID , (iid), 0), \
104- .function = __builtin_choose_expr((fun) != SSAM_ANY_FUN , (fun), 0)
102+ .target = __builtin_choose_expr((tid) != SSAM_SSH_TID_ANY , (tid), 0), \
103+ .instance = __builtin_choose_expr((iid) != SSAM_SSH_IID_ANY , (iid), 0), \
104+ .function = __builtin_choose_expr((fun) != SSAM_SSH_FUN_ANY , (fun), 0)
105105
106106/**
107107 * SSAM_VDEV() - Initialize a &struct ssam_device_id as virtual device with
@@ -113,18 +113,18 @@ struct ssam_device_uid {
113113 *
114114 * Initializes a &struct ssam_device_id with the given parameters in the
115115 * virtual domain. See &struct ssam_device_uid for details regarding the
116- * parameters. The special values %SSAM_ANY_TID , %SSAM_ANY_IID , and
117- * %SSAM_ANY_FUN can be used to specify that matching should ignore target ID,
116+ * parameters. The special values %SSAM_SSH_TID_ANY , %SSAM_SSH_IID_ANY , and
117+ * %SSAM_SSH_FUN_ANY can be used to specify that matching should ignore target ID,
118118 * instance ID, and/or sub-function, respectively. This macro initializes the
119119 * ``match_flags`` field based on the given parameters.
120120 *
121121 * Note: The parameter @cat must be a valid &u8 value, the parameters @tid,
122- * @iid, and @fun must be either valid &u8 values or %SSAM_ANY_TID ,
123- * %SSAM_ANY_IID , or %SSAM_ANY_FUN , respectively. Other non-&u8 values are not
122+ * @iid, and @fun must be either valid &u8 values or %SSAM_SSH_TID_ANY ,
123+ * %SSAM_SSH_IID_ANY , or %SSAM_SSH_FUN_ANY , respectively. Other non-&u8 values are not
124124 * allowed.
125125 */
126126#define SSAM_VDEV (cat , tid , iid , fun ) \
127- SSAM_DEVICE(SSAM_DOMAIN_VIRTUAL, SSAM_VIRTUAL_TC_##cat, tid, iid, fun)
127+ SSAM_DEVICE(SSAM_DOMAIN_VIRTUAL, SSAM_VIRTUAL_TC_##cat, SSAM_SSH_TID_## tid, iid, fun)
128128
129129/**
130130 * SSAM_SDEV() - Initialize a &struct ssam_device_id as physical SSH device
@@ -136,18 +136,18 @@ struct ssam_device_uid {
136136 *
137137 * Initializes a &struct ssam_device_id with the given parameters in the SSH
138138 * domain. See &struct ssam_device_uid for details regarding the parameters.
139- * The special values %SSAM_ANY_TID , %SSAM_ANY_IID , and %SSAM_ANY_FUN can be
140- * used to specify that matching should ignore target ID, instance ID, and/or
141- * sub-function, respectively. This macro initializes the ``match_flags``
142- * field based on the given parameters.
139+ * The special values %SSAM_SSH_TID_ANY , %SSAM_SSH_IID_ANY , and
140+ * %SSAM_SSH_FUN_ANY can be used to specify that matching should ignore target
141+ * ID, instance ID, and/or sub-function, respectively. This macro initializes
142+ * the ``match_flags`` field based on the given parameters.
143143 *
144144 * Note: The parameter @cat must be a valid &u8 value, the parameters @tid,
145- * @iid, and @fun must be either valid &u8 values or %SSAM_ANY_TID ,
146- * %SSAM_ANY_IID , or %SSAM_ANY_FUN , respectively. Other non-&u8 values are not
147- * allowed.
145+ * @iid, and @fun must be either valid &u8 values or %SSAM_SSH_TID_ANY ,
146+ * %SSAM_SSH_IID_ANY , or %SSAM_SSH_FUN_ANY , respectively. Other non-&u8 values
147+ * are not allowed.
148148 */
149149#define SSAM_SDEV (cat , tid , iid , fun ) \
150- SSAM_DEVICE(SSAM_DOMAIN_SERIALHUB, SSAM_SSH_TC_##cat, tid, iid, fun)
150+ SSAM_DEVICE(SSAM_DOMAIN_SERIALHUB, SSAM_SSH_TC_##cat, SSAM_SSH_TID_## tid, iid, fun)
151151
152152/*
153153 * enum ssam_device_flags - Flags for SSAM client devices.
0 commit comments