[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email )
Change subject: ASCI: Add a flag to turn transmitter off or on
..
ASCI: Add a flag to turn transmitter off or on
This flag can be used to turn transmitter off for "group receive mode"
or for handover procedure. The flag is stored in the channel description
of the mobile application. It is sent to layer 1 when switching to
dedicated channel or when changing TCH mode.
At the layer 1 the transmitter is turned off while the receiver is still
active. This is done by:
* scheduling a TX dummy task for TCH bursts
* scheduling no TX task for SACCH bursts
* not enabling the transmit window
Related: OS#5364
Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3
---
M include/l1ctl_proto.h
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/include/osmocom/bb/common/osmocom_data.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/common/l1ctl.c
M src/host/layer23/src/misc/app_cbch_sniff.c
M src/host/layer23/src/mobile/gsm414.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/modem/grr.c
M src/target/firmware/include/layer1/async.h
M src/target/firmware/include/layer1/sync.h
M src/target/firmware/layer1/async.c
M src/target/firmware/layer1/l23_api.c
M src/target/firmware/layer1/prim_tch.c
14 files changed, 92 insertions(+), 42 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/34479/1
diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 3512424..ab37746 100644
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -140,6 +140,7 @@
struct l1ctl_tch_mode_conf {
uint8_t tch_mode; /* enum tch_mode */
uint8_t audio_mode;
+ uint8_t tch_flags;
uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */
struct { /* 3GPP TS 08.58 9.3.52, 3GPP TS 44.018 10.5.2.21aa */
uint8_t start_codec;
@@ -213,6 +214,7 @@
#define AUDIO_RX_SPEAKER (1<<2)
#define AUDIO_RX_TRAFFIC_IND (1<<3)
uint8_t audio_mode;
+ uint8_t tch_flags;
uint8_t tch_loop_mode; /* enum l1ctl_tch_loop_mode */
struct { /* 3GPP TS 08.58 9.3.52, 3GPP TS 44.018 10.5.2.21aa */
uint8_t start_codec;
@@ -220,6 +222,8 @@
} amr;
} __attribute__((packed));
+#define L1CTL_TCH_FLAG_RXONLY (1<<0) /* TX disabled */
+
/* the l1_info_ul header is in front */
struct l1ctl_rach_req {
uint8_t ra;
@@ -264,6 +268,7 @@
};
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
} __attribute__((packed));
struct l1ctl_dm_freq_req {
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 25bc6e8..fbfb766 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -26,11 +26,10 @@
uint8_t ra, uint16_t offset, uint8_t combined);
/* Transmit L1CTL_DM_EST_REQ */
-int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
- uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode, uint8_t audio_mode);
-int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
- uint16_t *ma, uint8_t ma_len, uint8_t chan_nr, uint8_t tsc,
- uint8_t tch_mode, uint8_t audio_mode);
+int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn, uint8_t
chan_nr, uint8_t tsc,
+ uint8_t tch_mode, uint8_t audio_mode, uint8_t
tch_flags);
+int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
uint16_t *ma, uint8_t ma_len,
+ uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode,
uint8_t audio_mode, uint8_t tch_flags);
/* Transmit L1CTL_DM_FREQ_REQ */
int l1ctl_tx_dm_freq_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
@@ -50,8 +49,8 @@
int l1ctl_tx_ccch_mode_req(struct osmocom_ms *ms, uint8_t ccch_mode);
/* Transmit TCH_MODE_REQ */
-int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode,
- uint8_t audio_mode, uint8_t tch_loop_mode);
+int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, uint8_t
audio_mode, uint8_t tch_flags,
+ uint8_t tch_loop_mode);
/* Transmit ECHO_REQ */
int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len);
diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 3e5c13a..60e12df 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -83,6 +83,7 @@
struct osmocom_ms *ms;
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
};
struct osmobb_neigh_pm_ind {
diff --git a/src/host/layer23/includ
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 1: (2 comments) File src/host/layer23/src/common/l1ctl.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11163): https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/cde6d862_9bff186e PS1, Line 569:uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode, uint8_t audio_mode, uint8_t tch_flags) code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11163): https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/5a8a8034_34cb028a PS1, Line 569:uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode, uint8_t audio_mode, uint8_t tch_flags) please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Sep 2023 09:39:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ASCI: Add a flag to turn transmitter off or on .. ASCI: Add a flag to turn transmitter off or on This flag can be used to turn transmitter off for "group receive mode" or for handover procedure. The flag is stored in the channel description of the mobile application. It is sent to layer 1 when switching to dedicated channel or when changing TCH mode. At the layer 1 the transmitter is turned off while the receiver is still active. This is done by: * scheduling a TX dummy task for TCH bursts * scheduling no TX task for SACCH bursts * not enabling the transmit window Related: OS#5364 Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/misc/app_cbch_sniff.c M src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/modem/grr.c M src/target/firmware/include/layer1/async.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/async.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_tch.c 14 files changed, 92 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/34479/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 5: (2 comments) File include/l1ctl_proto.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/4e84bd6c_f5eaf139 PS5, Line 217: uint8_t tch_flags; this means we probably need to update the L1CTL implementations everywhere, eg TTCN3. Do we have some versioning of the proto? maybe move it to the end? File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/9b358913_e98ba6f4 PS5, Line 3042: LOGP(DRR, LOGL_INFO, " Channel type %d, subch %d, ts %d, mode %d, audio-mode %d, flags %d, cipher %d\n", you most probably want to print flags with 0x02%x here -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 21 Sep 2023 12:36:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: jolly, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email )
Change subject: ASCI: Add a flag to turn transmitter off or on
..
Patch Set 5: Code-Review-1
(2 comments)
Patchset:
PS5:
Looks good to me in general, however the L1CTL backwards compatibility needs to
be kept IMO.
File include/l1ctl_proto.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/f26a6b1b_89c286d9
PS5, Line 217: uint8_t tch_flags;
> this means we probably need to update the L1CTL implementations everywhere,
> eg TTCN3. […]
Indeed, adding a new field in the middle of the message is not a good idea
because it would create compatibility issues. Adding new fields at the end is
safer: the peer speaking an older L1CTL version would simply ignore them.
Also, I think I already proposed it during the Jitsi call, we could just re-use
spare bits of the existing `audio_mode` field? Currently only 4 out of 8 are
used by `AUDIO_{RX,TX}_*`. We could even rename it to `tch_flags`.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3
Gerrit-Change-Number: 34479
Gerrit-PatchSet: 5
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-CC: pespin
Gerrit-Attention: jolly
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 21 Sep 2023 21:49:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 5: (1 comment) File include/l1ctl_proto.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/f3f8ff3f_8830d836 PS5, Line 217: uint8_t tch_flags; > Do we have some versioning of the proto? No. AFAIR, there were patches implementing the versioning in some branch. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 21 Sep 2023 21:51:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, jolly, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: ASCI: Add a flag to turn transmitter off or on .. ASCI: Add a flag to turn transmitter off or on This flag can be used to turn transmitter off for "group receive mode" or for handover procedure. The flag is stored in the channel description of the mobile application. It is sent to layer 1 when switching to dedicated channel or when changing TCH mode. At the layer 1 the transmitter is turned off while the receiver is still active. This is done by: * scheduling a TX dummy task for TCH bursts * scheduling no TX task for SACCH bursts * not enabling the transmit window Related: OS#5364 Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/misc/app_cbch_sniff.c M src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/modem/grr.c M src/target/firmware/include/layer1/async.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/async.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_tch.c 14 files changed, 92 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/34479/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 6: (2 comments) File include/l1ctl_proto.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/baa63a70_3aa3bc44 PS5, Line 217: uint8_t tch_flags; > > Do we have some versioning of the proto? […] I decided to move the tch_flags to the end of the structures. I could add the L1CTL_TCH_FLAG_RXONLY to the audio_mode, but it is not audio related. It turns the transmitter off for both TCH and SACCH frames. File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/1d26f999_83a411a2 PS5, Line 3042: LOGP(DRR, LOGL_INFO, " Channel type %d, subch %d, ts %d, mode %d, audio-mode %d, flags %d, cipher %d\n", > you most probably want to print flags with 0x02%x here Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 26 Sep 2023 10:25:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASCI: Add a flag to turn transmitter off or on .. ASCI: Add a flag to turn transmitter off or on This flag can be used to turn transmitter off for "group receive mode" or for handover procedure. The flag is stored in the channel description of the mobile application. It is sent to layer 1 when switching to dedicated channel or when changing TCH mode. At the layer 1 the transmitter is turned off while the receiver is still active. This is done by: * scheduling a TX dummy task for TCH bursts * scheduling no TX task for SACCH bursts * not enabling the transmit window Related: OS#5364 Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 --- M include/l1ctl_proto.h M src/host/layer23/include/osmocom/bb/common/l1ctl.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/common/l1ctl.c M src/host/layer23/src/misc/app_cbch_sniff.c M src/host/layer23/src/mobile/gsm414.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/modem/grr.c M src/target/firmware/include/layer1/async.h M src/target/firmware/include/layer1/sync.h M src/target/firmware/layer1/async.c M src/target/firmware/layer1/l23_api.c M src/target/firmware/layer1/prim_tch.c 14 files changed, 92 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/34479/7 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 26 Sep 2023 11:38:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 26 Sep 2023 13:55:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email ) Change subject: ASCI: Add a flag to turn transmitter off or on .. Patch Set 7: Code-Review+2 (1 comment) File include/l1ctl_proto.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34479/comment/90ecf100_14a41550 PS5, Line 217: uint8_t tch_flags; > I decided to move the tch_flags to the end of the structures. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3 Gerrit-Change-Number: 34479 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 26 Sep 2023 13:58:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add a flag to turn transmitter off or on
jolly has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34479?usp=email )
Change subject: ASCI: Add a flag to turn transmitter off or on
..
ASCI: Add a flag to turn transmitter off or on
This flag can be used to turn transmitter off for "group receive mode"
or for handover procedure. The flag is stored in the channel description
of the mobile application. It is sent to layer 1 when switching to
dedicated channel or when changing TCH mode.
At the layer 1 the transmitter is turned off while the receiver is still
active. This is done by:
* scheduling a TX dummy task for TCH bursts
* scheduling no TX task for SACCH bursts
* not enabling the transmit window
Related: OS#5364
Change-Id: I20133523adc3b204cd2181bfe664fe66020a10e3
---
M include/l1ctl_proto.h
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/include/osmocom/bb/common/osmocom_data.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/src/common/l1ctl.c
M src/host/layer23/src/misc/app_cbch_sniff.c
M src/host/layer23/src/mobile/gsm414.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/modem/grr.c
M src/target/firmware/include/layer1/async.h
M src/target/firmware/include/layer1/sync.h
M src/target/firmware/layer1/async.c
M src/target/firmware/layer1/l23_api.c
M src/target/firmware/layer1/prim_tch.c
14 files changed, 92 insertions(+), 42 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h
index 8bf44cf..2bdb560 100644
--- a/include/l1ctl_proto.h
+++ b/include/l1ctl_proto.h
@@ -146,6 +146,7 @@
uint8_t start_codec;
uint8_t codecs_bitmask;
} amr;
+ uint8_t tch_flags;
} __attribute__((packed));
/* data on the CCCH was found. This is following the header */
@@ -219,8 +220,11 @@
uint8_t start_codec;
uint8_t codecs_bitmask;
} amr;
+ uint8_t tch_flags;
} __attribute__((packed));
+#define L1CTL_TCH_FLAG_RXONLY (1<<0) /* TX disabled */
+
/* the l1_info_ul header is in front */
struct l1ctl_rach_req {
uint8_t ra;
@@ -265,6 +269,7 @@
};
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
} __attribute__((packed));
struct l1ctl_dm_freq_req {
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 40b3159..d49e16d 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -26,11 +26,10 @@
uint8_t ra, uint16_t offset, uint8_t combined);
/* Transmit L1CTL_DM_EST_REQ */
-int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
- uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode, uint8_t audio_mode);
-int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
- uint16_t *ma, uint8_t ma_len, uint8_t chan_nr, uint8_t tsc,
- uint8_t tch_mode, uint8_t audio_mode);
+int l1ctl_tx_dm_est_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn, uint8_t
chan_nr, uint8_t tsc,
+ uint8_t tch_mode, uint8_t audio_mode, uint8_t
tch_flags);
+int l1ctl_tx_dm_est_req_h1(struct osmocom_ms *ms, uint8_t maio, uint8_t hsn,
uint16_t *ma, uint8_t ma_len,
+ uint8_t chan_nr, uint8_t tsc, uint8_t tch_mode,
uint8_t audio_mode, uint8_t tch_flags);
/* Transmit L1CTL_DM_FREQ_REQ */
int l1ctl_tx_dm_freq_req_h0(struct osmocom_ms *ms, uint16_t band_arfcn,
@@ -50,8 +49,8 @@
int l1ctl_tx_ccch_mode_req(struct osmocom_ms *ms, uint8_t ccch_mode);
/* Transmit TCH_MODE_REQ */
-int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode,
- uint8_t audio_mode, uint8_t tch_loop_mode);
+int l1ctl_tx_tch_mode_req(struct osmocom_ms *ms, uint8_t tch_mode, uint8_t
audio_mode, uint8_t tch_flags,
+ uint8_t tch_loop_mode);
/* Transmit ECHO_REQ */
int l1ctl_tx_echo_req(struct osmocom_ms *ms, unsigned int len);
diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
index 3e5c13a..60e12df 100644
--- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
+++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h
@@ -83,6 +83,7 @@
struct osmocom_ms *ms;
uint8_t tch_mode;
uint8_t audio_mode;
+ uint8_t tch_flags;
};
struct osmobb_neigh_pm_ind {
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index ae9b867..299b6e5 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/o
