From 44980347f308fe5bbe48a933dbc81b82b53d310a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 20 May 2014 09:14:00 +0200 Subject: sysmobts: Have a common prefix for the enum Make the manuf_type_id enum have a common prefix for the symbols. --- src/osmo-bts-sysmo/misc/sysmobts_misc.c | 2 +- src/osmo-bts-sysmo/utils.c | 4 ++-- src/osmo-bts-sysmo/utils.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osmo-bts-sysmo/misc/sysmobts_misc.c b/src/osmo-bts-sysmo/misc/sysmobts_misc.c index 2417c3d9..06f0c4c1 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_misc.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_misc.c @@ -98,7 +98,7 @@ static void add_oml_hdr_msg(struct msgb *msg, uint8_t msg_type, foh->obj_inst.ts_nr = ts_nr; if (is_manuf) - add_manufacturer_id_label(msg, OSMOCOM_MANUF_ID); + add_manufacturer_id_label(msg, MANUF_ID_OSMO); msg->l2h = msgb_push(msg, sizeof(*omh)); omh = (struct abis_om_hdr *) msg->l2h; diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c index f674ba0e..01e6f973 100644 --- a/src/osmo-bts-sysmo/utils.c +++ b/src/osmo-bts-sysmo/utils.c @@ -298,12 +298,12 @@ int add_manufacturer_id_label(struct msgb *msg, enum manuf_type_id type_id) uint8_t *manuf; switch (type_id) { - case IPACCESS_MANUF_ID: + case MANUF_ID_IPA: manuf = msgb_push(msg, 1 + sizeof(ipaccess_magic)); manuf[0] = sizeof(ipaccess_magic); memcpy(manuf+1, ipaccess_magic, sizeof(ipaccess_magic)); break; - case OSMOCOM_MANUF_ID: + case MANUF_ID_OSMO: manuf = msgb_push(msg, 1 + sizeof(osmocom_magic)); manuf[0] = sizeof(osmocom_magic); memcpy(manuf+1, osmocom_magic, sizeof(osmocom_magic)); diff --git a/src/osmo-bts-sysmo/utils.h b/src/osmo-bts-sysmo/utils.h index 6b8b7e4d..c38757e3 100644 --- a/src/osmo-bts-sysmo/utils.h +++ b/src/osmo-bts-sysmo/utils.h @@ -17,8 +17,8 @@ int sysmobts_get_power_trx(struct gsm_bts_trx *trx); struct msgb; enum manuf_type_id { - IPACCESS_MANUF_ID, - OSMOCOM_MANUF_ID, + MANUF_ID_IPA, + MANUF_ID_OSMO, }; enum oml_message_type { -- cgit v1.2.3