trxcon: get rid of GEN_MASK macro, define it locally
Change-Id: I9504f022ef1767276479f21b8228ac094d28a858
This commit is contained in:
parent
4c83590f1d
commit
c9a801e05c
|
@ -1,7 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define GEN_MASK(state) (0x01 << state)
|
|
||||||
|
|
||||||
struct l1sched_state;
|
struct l1sched_state;
|
||||||
struct trx_instance;
|
struct trx_instance;
|
||||||
struct l1ctl_client;
|
struct l1ctl_client;
|
||||||
|
|
|
@ -45,6 +45,8 @@
|
||||||
#include <osmocom/bb/trxcon/trx_if.h>
|
#include <osmocom/bb/trxcon/trx_if.h>
|
||||||
#include <osmocom/bb/trxcon/logging.h>
|
#include <osmocom/bb/trxcon/logging.h>
|
||||||
|
|
||||||
|
#define S(x) (1 << (x))
|
||||||
|
|
||||||
static struct value_string trx_evt_names[] = {
|
static struct value_string trx_evt_names[] = {
|
||||||
{ 0, NULL } /* no events? */
|
{ 0, NULL } /* no events? */
|
||||||
};
|
};
|
||||||
|
@ -52,8 +54,8 @@ static struct value_string trx_evt_names[] = {
|
||||||
static struct osmo_fsm_state trx_fsm_states[] = {
|
static struct osmo_fsm_state trx_fsm_states[] = {
|
||||||
[TRX_STATE_OFFLINE] = {
|
[TRX_STATE_OFFLINE] = {
|
||||||
.out_state_mask = (
|
.out_state_mask = (
|
||||||
GEN_MASK(TRX_STATE_IDLE) |
|
S(TRX_STATE_IDLE) |
|
||||||
GEN_MASK(TRX_STATE_RSP_WAIT)),
|
S(TRX_STATE_RSP_WAIT)),
|
||||||
.name = "OFFLINE",
|
.name = "OFFLINE",
|
||||||
},
|
},
|
||||||
[TRX_STATE_IDLE] = {
|
[TRX_STATE_IDLE] = {
|
||||||
|
@ -62,15 +64,15 @@ static struct osmo_fsm_state trx_fsm_states[] = {
|
||||||
},
|
},
|
||||||
[TRX_STATE_ACTIVE] = {
|
[TRX_STATE_ACTIVE] = {
|
||||||
.out_state_mask = (
|
.out_state_mask = (
|
||||||
GEN_MASK(TRX_STATE_IDLE) |
|
S(TRX_STATE_IDLE) |
|
||||||
GEN_MASK(TRX_STATE_RSP_WAIT)),
|
S(TRX_STATE_RSP_WAIT)),
|
||||||
.name = "ACTIVE",
|
.name = "ACTIVE",
|
||||||
},
|
},
|
||||||
[TRX_STATE_RSP_WAIT] = {
|
[TRX_STATE_RSP_WAIT] = {
|
||||||
.out_state_mask = (
|
.out_state_mask = (
|
||||||
GEN_MASK(TRX_STATE_IDLE) |
|
S(TRX_STATE_IDLE) |
|
||||||
GEN_MASK(TRX_STATE_ACTIVE) |
|
S(TRX_STATE_ACTIVE) |
|
||||||
GEN_MASK(TRX_STATE_OFFLINE)),
|
S(TRX_STATE_OFFLINE)),
|
||||||
.name = "RSP_WAIT",
|
.name = "RSP_WAIT",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -49,6 +49,8 @@
|
||||||
#include <osmocom/bb/trxcon/l1ctl_proto.h>
|
#include <osmocom/bb/trxcon/l1ctl_proto.h>
|
||||||
#include <osmocom/bb/trxcon/l1sched.h>
|
#include <osmocom/bb/trxcon/l1sched.h>
|
||||||
|
|
||||||
|
#define S(x) (1 << (x))
|
||||||
|
|
||||||
#define COPYRIGHT \
|
#define COPYRIGHT \
|
||||||
"Copyright (C) 2016-2022 by Vadim Yanitskiy <axilirator@gmail.com>\n" \
|
"Copyright (C) 2016-2022 by Vadim Yanitskiy <axilirator@gmail.com>\n" \
|
||||||
"Contributions by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>\n" \
|
"Contributions by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>\n" \
|
||||||
|
@ -288,17 +290,17 @@ static void trxcon_fsm_managed_action(struct osmo_fsm_inst *fi,
|
||||||
|
|
||||||
static struct osmo_fsm_state trxcon_fsm_states[] = {
|
static struct osmo_fsm_state trxcon_fsm_states[] = {
|
||||||
[TRXCON_STATE_IDLE] = {
|
[TRXCON_STATE_IDLE] = {
|
||||||
.in_event_mask = GEN_MASK(L1CTL_EVENT_CONNECT),
|
.in_event_mask = S(L1CTL_EVENT_CONNECT),
|
||||||
.out_state_mask = GEN_MASK(TRXCON_STATE_MANAGED),
|
.out_state_mask = S(TRXCON_STATE_MANAGED),
|
||||||
.name = "IDLE",
|
.name = "IDLE",
|
||||||
.action = trxcon_fsm_idle_action,
|
.action = trxcon_fsm_idle_action,
|
||||||
},
|
},
|
||||||
[TRXCON_STATE_MANAGED] = {
|
[TRXCON_STATE_MANAGED] = {
|
||||||
.in_event_mask = (
|
.in_event_mask = (
|
||||||
GEN_MASK(L1CTL_EVENT_DISCONNECT) |
|
S(L1CTL_EVENT_DISCONNECT) |
|
||||||
GEN_MASK(TRX_EVENT_RSP_ERROR) |
|
S(TRX_EVENT_RSP_ERROR) |
|
||||||
GEN_MASK(TRX_EVENT_OFFLINE)),
|
S(TRX_EVENT_OFFLINE)),
|
||||||
.out_state_mask = GEN_MASK(TRXCON_STATE_IDLE),
|
.out_state_mask = S(TRXCON_STATE_IDLE),
|
||||||
.name = "MANAGED",
|
.name = "MANAGED",
|
||||||
.action = trxcon_fsm_managed_action,
|
.action = trxcon_fsm_managed_action,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue