laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35587?usp=email )
Change subject: isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110
......................................................................
isdn: add a lookup table with E1/E2/E3 bits from Table 5/V.110
Let's make those E1/E2/E3 bit combinations publicly available in
form of a lookup table (key is enum osmo_v100_sync_ra1_rate).
Add convenience macros for setting and comparing these bits.
This lookup table will be used by osmocom-bb.git.
Change-Id: I6d2f8e250df31c233a2741163113dc07515409ae
Related: OS#4396
---
M include/osmocom/isdn/v110.h
M src/isdn/libosmoisdn.map
M src/isdn/v110.c
3 files changed, 57 insertions(+), 27 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmocom/isdn/v110.h b/include/osmocom/isdn/v110.h
index 4c1214c..9555932 100644
--- a/include/osmocom/isdn/v110.h
+++ b/include/osmocom/isdn/v110.h
@@ -39,6 +39,13 @@
_NUM_OSMO_V110_SYNC_RA1
};
+extern const ubit_t osmo_v110_e1e2e3[_NUM_OSMO_V110_SYNC_RA1][3];
+
+#define osmo_v110_e1e2e3_set(e_bits, rate) \
+ memcpy(e_bits, osmo_v110_e1e2e3[rate], 3)
+#define osmo_v110_e1e2e3_cmp(e_bits, rate) \
+ memcmp(e_bits, osmo_v110_e1e2e3[rate], 3)
+
int osmo_v110_sync_ra1_get_user_data_chunk_bitlen(enum osmo_v100_sync_ra1_rate
rate);
int osmo_v110_sync_ra1_get_user_data_rate(enum osmo_v100_sync_ra1_rate rate);
int osmo_v110_sync_ra1_get_intermediate_rate(enum osmo_v100_sync_ra1_rate
rate);
diff --git a/src/isdn/libosmoisdn.map b/src/isdn/libosmoisdn.map
index fe6628b..8f34f0d 100644
--- a/src/isdn/libosmoisdn.map
+++ b/src/isdn/libosmoisdn.map
@@ -27,6 +27,7 @@
osmo_v110_decode_frame;
osmo_v110_encode_frame;
osmo_v110_ubit_dump;
+osmo_v110_e1e2e3;
osmo_v110_sync_ra1_get_user_data_chunk_bitlen;
osmo_v110_sync_ra1_get_user_data_rate;
osmo_v110_sync_ra1_get_intermediate_rate;
diff --git a/src/isdn/v110.c b/src/isdn/v110.c
index 46962bf..b4bc4e3 100644
--- a/src/isdn/v110.c
+++ b/src/isdn/v110.c
@@ -143,6 +143,22 @@
/* I actually couldn't find any reference as to the value of F(ill) bits */
#define F 1
+/*! E1/E2/E3 bit values as per Table 5/V.110 */
+const ubit_t osmo_v110_e1e2e3[_NUM_OSMO_V110_SYNC_RA1][3] = {
+ [OSMO_V110_SYNC_RA1_600] = { 1, 0, 0 },
+ [OSMO_V110_SYNC_RA1_1200] = { 0, 1, 0 },
+ [OSMO_V110_SYNC_RA1_2400] = { 1, 1, 0 },
+ [OSMO_V110_SYNC_RA1_4800] = { 0, 1, 1 },
+ [OSMO_V110_SYNC_RA1_7200] = { 1, 0, 1 },
+ [OSMO_V110_SYNC_RA1_9600] = { 0, 1, 1 },
+ [OSMO_V110_SYNC_RA1_12000] = { 0, 0, 1 },
+ [OSMO_V110_SYNC_RA1_14400] = { 1, 0, 1 },
+ [OSMO_V110_SYNC_RA1_19200] = { 0, 1, 1 },
+ [OSMO_V110_SYNC_RA1_24000] = { 0, 0, 1 },
+ [OSMO_V110_SYNC_RA1_28800] = { 1, 0, 1 },
+ [OSMO_V110_SYNC_RA1_38400] = { 0, 1, 1 },
+};
+
/*! Adapt from 6 synchronous 600bit/s input bits to a decoded V.110 frame.
* \param[out] fr caller-allocated output frame to which E+D bits are stored
* \param[in] d_in input user bits
@@ -154,9 +170,7 @@
return -EINVAL;
/* Table 6a / V.110 */
- fr->e_bits[0] = 1;
- fr->e_bits[1] = 0;
- fr->e_bits[2] = 0;
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_600);
for (int i = 0; i < 6; i++)
memset(fr->d_bits + i*8, d_in[i], 8);
@@ -168,7 +182,7 @@
if (out_len < 6)
return -ENOSPC;
- if (fr->e_bits[0] != 1 || fr->e_bits[1] != 0 || fr->e_bits[2] != 0)
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_600))
return -EINVAL;
for (int i = 0; i < 6; i++) {
@@ -190,9 +204,7 @@
return -EINVAL;
/* Table 6b / V.110 */
- fr->e_bits[0] = 0;
- fr->e_bits[1] = 1;
- fr->e_bits[2] = 0;
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_1200);
for (int i = 0; i < 12; i++)
memset(fr->d_bits + i*4, d_in[i], 4);
@@ -204,7 +216,7 @@
if (out_len < 12)
return -ENOSPC;
- if (fr->e_bits[0] != 0 || fr->e_bits[1] != 1 || fr->e_bits[2] != 0)
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_1200))
return -EINVAL;
for (int i = 0; i < 12; i++) {
@@ -226,9 +238,7 @@
return -EINVAL;
/* Table 6c / V.110 */
- fr->e_bits[0] = 1;
- fr->e_bits[1] = 1;
- fr->e_bits[2] = 0;
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_2400);
for (int i = 0; i < 24; i++) {
fr->d_bits[i*2 + 0] = d_in[i];
fr->d_bits[i*2 + 1] = d_in[i];
@@ -243,7 +253,7 @@
return -ENOSPC;
/* Table 6c / V.110 */
- if (fr->e_bits[0] != 1 || fr->e_bits[1] != 1 || fr->e_bits[2] != 0)
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_2400))
return -EINVAL;
for (int i = 0; i < 24; i++) {
@@ -266,10 +276,8 @@
if (in_len != 36)
return -EINVAL;
- /* Table 6d / V.110 */
- fr->e_bits[0] = 1;
- fr->e_bits[1] = 0;
- fr->e_bits[2] = 1;
+ /* Table 6d / V.110 (7200 is one of Nx3600) */
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_7200);
memcpy(fr->d_bits + d_idx, d_in + 0, 10); d_idx += 10; /* D1..D10 */
memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
@@ -297,7 +305,8 @@
if (out_len < 36)
return -ENOSPC;
- if (fr->e_bits[0] != 1 || fr->e_bits[1] != 0 || fr->e_bits[2] != 1)
+ /* Table 6d / V.110 (7200 is one of Nx3600) */
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_7200))
return -EINVAL;
memcpy(d_out + 0, fr->d_bits + d_idx, 10); d_idx += 10; /* D1..D10 */
@@ -330,10 +339,8 @@
if (in_len != 48)
return -EINVAL;
- /* Table 6e / V.110 */
- fr->e_bits[0] = 0;
- fr->e_bits[1] = 1;
- fr->e_bits[2] = 1;
+ /* Table 6e / V.110 (4800 is one of Nx4800) */
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_4800);
memcpy(fr->d_bits, d_in, 48);
@@ -345,7 +352,8 @@
if (out_len < 48)
return -ENOSPC;
- if (fr->e_bits[0] != 0 || fr->e_bits[1] != 1 || fr->e_bits[2] != 1)
+ /* Table 6e / V.110 (4800 is one of Nx4800) */
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_4800))
return -EINVAL;
memcpy(d_out, fr->d_bits, 48);
@@ -365,10 +373,8 @@
if (in_len != 30)
return -EINVAL;
- /* Table 6f / V.110 */
- fr->e_bits[0] = 0;
- fr->e_bits[1] = 0;
- fr->e_bits[2] = 1;
+ /* Table 6f / V.110 (12000 is one of Nx12000) */
+ osmo_v110_e1e2e3_set(fr->e_bits, OSMO_V110_SYNC_RA1_12000);
memcpy(fr->d_bits + d_idx, d_in + 0, 10); d_idx += 10; /* D1..D10 */
memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
@@ -399,7 +405,8 @@
if (out_len < 30)
return -ENOSPC;
- if (fr->e_bits[0] != 0 || fr->e_bits[1] != 0 || fr->e_bits[2] != 1)
+ /* Table 6f / V.110 (12000 is one of Nx12000) */
+ if (osmo_v110_e1e2e3_cmp(fr->e_bits, OSMO_V110_SYNC_RA1_12000))
return -EINVAL;
memcpy(d_out + 0, fr->d_bits + d_idx, 10); d_idx += 10; /* D1..D10 */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35587?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6d2f8e250df31c233a2741163113dc07515409ae
Gerrit-Change-Number: 35587
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
