diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-08-19 18:43:38 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-08-19 18:43:38 +0200 |
| commit | 4e862cbf4b3b438a07ea89438f4384bd10468ea9 (patch) | |
| tree | 9e9cc25a91a7b1095566f6375deb3fc449cdc522 /tests | |
| parent | 7e0d006e3c7f163cf1e3621d77a7366a5a7e828a (diff) | |
e1_input: rework configuration of virtual E1 line operations
struct e1inp_line_ops {
- enum e1inp_line_role role;
- char *addr;
- void *data;
+ union {
+ struct {
+ enum e1inp_line_role role; /* BSC or BTS mode. */
+ const char *addr; /* IP address .*/
+ void *dev; /* device parameters. */
+ } ipa;
+ struct {
+ const char *port; /* e.g. /dev/ttyUSB0 */
+ unsigned int delay;
+ } rs232;
+ } cfg;
Now this structure contains the configuration details for the
virtual E1 line, instead of using a pointer.
This also get the line_update callback to its original layout:
+ int (*line_update)(struct e1inp_line *line);
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/e1inp_hsl_bsc_test.c | 8 | ||||
| -rw-r--r-- | tests/e1inp_hsl_bts_test.c | 10 | ||||
| -rw-r--r-- | tests/e1inp_ipa_bsc_test.c | 8 | ||||
| -rw-r--r-- | tests/e1inp_ipa_bts_test.c | 10 |
4 files changed, 26 insertions, 10 deletions
diff --git a/tests/e1inp_hsl_bsc_test.c b/tests/e1inp_hsl_bsc_test.c index 292a0e3..a909e02 100644 --- a/tests/e1inp_hsl_bsc_test.c +++ b/tests/e1inp_hsl_bsc_test.c @@ -190,8 +190,12 @@ int main(void) osmo_init_logging(&bsc_test_log_info); struct e1inp_line_ops ops = { - .addr = "0.0.0.0", - .role = E1INP_LINE_R_BSC, + .cfg = { + .ipa = { + .addr = "0.0.0.0", + .role = E1INP_LINE_R_BSC, + }, + }, .sign_link_up = sign_link_up, .sign_link_down = sign_link_down, .sign_link = sign_link, diff --git a/tests/e1inp_hsl_bts_test.c b/tests/e1inp_hsl_bts_test.c index 272eacf..18a06fe 100644 --- a/tests/e1inp_hsl_bts_test.c +++ b/tests/e1inp_hsl_bts_test.c @@ -231,9 +231,13 @@ int main(void) osmo_init_logging(&bts_test_log_info); struct e1inp_line_ops ops = { - .role = E1INP_LINE_R_BTS, - .addr = "127.0.0.1", - .data = &bts_dev_info, + .cfg = { + .ipa = { + .role = E1INP_LINE_R_BTS, + .addr = "127.0.0.1", + .dev = &bts_dev_info, + }, + }, .sign_link_up = sign_link_up, .sign_link_down = sign_link_down, .sign_link = sign_link, diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index ba3aabb..424c87b 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -205,8 +205,12 @@ int main(void) osmo_init_logging(&bsc_test_log_info); struct e1inp_line_ops ops = { - .addr = "0.0.0.0", - .role = E1INP_LINE_R_BSC, + .cfg = { + .ipa = { + .addr = "0.0.0.0", + .role = E1INP_LINE_R_BSC, + }, + }, .sign_link_up = sign_link_up, .sign_link_down = sign_link_down, .sign_link = sign_link, diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 2c03d94..3549661 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -252,9 +252,13 @@ int main(void) osmo_init_logging(&bts_test_log_info); struct e1inp_line_ops ops = { - .role = E1INP_LINE_R_BTS, - .addr = "127.0.0.1", - .data = &bts_dev_info, + .cfg = { + .ipa = { + .role = E1INP_LINE_R_BTS, + .addr = "127.0.0.1", + .dev = &bts_dev_info, + }, + }, .sign_link_up = sign_link_up, .sign_link_down = sign_link_down, .sign_link = sign_link, |