FreeCalypso > hg > fc-selenite
diff src/g23m-gprs/llc/llc.h @ 68:be5b218f0765
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 |
line wrap: on
line diff
--- a/src/g23m-gprs/llc/llc.h Fri Jul 20 00:30:34 2018 +0000 +++ b/src/g23m-gprs/llc/llc.h Fri Jul 20 00:51:15 2018 +0000 @@ -293,12 +293,12 @@ /* * Switch service s of entity e to use incarnation i. */ -#define SWITCH_SERVICE(e,s,i) e##_data->##s = &(##e##_data->##s##_base[i]); +#define SWITCH_SERVICE(e,s,i) e##_data->s = &(e##_data->s##_base[i]); /* * Switch LLC layer parameter p to incarnation i. */ -#define SWITCH_PARAM(p,i) llc_data->##p = &(llc_data->##p##_base[i]); +#define SWITCH_PARAM(p,i) llc_data->p = &(llc_data->p##_base[i]); /* @@ -345,7 +345,7 @@ * Tag XID parameter if requested to negotiate */ #define TAG_IF_REQUESTED(V,P) \ - if (llc_data->##V##valid) \ + if (llc_data->V valid) \ { \ llc_data->u->xid_tag |= (0x00000001L << P); \ } @@ -354,9 +354,9 @@ * Tag XID parameter if requested to negotiate and sense of negotiation fits */ #define TAG_IF_REQUESTED_RSP(S,V,P) \ - if (llc_data->u->requested_xid.##V##.valid) \ + if (llc_data->u->requested_xid.V.valid) \ { \ - if (llc_data->decoded_xid.##V##.valid) \ + if (llc_data->decoded_xid.V.valid) \ { \ /* simple add parameter. Sense of negotiation is already checked */ \ llc_data->u->xid_tag |= (0x00000001L << P); \ @@ -364,7 +364,7 @@ else \ { \ /* Sense of negotiation compared with current values */ \ - if (llc_data->u->requested_xid.##V##.value S *(llc_data->##V)) \ + if (llc_data->u->requested_xid.V.value S *(llc_data->V)) \ { \ llc_data->u->xid_tag |= (0x00000001L << P); \ } \