cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

OM2000: Add IS Conf Req

This commit is contained in:
Harald Welte 2011-02-12 20:23:40 +01:00
parent 0741ffe69f
commit 8bcb1a0a99
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/include/openbsc/abis_om2000.h
View File

@ -29,6 +29,12 @@ struct abis_om2k_mo {
uint8_t inst;
} __attribute__ ((packed));
struct om2k_is_conn_grp {
uint16_t icp1;
uint16_t icp2;
uint8_t cont_idx;
} __attribute__ ((packed));
extern const struct value_string om2k_mo_class_short_vals[];
int abis_om2k_rcvmsg(struct msgb *msg);
@ -45,6 +51,8 @@ int abis_om2k_tx_disable_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo)
int abis_om2k_tx_test_req(struct gsm_bts *bts, const struct abis_om2k_mo *mo);
int abis_om2k_tx_op_info(struct gsm_bts *bts, const struct abis_om2k_mo *mo,
uint8_t operational);
int abis_om2k_tx_is_conf_req(struct gsm_bts *bts, struct om2k_is_conn_grp *cg,
unsigned int num_cg);
int abis_om2k_vty_init(void);

23
openbsc/src/abis_om2000.c
View File

@ -134,6 +134,9 @@ enum abis_om2k_msgtype {
enum abis_om2k_dei {
OM2K_DEI_CAL_TIME = 0x0d,
OM2K_DEI_END_LIST_NR = 0x13,
OM2K_DEI_IS_CONN_LIST = 0x27,
OM2K_DEI_LIST_NR = 0x28,
OM2K_DEI_OP_INFO = 0x2e,
OM2K_DEI_NEGOT_REC1 = 0x90,
OM2K_DEI_NEGOT_REC2 = 0x91,
@ -510,6 +513,7 @@ static char *om2k_mo_name(const struct abis_om2k_mo *mo)
}
const struct abis_om2k_mo om2k_mo_cf = { OM2K_MO_CLS_CF, 0, 0xFF, 0 };
const struct abis_om2k_mo om2k_mo_is = { OM2K_MO_CLS_IS, 0, 0xFF, 0 };
static int abis_om2k_cal_time_resp(struct gsm_bts *bts)
{
@ -607,6 +611,25 @@ int abis_om2k_tx_op_info(struct gsm_bts *bts, const struct abis_om2k_mo *mo,
return abis_om2k_sendmsg(bts, msg);
}
int abis_om2k_tx_is_conf_req(struct gsm_bts *bts, struct om2k_is_conn_grp *cg,
unsigned int num_cg )
{
struct msgb *msg = om2k_msgb_alloc();
struct abis_om2k_hdr *o2k;
o2k = (struct abis_om2k_hdr *) msgb_put(msg, sizeof(*o2k));
fill_om2k_hdr(o2k, &om2k_mo_is, OM2K_MSGT_IS_CONF_REQ,
2 + 2 + TLV_GROSS_LEN(num_cg * sizeof(*cg)));
msgb_tv_put(msg, OM2K_DEI_LIST_NR, 1);
msgb_tv_put(msg, OM2K_DEI_END_LIST_NR, 1);
msgb_tlv_put(msg, OM2K_DEI_IS_CONN_LIST,
num_cg * sizeof(*cg), (uint8_t *)cg);
return abis_om2k_sendmsg(bts, msg);
}
static int abis_om2k_tx_negot_req_ack(struct gsm_bts *bts, const struct abis_om2k_mo *mo,
uint8_t *data, unsigned int len)
{

23
openbsc/src/abis_om2000_vty.c
View File

@ -227,6 +227,28 @@ DEFUN(om2k_test, om2k_test_cmd,
return CMD_SUCCESS;
}
static void om2k_fill_is_conn_grp(struct om2k_is_conn_grp *grp, uint16_t icp1,
uint16_t icp2, uint8_t cont_idx)
{
grp->icp1 = htons(icp1);
grp->icp2 = htons(icp2);
grp->cont_idx = cont_idx;
}
DEFUN(om2k_is_conf_req, om2k_is_conf_req_cmd,
"is-conf-req",
"IS Configuration Request\n")
{
struct oml_node_state *oms = vty->index;
struct om2k_is_conn_grp grps[3];
om2k_fill_is_conn_grp(&grps[0], 512, 4, 4);
om2k_fill_is_conn_grp(&grps[1], 516, 8, 4);
om2k_fill_is_conn_grp(&grps[2], 520, 12, 4);
abis_om2k_tx_is_conf_req(oms->bts, grps, ARRAY_SIZE(grps));
return CMD_SUCCESS;
}
int abis_om2k_vty_init(void)
{
@ -245,6 +267,7 @@ int abis_om2k_vty_init(void)
install_element(OM2K_NODE, &om2k_disable_cmd);
install_element(OM2K_NODE, &om2k_op_info_cmd);
install_element(OM2K_NODE, &om2k_test_cmd);
install_element(OM2K_NODE, &om2k_is_conf_req_cmd);
return 0;
}