[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to

2023-10-30 Thread fixeria 
fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )

Change subject: mobile: move 'struct gsm_call' from  to 
..

mobile: move 'struct gsm_call' from  to 

The only file using this structure is mnccms.c.

Change-Id: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/mobile/mncc.h
M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
2 files changed, 38 insertions(+), 19 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved




diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h 
b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index f587e1f..d6facbb 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -21,27 +21,8 @@

 #pragma once

-#include 
-#include 
 #include 

-struct gsm_call {
-   struct llist_head   entry;
-
-   struct osmocom_ms   *ms;
-
-   uint32_tcallref;
-
-   boolinit; /* call initiated, no response yet */
-   boolhold; /* call on hold */
-   boolring; /* call ringing/knocking */
-
-   struct osmo_timer_list  dtmf_timer;
-   uint8_t dtmf_state;
-   uint8_t dtmf_index;
-   chardtmf[32]; /* dtmf sequence */
-};
-
 #define DTMF_ST_IDLE   0   /* no DTMF active */
 #define DTMF_ST_START  1   /* DTMF started, waiting for resp. */
 #define DTMF_ST_MARK   2   /* wait tone duration */
@@ -127,6 +108,8 @@
 #define MNCC_F_KEYPAD  0x1000
 #define MNCC_F_SIGNAL  0x2000

+struct osmocom_ms;
+
 struct gsm_mncc {
/* context based information */
uint32_tmsg_type;
diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h 
b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
index 705c681..4006688 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
@@ -1,5 +1,29 @@
 #pragma once

+#include 
+
+#include 
+#include 
+
+struct osmocom_ms;
+
+struct gsm_call {
+   struct llist_head   entry;
+
+   struct osmocom_ms   *ms;
+
+   uint32_tcallref;
+
+   boolinit; /* call initiated, no response yet */
+   boolhold; /* call on hold */
+   boolring; /* call ringing/knocking */
+
+   struct osmo_timer_list  dtmf_timer;
+   uint8_t dtmf_state;
+   uint8_t dtmf_index;
+   chardtmf[32]; /* dtmf sequence */
+};
+
 int mncc_call(struct osmocom_ms *ms, const char *number);
 int mncc_hangup(struct osmocom_ms *ms);
 int mncc_answer(struct osmocom_ms *ms);

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Gerrit-Change-Number: 34910
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to

2023-10-30 Thread pespin 
Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )

Change subject: mobile: move 'struct gsm_call' from  to 
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Gerrit-Change-Number: 34910
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Mon, 30 Oct 2023 09:45:46 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to

2023-10-30 Thread laforge 
Attention is currently required from: fixeria.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )

Change subject: mobile: move 'struct gsm_call' from  to 
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Gerrit-Change-Number: 34910
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Mon, 30 Oct 2023 08:41:33 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmocom-bb[master]: mobile: move 'struct gsm_call' from to

2023-10-30 Thread fixeria 
fixeria has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )


Change subject: mobile: move 'struct gsm_call' from  to 
..

mobile: move 'struct gsm_call' from  to 

The only file using this structure is mnccms.c.

Change-Id: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/mobile/mncc.h
M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
2 files changed, 38 insertions(+), 19 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/34910/1

diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h 
b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index f587e1f..d6facbb 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -21,27 +21,8 @@

 #pragma once

-#include 
-#include 
 #include 

-struct gsm_call {
-   struct llist_head   entry;
-
-   struct osmocom_ms   *ms;
-
-   uint32_tcallref;
-
-   boolinit; /* call initiated, no response yet */
-   boolhold; /* call on hold */
-   boolring; /* call ringing/knocking */
-
-   struct osmo_timer_list  dtmf_timer;
-   uint8_t dtmf_state;
-   uint8_t dtmf_index;
-   chardtmf[32]; /* dtmf sequence */
-};
-
 #define DTMF_ST_IDLE   0   /* no DTMF active */
 #define DTMF_ST_START  1   /* DTMF started, waiting for resp. */
 #define DTMF_ST_MARK   2   /* wait tone duration */
@@ -127,6 +108,8 @@
 #define MNCC_F_KEYPAD  0x1000
 #define MNCC_F_SIGNAL  0x2000

+struct osmocom_ms;
+
 struct gsm_mncc {
/* context based information */
uint32_tmsg_type;
diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h 
b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
index 705c681..4006688 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h
@@ -1,5 +1,29 @@
 #pragma once

+#include 
+
+#include 
+#include 
+
+struct osmocom_ms;
+
+struct gsm_call {
+   struct llist_head   entry;
+
+   struct osmocom_ms   *ms;
+
+   uint32_tcallref;
+
+   boolinit; /* call initiated, no response yet */
+   boolhold; /* call on hold */
+   boolring; /* call ringing/knocking */
+
+   struct osmo_timer_list  dtmf_timer;
+   uint8_t dtmf_state;
+   uint8_t dtmf_index;
+   chardtmf[32]; /* dtmf sequence */
+};
+
 int mncc_call(struct osmocom_ms *ms, const char *number);
 int mncc_hangup(struct osmocom_ms *ms);
 int mncc_answer(struct osmocom_ms *ms);

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34910?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: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49
Gerrit-Change-Number: 34910
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-MessageType: newchange