projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup
[lcr.git]
/
gsm.h
diff --git
a/gsm.h
b/gsm.h
index
00bb295
..
f14794f
100644
(file)
--- a/
gsm.h
+++ b/
gsm.h
@@
-16,8
+16,8
@@
enum {
struct lcr_gsm {
char interface_name[64]; /* name of interface this instance is associated to */
struct lcr_gsm {
char interface_name[64]; /* name of interface this instance is associated to */
- struct lcr_gsm *gsm_
ms_next; /* list of MS instances, in case of MS
*/
- char name[16]; /* name of MS
instance, in case of MS
*/
+ struct lcr_gsm *gsm_
next; /* list of MS/BS instances
*/
+ char name[16]; /* name of MS
/BS instance
*/
int type; /* LCR_GSM_TYPE_*/
struct lcr_fd mncc_lfd; /* Unix domain socket to OpenBSC MNCC */
int type; /* LCR_GSM_TYPE_*/
struct lcr_fd mncc_lfd; /* Unix domain socket to OpenBSC MNCC */
@@
-34,7
+34,6
@@
class Pgsm : public Port
Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface);
~Pgsm();
Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface);
~Pgsm();
- char p_g_interface_name[64];
signed short p_g_samples[160]; /* last received audi packet */
int p_g_tones; /* set, if tones are to be generated */
int p_g_earlyb; /* set, if patterns are available */
signed short p_g_samples[160]; /* last received audi packet */
int p_g_tones; /* set, if tones are to be generated */
int p_g_earlyb; /* set, if patterns are available */
@@
-49,7
+48,10
@@
class Pgsm : public Port
struct lcr_msg *p_g_notify_pending; /* queue for NOTIFY if not connected */
struct lcr_msg *p_g_setup_pending; /* queue SETUP until RTP is created */
struct lcr_msg *p_g_connect_pending; /* queue CONNECT until RTP is created and connected */
struct lcr_msg *p_g_notify_pending; /* queue for NOTIFY if not connected */
struct lcr_msg *p_g_setup_pending; /* queue SETUP until RTP is created */
struct lcr_msg *p_g_connect_pending; /* queue CONNECT until RTP is created and connected */
- void *p_g_encoder, *p_g_decoder; /* gsm handle */
+ void *p_g_fr_encoder, *p_g_fr_decoder; /* gsm handle */
+ void *p_g_hr_encoder, *p_g_hr_decoder; /* gsm handle */
+ void *p_g_amr_encoder, *p_g_amr_decoder;/* gsm handle */
+ int p_g_amr_cmr, p_g_amr_cmr_valid;
signed short p_g_rxdata[160]; /* receive audio buffer */
int p_g_rxpos; /* position in audio buffer 0..159 */
int p_g_tch_connected; /* indicates if audio is connected */
signed short p_g_rxdata[160]; /* receive audio buffer */
int p_g_rxpos; /* position in audio buffer 0..159 */
int p_g_tch_connected; /* indicates if audio is connected */
@@
-63,7
+65,7
@@
class Pgsm : public Port
int p_g_rtp_media_types[8];
unsigned char p_g_rtp_payload_types[8];
int p_g_rtp_media_types[8];
unsigned char p_g_rtp_payload_types[8];
- void frame_send(void *_frame);
+ void frame_send(void *_frame
, int len, int msg_type
);
void frame_receive(void *_frame);
int audio_send(unsigned char *data, int len);
int bridge_rx(unsigned char *data, int len);
void frame_receive(void *_frame);
int audio_send(unsigned char *data, int len);
int bridge_rx(unsigned char *data, int len);