FreeCalypso > hg > fc-selenite

comparison src/g23m-gprs/llc/llc_uf.c @ 68:be5b218f0765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/g23m-gprs/llc: fixed many invalid uses of ##
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 20 Jul 2018 00:51:15 +0000
parents d393cd9bb723
children
comparison
equal deleted inserted replaced
67:c7af699af1c4 68:be5b218f0765
58 /* 58 /*
59 * CHECK_INSTANCE: 59 * CHECK_INSTANCE:
60 * v(ariable) - variable name of parameter 60 * v(ariable) - variable name of parameter
61 */ 61 */
62 #define CHECK_INSTANCE(v) \ 62 #define CHECK_INSTANCE(v) \
63 if (llc_data->decoded_xid.##v##.valid) \ 63 if (llc_data->decoded_xid.v.valid) \
64 { \ 64 { \
65 /* \ 65 /* \
66 * More than one instance of the same XID parameter type is included. \ 66 * More than one instance of the same XID parameter type is included. \
67 */ \ 67 */ \
68 if (cr_bit EQ SGSN_COMMAND) \ 68 if (cr_bit EQ SGSN_COMMAND) \
103 /* \ 103 /* \
104 * XID command: Set the value for this type according to our \ 104 * XID command: Set the value for this type according to our \
105 * preferences. \ 105 * preferences. \
106 * <R.LLC.XIDNEG_R.A.003> \ 106 * <R.LLC.XIDNEG_R.A.003> \
107 */ \ 107 */ \
108 llc_data->decoded_xid.##v##.valid = TRUE; \ 108 llc_data->decoded_xid.v.valid = TRUE; \
109 llc_data->decoded_xid.##v##.value = d; \ 109 llc_data->decoded_xid.v.value = d; \
110 break; \ 110 break; \
111 } \ 111 } \
112 else /* SGSN_RESPONSE */ \ 112 else /* SGSN_RESPONSE */ \
113 { \ 113 { \
114 /* \ 114 /* \
137 if (cr_bit EQ SGSN_RESPONSE) \ 137 if (cr_bit EQ SGSN_RESPONSE) \
138 { \ 138 { \
139 /* \ 139 /* \
140 * First compare the value with the requested value, if there is any \ 140 * First compare the value with the requested value, if there is any \
141 */ \ 141 */ \
142 if ( (llc_data->u->requested_xid.##v##.valid) AND \ 142 if ( (llc_data->u->requested_xid.v.valid) AND \
143 (llc_data->u->requested_xid.##v##.value s d) ) \ 143 (llc_data->u->requested_xid.v.value s d) ) \
144 { \ 144 { \
145 TRACE_0_INFO ("Sense of negotiation error"); \ 145 TRACE_0_INFO ("Sense of negotiation error"); \
146 return FALSE; \ 146 return FALSE; \
147 } \ 147 } \
148 else if( !(llc_data->u->requested_xid.##v##.valid) AND \ 148 else if( !(llc_data->u->requested_xid.v.valid) AND \
149 (*(llc_data->##v) s d) ) \ 149 (*(llc_data->v) s d) ) \
150 { \ 150 { \
151 /* \ 151 /* \
152 * If the value was not requested but included in response, compare \ 152 * If the value was not requested but included in response, compare \
153 * it with the current value \ 153 * it with the current value \
154 */ \ 154 */ \