diff options
author | Philipp Maier <pmaier@sysmocom.de> | 2018-03-01 15:46:59 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-03-05 17:38:09 +0000 |
commit | 4e959b2aa06c98a8b8cad953d7baac1271f87bf0 (patch) | |
tree | 5520e6388ed32f42ee07027dbb28fcd599d11d80 /src | |
parent | 1ef544ea246a73ef4404cb9622ca41fbe8e0b76b (diff) |
l1_tch: remove dead code
the file l1_tch.c in the octphy spcific code has its root in the
tch.c file of sysmobts. It contains some sysmobts specific ifdefs
which enclose dead code.
- Remove the sysmobts specif ifdefs and the dead code
Change-Id: I33f3e0fd293ca8387fddf5ed20f642621e9680de
Diffstat (limited to 'src')
-rw-r--r-- | src/osmo-bts-octphy/l1_tch.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/src/osmo-bts-octphy/l1_tch.c b/src/osmo-bts-octphy/l1_tch.c index eee24aa4..df0469dd 100644 --- a/src/osmo-bts-octphy/l1_tch.c +++ b/src/osmo-bts-octphy/l1_tch.c @@ -47,11 +47,6 @@ struct msgb *l1_to_rtppayload_fr(uint8_t *l1_payload, uint8_t payload_len) if (!msg) return NULL; -#ifdef USE_L1_RTP_MODE - /* new L1 can deliver bits like we need them */ - cur = msgb_put(msg, GSM_FR_BYTES); - memcpy(cur, l1_payload, GSM_FR_BYTES); -#else /* step1: reverse the bit-order of each payload byte */ osmo_revbytebits_buf(l1_payload, payload_len); @@ -61,7 +56,6 @@ struct msgb *l1_to_rtppayload_fr(uint8_t *l1_payload, uint8_t payload_len) osmo_nibble_shift_right(cur, l1_payload, GSM_FR_BITS / 4); cur[0] |= 0xD0; -#endif /* USE_L1_RTP_MODE */ return msg; } @@ -75,58 +69,14 @@ struct msgb *l1_to_rtppayload_fr(uint8_t *l1_payload, uint8_t payload_len) int rtppayload_to_l1_fr(uint8_t *l1_payload, const uint8_t *rtp_payload, unsigned int payload_len) { -#ifdef USE_L1_RTP_MODE - /* new L1 can deliver bits like we need them */ - memcpy(l1_payload, rtp_payload, GSM_FR_BYTES); -#else /* step2: we need to shift the RTP payload left by one nibble */ osmo_nibble_shift_left_unal(l1_payload, rtp_payload, GSM_FR_BITS / 4); /* step1: reverse the bit-order of each payload byte */ osmo_revbytebits_buf(l1_payload, payload_len); -#endif /* USE_L1_RTP_MODE */ return GSM_FR_BYTES; } -static struct msgb *l1_to_rtppayload_efr(uint8_t *l1_payload, uint8_t payload_len) -{ - struct msgb *msg; - uint8_t *cur; - - msg = msgb_alloc_headroom(1024, 128, "L1P-to-RTP"); - if (!msg) - return NULL; - -#ifdef USE_L1_RTP_MODE - /* new L1 can deliver bits like we need them */ - cur = msgb_put(msg, GSM_EFR_BYTES); - memcpy(cur, l1_payload, GSM_EFR_BYTES); -#else - /* step1: reverse the bit-order of each payload byte */ - osmo_revbytebits_buf(l1_payload, payload_len); - - cur = msgb_put(msg, GSM_EFR_BYTES); - - /* step 2: we need to shift the entire L1 payload by 4 bits right */ - osmo_nibble_shift_right(cur, l1_payload, GSM_EFR_BITS/4); - - cur[0] |= 0xC0; -#endif /* USE_L1_RTP_MODE */ - return msg; -} - -static int rtppayload_to_l1_efr(uint8_t *l1_payload, const uint8_t *rtp_payload, - unsigned int payload_len) -{ -#ifndef USE_L1_RTP_MODE -#warning "We don't support EFR with L1 that doesn't support RTP mode!" -#else - memcpy(l1_payload, rtp_payload, payload_len); - -#endif - return payload_len; -} - static struct msgb *l1_to_rtppayload_hr(uint8_t *l1_payload, uint8_t payload_len) { struct msgb *msg; @@ -145,10 +95,8 @@ static struct msgb *l1_to_rtppayload_hr(uint8_t *l1_payload, uint8_t payload_len cur = msgb_put(msg, GSM_HR_BYTES); memcpy(cur, l1_payload, GSM_HR_BYTES); -#ifndef USE_L1_RTP_MODE /* reverse the bit-order of each payload byte */ osmo_revbytebits_buf(cur, GSM_HR_BYTES); -#endif /* USE_L1_RTP_MODE */ return msg; } @@ -171,10 +119,8 @@ static int rtppayload_to_l1_hr(uint8_t *l1_payload, const uint8_t *rtp_payload, memcpy(l1_payload, rtp_payload, GSM_HR_BYTES); -#ifndef USE_L1_RTP_MODE /* reverse the bit-order of each payload byte */ osmo_revbytebits_buf(l1_payload, GSM_HR_BYTES); -#endif /* USE_L1_RTP_MODE */ return GSM_HR_BYTES; } @@ -315,18 +261,8 @@ void l1if_tch_encode(struct gsm_lchan *lchan, uint32_t *payload_type, break; case GSM48_CMODE_SPEECH_EFR: /* Not supported currently */ -#if 0 - *payload_type = cOCTVC1_GSM_PAYLOAD_TYPE_ENUM_EFR; - rc = rtppayload_to_l1_efr(l1_payload, rtp_pl, rtp_pl_len); - break; -#endif case GSM48_CMODE_SPEECH_AMR: /* Not supported currently */ -#if 0 - *payload_type = cOCTVC1_GSM_PAYLOAD_TYPE_ENUM_AMR; - rc = rtppayload_to_l1_amr(l1_payload, rtp_pl, rtp_pl_len); - break; -#endif LOGP(DRTP, LOGL_ERROR, "OctPHY only supports FR!\n"); default: /* we don't support CSD modes */ |