April 2024 - gerrit-log - lists.osmocom.org

[M] Change in dahdi-linux[master]: strlcpy() was removed with linux kernel commit d26270061ae6 use strsc...

by roox

roox has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email ) Change subject: strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. ...................................................................... strlcpy() was removed with linux kernel commit d26270061ae6 use strscpy() instead. https: //git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d26270061ae6 https: //www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/dahdi_dynamic.c M drivers/dahdi/dahdi_dynamic_eth.c M drivers/dahdi/dahdi_dynamic_ethmf.c M drivers/dahdi/dahdi_transcode.c M drivers/dahdi/xpp/card_global.c 6 files changed, 38 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/97/36697/1 diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index d8e6268..ef29c4b 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -4410,7 +4410,7 @@ param.pulsebreaktime = chan->pulsebreaktime; param.pulseaftertime = chan->pulseaftertime; param.spanno = (chan->span) ? chan->span->spanno : 0; - strlcpy(param.name, chan->name, sizeof(param.name)); + strscpy(param.name, chan->name, sizeof(param.name)); param.chanpos = chan->chanpos; param.sigcap = chan->sigcap; /* Return current law */ @@ -4498,8 +4498,8 @@ spaninfo.spanno = s->spanno; /* put the span # in here */ spaninfo.totalspans = span_count(); - strlcpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc)); - strlcpy(spaninfo.name, s->name, sizeof(spaninfo.name)); + strscpy(spaninfo.desc, s->desc, sizeof(spaninfo.desc)); + strscpy(spaninfo.name, s->name, sizeof(spaninfo.name)); spaninfo.alarms = s->alarms; /* get alarm status */ spaninfo.rxlevel = s->rxlevel; /* get rx level */ spaninfo.txlevel = s->txlevel; /* get tx level */ @@ -4526,18 +4526,18 @@ spaninfo.lineconfig = s->lineconfig; spaninfo.irq = 0; spaninfo.linecompat = s->linecompat; - strlcpy(spaninfo.lboname, dahdi_lboname(s->lbo), + strscpy(spaninfo.lboname, dahdi_lboname(s->lbo), sizeof(spaninfo.lboname)); if (s->parent->manufacturer) { - strlcpy(spaninfo.manufacturer, s->parent->manufacturer, + strscpy(spaninfo.manufacturer, s->parent->manufacturer, sizeof(spaninfo.manufacturer)); } if (s->parent->devicetype) { - strlcpy(spaninfo.devicetype, s->parent->devicetype, + strscpy(spaninfo.devicetype, s->parent->devicetype, sizeof(spaninfo.devicetype)); } if (s->parent->location) { - strlcpy(spaninfo.location, s->parent->location, + strscpy(spaninfo.location, s->parent->location, sizeof(spaninfo.location)); } if (s->spantype) { @@ -4556,11 +4556,11 @@ const char *st = dahdi_spantype2str(s->spantype); switch (s->spantype) { case SPANTYPE_DIGITAL_BRI_NT: - strlcpy(spaninfo.spantype, "NT", + strscpy(spaninfo.spantype, "NT", sizeof(spaninfo.spantype)); break; case SPANTYPE_DIGITAL_BRI_TE: - strlcpy(spaninfo.spantype, "TE", + strscpy(spaninfo.spantype, "TE", sizeof(spaninfo.spantype)); break; default: @@ -4570,7 +4570,7 @@ * so no backward compatibility for this * broken interface. */ - strlcpy(spaninfo.spantype, st, + strscpy(spaninfo.spantype, st, sizeof(spaninfo.spantype)); break; } @@ -4619,10 +4619,10 @@ spaninfo_v1.spanno = s->spanno; /* put the span # in here */ spaninfo_v1.totalspans = 0; spaninfo_v1.totalspans = span_count(); - strlcpy(spaninfo_v1.desc, + strscpy(spaninfo_v1.desc, s->desc, sizeof(spaninfo_v1.desc)); - strlcpy(spaninfo_v1.name, + strscpy(spaninfo_v1.name, s->name, sizeof(spaninfo_v1.name)); spaninfo_v1.alarms = s->alarms; @@ -4644,25 +4644,25 @@ spaninfo_v1.lineconfig = s->lineconfig; spaninfo_v1.irq = 0; spaninfo_v1.linecompat = s->linecompat; - strlcpy(spaninfo_v1.lboname, + strscpy(spaninfo_v1.lboname, dahdi_lboname(s->lbo), sizeof(spaninfo_v1.lboname)); if (s->parent->manufacturer) { - strlcpy(spaninfo_v1.manufacturer, s->parent->manufacturer, + strscpy(spaninfo_v1.manufacturer, s->parent->manufacturer, sizeof(spaninfo_v1.manufacturer)); } if (s->parent->devicetype) { - strlcpy(spaninfo_v1.devicetype, s->parent->devicetype, + strscpy(spaninfo_v1.devicetype, s->parent->devicetype, sizeof(spaninfo_v1.devicetype)); } - strlcpy(spaninfo_v1.location, s->parent->location, + strscpy(spaninfo_v1.location, s->parent->location, sizeof(spaninfo_v1.location)); if (s->spantype) { - strlcpy(spaninfo_v1.spantype, + strscpy(spaninfo_v1.spantype, dahdi_spantype2str(s->spantype), sizeof(spaninfo_v1.spantype)); } @@ -5340,7 +5340,7 @@ * always use it instead of any configured software * echocan. This matches the behavior in dahdi 2.4.1.2 * and earlier releases. */ - strlcpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); + strscpy(ae.echocan, hwec_def_name, sizeof(ae.echocan)); } else if (strcasecmp(ae.echocan, hwec_def_name) != 0) { chan_dbg(GENERAL, chan, @@ -5439,7 +5439,7 @@ bool have_hwec = dahdi_any_hwec_available(); memset(&vi, 0, sizeof(vi)); - strlcpy(vi.version, dahdi_version, sizeof(vi.version)); + strscpy(vi.version, dahdi_version, sizeof(vi.version)); spin_lock(&ecfactory_list_lock); list_for_each_entry(cur, &ecfactory_list, list) { const char * const ec_name = cur->ec->get_name(NULL); @@ -5696,7 +5696,7 @@ rv = -EBUSY; break; } - strlcpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, + strscpy(chan->txdialbuf + strlen(chan->txdialbuf), tdo->dialstr, DAHDI_MAX_DTMF_BUF - strlen(chan->txdialbuf)); if (!chan->dialing) { chan->dialing = 1; diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 6643441..e33a021 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -622,8 +622,8 @@ } /* Setup parameters properly assuming we're going to be okay. */ - strlcpy(d->dname, dds->driver, sizeof(d->dname)); - strlcpy(d->addr, dds->addr, sizeof(d->addr)); + strscpy(d->dname, dds->driver, sizeof(d->dname)); + strscpy(d->addr, dds->addr, sizeof(d->addr)); d->timing = dds->timing; snprintf(d->span.name, sizeof(d->span.name), "DYN/%s/%s", dds->driver, dds->addr); diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c index 0209489..c7a293d 100644 --- a/drivers/dahdi/dahdi_dynamic_eth.c +++ b/drivers/dahdi/dahdi_dynamic_eth.c @@ -292,12 +292,12 @@ memset(z, 0, sizeof(struct ztdeth)); /* Address should be <dev>/<macaddr>[/subaddr] */ - strlcpy(tmp, addr, sizeof(tmp)); + strscpy(tmp, addr, sizeof(tmp)); tmp2 = strchr(tmp, '/'); if (tmp2) { *tmp2 = '\0'; tmp2++; - strlcpy(z->ethdev, tmp, sizeof(z->ethdev)); + strscpy(z->ethdev, tmp, sizeof(z->ethdev)); } else { printk(KERN_NOTICE "Invalid TDMoE address (no device) '%s'\n", addr); kfree(z); diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index 1ee8b0c..f98280c 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -570,7 +570,7 @@ z->rcvbuf = kmalloc(bufsize, GFP_KERNEL); /* Address should be <dev>/<macaddr>/subaddr */ - strlcpy(src, addr, sizeof(src)); + strscpy(src, addr, sizeof(src)); /* replace all / with space; otherwise kernel sscanf does not work */ src_ptr = src; while (*src_ptr) { diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c index 6021aac..7645e2f 100644 --- a/drivers/dahdi/dahdi_transcode.c +++ b/drivers/dahdi/dahdi_transcode.c @@ -329,7 +329,7 @@ return -ENOSYS; } - strlcpy(info.name, tc->name, sizeof(info.name)); + strscpy(info.name, tc->name, sizeof(info.name)); info.numchannels = tc->numchannels; info.srcfmts = tc->srcfmts; info.dstfmts = tc->dstfmts; diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index 434d3e8..a6d8ff0 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -341,7 +341,7 @@ XBUS_DBG(GENERAL, xbus, "Dropped packet. Disconnected.\n"); return -EBUSY; } - strlcpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ + strscpy(buf, cmdline, MAX_PROC_WRITE); /* Save a copy */ if (buf[0] == '#' || buf[0] == ';') XPD_DBG(REGS, xpd, "Note: '%s'\n", buf); if ((p = strchr(buf, '#')) != NULL) /* Truncate comments */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I5beb8dfadf2d240b04e69822721b3360aa81d782 Gerrit-Change-Number: 36697 Gerrit-PatchSet: 1 Gerrit-Owner: roox <mardnh(a)gmx.de> Gerrit-MessageType: newchange

1 day, 8 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions: add ts template for authenticateClientRequestEsipa

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?usp=email ) Change subject: SGP32Definitions: add ts template for authenticateClientRequestEsipa ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36675?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9490a2ee59a89511876bb1055a056a43fbf172bb Gerrit-Change-Number: 36675 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:14:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?usp=email ) Change subject: RSPDefinitions: add defaults values to ts_authenticateClientResponseEs9 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36674?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I07d942a58a3c1c29c37fcaa50d3a274ce8b026bc Gerrit-Change-Number: 36674 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:14:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for CtxParams1

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36673?usp=email ) Change subject: RSPDefinitions: add separate template for CtxParams1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iba6c3780f9f3aec5742d53b3bd7b0c0392b25761 Gerrit-Change-Number: 36673 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:13:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?usp=email ) Change subject: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3842569f36dfb94e61afffaa03353b552e001c72 Gerrit-Change-Number: 36672 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:13:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for serverSigned1

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?usp=email ) Change subject: RSPDefinitions: add separate template for serverSigned1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic50676ac2863173b72765afc44794a56d03413a5 Gerrit-Change-Number: 36671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:13:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by pespin

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:12:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: skip f_statsd_expect for latest

by pespin

Attention is currently required from: dexter, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36696?usp=email ) Change subject: hnbgw: skip f_statsd_expect for latest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0cd47728308757fe6eaaaed1581fbbec03a09cf7 Gerrit-Change-Number: 36696 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:11:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add support for binary messages

by pespin

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email ) Change subject: HTTP_Adapter: add support for binary messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I18340f19ed462bf80af683dc9f2831b602f4bdf7 Gerrit-Change-Number: 36645 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:10:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[S] Change in osmo-upf[master]: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email ) Change subject: contrib/systemd: AmbientCapabilities=CAP_NET_ADMIN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I17b21ad92837ad360d667248f3f002d44251891c Gerrit-Change-Number: 36670 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:09:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id

by pespin

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/53667bb2_3301… PS1, Line 9: it makes it impossible to reference the : component name under TESTPORT_PARAMETERS > I find the discussion a bit bizarre. Yes, spaces in file names require proper quoting. […] So does that mean you also insist I should drop this patch and redo my other patches to use quotes instead? Or just reword the commit to drop the "impossible" keyword? I still believe this patch is an improvement, but if several people oppose to it I will just drop it and redo other commits to get everything merged. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 21:08:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 day, 9 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: e1_tick_read() for rx and tx

by tnt

tnt has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21772?usp=email ) Change subject: icE1usb fw: e1_tick_read() for rx and tx ...................................................................... Abandoned The hardware counters changed, this is no longer applicable. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21772?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I8dd6765f27cdf5ab21ccb8290002c44eef67f96f Gerrit-Change-Number: 21772 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 day, 12 hours

1
0
0 0

[M] Change in osmo-e1-hardware[master]: gateware: Rework the low-level line state monitoring ticks

by tnt

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gateware: Rework the low-level line state monitoring ticks ...................................................................... gateware: Rework the low-level line state monitoring ticks The 'tick' system was meant to allow the firmware to monitor the low level state of the line, beyong just "not aligned", but it was never really useful in the present state. Now we have more tick source available (but only one can be measured at the same time). More specifically, the firmware can monitor the presence/absence of raw pulses (LOS condition), it can also monitor the number of '1' pulses to detect an AIS signals, or simply the rate of RX pulses (to tune the local oscillator to incoming signal rate). Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e --- M gateware/common/rtl/soc_base.v M gateware/cores/no2e1 M gateware/e1-tracer/doc/mem-map.md M gateware/e1-tracer/rtl/misc.v M gateware/e1-tracer/rtl/top.v M gateware/icE1usb-proto/doc/mem-map.md M gateware/icE1usb-proto/rtl/misc.v M gateware/icE1usb-proto/rtl/top.v M gateware/icE1usb/doc/mem-map.md M gateware/icE1usb/rtl/misc.v M gateware/icE1usb/rtl/top.v 11 files changed, 176 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/79/36679/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e Gerrit-Change-Number: 36679 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 day, 16 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2e1

by tnt

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gateware/cores: Update no2e1 ...................................................................... gateware/cores: Update no2e1 This pulls in the support for non-crc4 framing modes and also setting the Sa bits (for osmo-v5) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 --- M gateware/cores/no2e1 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/77/36677/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 Gerrit-Change-Number: 36677 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 day, 16 hours

1
0
0 0

[M] Change in osmo-e1-hardware[master]: gateware: Rework the low-level line state monitoring ticks

by tnt

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gateware: Rework the low-level line state monitoring ticks ...................................................................... gateware: Rework the low-level line state monitoring ticks The 'tick' system was meant to allow the firmware to monitor the low level state of the line, beyong just "not aligned", but it was never really useful in the present state. Now we have more tick source available (but only one can be measured at the same time). More specifically, the firmware can monitor the presence/absence of raw pulses (LOS condition), it can also monitor the number of '1' pulses to detect an AIS signals, or simply the rate of RX pulses (to tune the local oscillator to incoming signal rate). Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e --- M gateware/common/rtl/soc_base.v M gateware/cores/no2e1 M gateware/e1-tracer/doc/mem-map.md M gateware/e1-tracer/rtl/misc.v M gateware/e1-tracer/rtl/top.v M gateware/icE1usb-proto/doc/mem-map.md M gateware/icE1usb-proto/rtl/misc.v M gateware/icE1usb-proto/rtl/top.v M gateware/icE1usb/doc/mem-map.md M gateware/icE1usb/rtl/misc.v M gateware/icE1usb/rtl/top.v 11 files changed, 176 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/79/36679/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e Gerrit-Change-Number: 36679 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 day, 16 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: gateware/cores: Update no2e1

by tnt

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gateware/cores: Update no2e1 ...................................................................... gateware/cores: Update no2e1 This pulls in the support for non-crc4 framing modes and also setting the Sa bits (for osmo-v5) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 --- M gateware/cores/no2e1 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/77/36677/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36677?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ica1bbaa052988f5b7e71c7fa51f87eb0bfea6f67 Gerrit-Change-Number: 36677 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 day, 16 hours

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: skip f_statsd_expect for latest

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36696?usp=email ) Change subject: hnbgw: skip f_statsd_expect for latest ...................................................................... hnbgw: skip f_statsd_expect for latest Fix that 6 tests started failing on ttcn3-hnbgw-test-latest with e.g.: Timeout waiting for metrics HNBGW_Tests.ttcn:2885 HNBGW_Tests control part HNBGW_Tests.ttcn:1536 TC_rab_assign_fail testcase Fixes: 904b5f1a ("hnbgw: Implement validation of [some] counters") Change-Id: I0cd47728308757fe6eaaaed1581fbbec03a09cf7 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 33 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/36696/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 3369e37..88b8c1e 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1442,7 +1442,9 @@ {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } f_create_rab(pars.mgcp_pars); @@ -1451,7 +1453,9 @@ {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 1, max := 1}, {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } /* Send Iu Release */ tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); @@ -1500,7 +1504,9 @@ {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } f_rab_ass_req(pars.mgcp_pars); @@ -1513,7 +1519,9 @@ {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 1, max := 1} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } T.start; @@ -1563,7 +1571,9 @@ var StatsDExpects expect := { {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 0, max := 0} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } /* Send RAB Release */ tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), pars.rab_rel_cause))); @@ -1572,7 +1582,9 @@ expect := { {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1} }; - f_statsd_expect(expect); + if (f_osmo_repo_is("nightly")) { + f_statsd_expect(expect); + } T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0cd47728308757fe6eaaaed1581fbbec03a09cf7 Gerrit-Change-Number: 36696 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:21:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... Removed -Verified by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email ) Change subject: icE1usb: Show accumulated error count from GPSDO state in sysfs ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Gerrit-Change-Number: 36695 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:21:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email ) Change subject: icE1usb: Show accumulated error count from GPSDO state in sysfs ...................................................................... Removed -Verified by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Gerrit-Change-Number: 36695 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email ) Change subject: icE1usb: Show accumulated error count from GPSDO state in sysfs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Gerrit-Change-Number: 36695 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Report BLUE alarm when receiving AIS

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email ) Change subject: icE1usb: Report BLUE alarm when receiving AIS ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I75ae15d3b8e13ca6b82a20209ee9ca163a729020 Gerrit-Change-Number: 36694 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:20:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Report BLUE alarm when receiving AIS

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email ) Change subject: icE1usb: Report BLUE alarm when receiving AIS ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I75ae15d3b8e13ca6b82a20209ee9ca163a729020 Gerrit-Change-Number: 36694 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email ) Change subject: icE1usb: Fix "typo" in ALL_RY_ALARMS ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Gerrit-Change-Number: 36692 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:19:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email ) Change subject: icE1usb: Fix "typo" in ALL_RY_ALARMS ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Gerrit-Change-Number: 36692 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Update ice1usb_proto.h

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email ) Change subject: icE1usb: Update ice1usb_proto.h ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I17a1bbf27cfb423ba09146e2cc57b585d511ec49 Gerrit-Change-Number: 36693 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:19:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Update ice1usb_proto.h

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email ) Change subject: icE1usb: Update ice1usb_proto.h ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I17a1bbf27cfb423ba09146e2cc57b585d511ec49 Gerrit-Change-Number: 36693 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adaptor: allow keeping an HTTP client connection

by osmith

Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:18:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Mark as verified since build failure is vs linux master and unrelated -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:18:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email ) Change subject: icE1usb: Use ICE1USB_TX_MODE_TS0_CRC4_E to set E bits automatically ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iea936a6c908ef5e175be3090a8fbcafaeb5a0aed Gerrit-Change-Number: 36654 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: deleteVote

1 day, 19 hours

1
0
0 0

[M] Change in dahdi-linux[master]: icE1usb: Configure the RX mode according to CRC4 mode

by tnt

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email ) Change subject: icE1usb: Configure the RX mode according to CRC4 mode ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: Tested now that it behaves as I expect. PS1: > Note that I don't have a working DADHI setup ATM, so don't merge until I either get to try this, or […] Done -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36655?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ic9da7d2a32f9aa9bf5de296dc4885eeaf56b138e Gerrit-Change-Number: 36655 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 30 Apr 2024 11:12:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Show accumulated error count from GPSDO state in sysfs

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email ) Change subject: icE1usb: Show accumulated error count from GPSDO state in sysfs ...................................................................... icE1usb: Show accumulated error count from GPSDO state in sysfs Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/95/36695/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 867b4f2..a861515 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -1119,6 +1119,18 @@ static DEVICE_ATTR(gpsdo_freq_est, 0444, e1u_gpsdo_freq_est_show, NULL); +static ssize_t e1u_gpsdo_err_acc_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ice1usb_gpsdo *e1d = dev_get_drvdata(dev); + int rc = e1u_update_gpsdo(e1d); + if (rc < 0) + return rc; + return sprintf(buf, "%d\n", (int)e1d->gpsdo_status.err_acc); +} + +static DEVICE_ATTR(gpsdo_err_acc, 0444, e1u_gpsdo_err_acc_show, NULL); + static ssize_t e1u_fw_build_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -1138,6 +1150,7 @@ device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_coarse); device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_fine); device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_freq_est); + device_create_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_err_acc); device_create_file(&e1d->usb_intf->dev, &dev_attr_fw_build); } @@ -1150,6 +1163,7 @@ device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_coarse); device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_tune_fine); device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_freq_est); + device_remove_file(&e1d->usb_intf->dev, &dev_attr_gpsdo_err_acc); device_remove_file(&e1d->usb_intf->dev, &dev_attr_fw_build); } -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36695?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Idc4ff2a3a7411df758a432fc4c6fe5a88963b626 Gerrit-Change-Number: 36695 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Update ice1usb_proto.h

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email ) Change subject: icE1usb: Update ice1usb_proto.h ...................................................................... icE1usb: Update ice1usb_proto.h Change-Id: I17a1bbf27cfb423ba09146e2cc57b585d511ec49 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/ice1usb_proto.h 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/93/36693/1 diff --git a/drivers/dahdi/icE1usb/ice1usb_proto.h b/drivers/dahdi/icE1usb/ice1usb_proto.h index 3170d55..ee1c307 100644 --- a/drivers/dahdi/icE1usb/ice1usb_proto.h +++ b/drivers/dahdi/icE1usb/ice1usb_proto.h @@ -16,8 +16,14 @@ /*! returns a bit-mask of optional device capabilities (see enum e1usb_dev_capability) */ #define ICE1USB_DEV_GET_CAPABILITIES 0x01 + +/*! returns a string describing the firmware version */ #define ICE1USB_DEV_GET_FW_BUILD 0x02 +/*! performs an I2C register access (read/write depends on direction) */ +#define ICE1USB_DEV_I2C_REG_ACCESS 0x10 + + enum e1usb_dev_capability { /*! Does this board have a GPS-DO */ ICE1USB_DEV_CAP_GPSDO, @@ -65,6 +71,7 @@ uint8_t mode; /*!< Current configured operating mode */ struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ uint32_t freq_est; /*!< Latest frequency estimate measurement */ + int16_t err_acc; /*!< Accumulated error (since fw icE1usb-fw-0.3 commit cfb8b0b7) */ } __attribute__((packed)); @@ -136,6 +143,7 @@ #define ICE1USB_ERR_F_ALIGN_ERR 0x01 #define ICE1USB_ERR_F_LOS 0x02 #define ICE1USB_ERR_F_RAI 0x04 +#define ICE1USB_ERR_F_AIS 0x08 struct ice1usb_irq_err { /* 16-bit little-endian counters */ -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I17a1bbf27cfb423ba09146e2cc57b585d511ec49 Gerrit-Change-Number: 36693 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Report BLUE alarm when receiving AIS

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email ) Change subject: icE1usb: Report BLUE alarm when receiving AIS ...................................................................... icE1usb: Report BLUE alarm when receiving AIS Change-Id: I75ae15d3b8e13ca6b82a20209ee9ca163a729020 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/94/36694/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 1656b3a..867b4f2 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -591,7 +591,7 @@ memcpy(&ieu->last_err, err, sizeof(ieu->last_err)); } -#define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | \ +#define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | DAHDI_ALARM_BLUE | \ DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA | DAHDI_ALARM_LOS) /* interrupt EP completes: Process and resubmit */ @@ -621,6 +621,8 @@ alarms |= DAHDI_ALARM_RED | DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA; if (err->flags & ICE1USB_ERR_F_RAI) alarms |= DAHDI_ALARM_YELLOW; + if (err->flags & ICE1USB_ERR_F_AIS) + alarms |= DAHDI_ALARM_BLUE; ieu->dahdi.span.alarms &= ~ALL_RY_ALARMS; ieu->dahdi.span.alarms |= alarms; dahdi_alarm_notify(&ieu->dahdi.span); -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I75ae15d3b8e13ca6b82a20209ee9ca163a729020 Gerrit-Change-Number: 36694 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in dahdi-linux[master]: icE1usb: Fix "typo" in ALL_RY_ALARMS

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email ) Change subject: icE1usb: Fix "typo" in ALL_RY_ALARMS ...................................................................... icE1usb: Fix "typo" in ALL_RY_ALARMS Obviously it's the DADHDI constant that should be used, not the ICE1USB one ... Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/92/36692/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 06ec443..1656b3a 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -592,7 +592,7 @@ } #define ALL_RY_ALARMS (DAHDI_ALARM_RED | DAHDI_ALARM_YELLOW | \ - DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA | ICE1USB_ERR_F_LOS) + DAHDI_ALARM_LFA | DAHDI_ALARM_LMFA | DAHDI_ALARM_LOS) /* interrupt EP completes: Process and resubmit */ static void ice1usb_irq_complete(struct urb *urb) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/36692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib0ef30f629d3e463871a0ee3ab6b0b94cb511804 Gerrit-Change-Number: 36692 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1d[master]: ctl: When setting Sa bits, other bits must remain set to '1'

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36691?usp=email ) Change subject: ctl: When setting Sa bits, other bits must remain set to '1' ...................................................................... ctl: When setting Sa bits, other bits must remain set to '1' Some of the other bits will be used 'as-is'. For instance the bit 0 (MSB) will be copied from this if operating in nocrc4 mode. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id482c6a114e7bf051d157e81038f015e9d26fa99 --- M src/ctl.c 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/91/36691/1 diff --git a/src/ctl.c b/src/ctl.c index 331f2ad..e63589b 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -452,11 +452,14 @@ return 0; } - line->ts0.tx_frame = ((sa_bits & 0x80) >> 7) | /* Bit 7 -> Sa8 */ - ((sa_bits & 0x40) >> 5) | /* Bit 6 -> Sa7 */ - ((sa_bits & 0x01) << 2) | /* Bit 0 -> Sa6 */ - ((sa_bits & 0x20) >> 2) | /* Bit 5 -> Sa5 */ - (sa_bits & 0x10); /* Bit 4 -> Sa4 */ + line->ts0.tx_frame = ( + ((sa_bits & 0x80) >> 7) | /* Bit 7 -> Sa8 */ + ((sa_bits & 0x40) >> 5) | /* Bit 6 -> Sa7 */ + ((sa_bits & 0x01) << 2) | /* Bit 0 -> Sa6 */ + ((sa_bits & 0x20) >> 2) | /* Bit 5 -> Sa5 */ + (sa_bits & 0x10) | /* Bit 4 -> Sa4 */ + 0xe0 + ); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Id482c6a114e7bf051d157e81038f015e9d26fa99 Gerrit-Change-Number: 36691 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1d[master]: iCE1usb: Transmit AIS events to clients

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36690?usp=email ) Change subject: iCE1usb: Transmit AIS events to clients ...................................................................... iCE1usb: Transmit AIS events to clients Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I4a35a2ab2537cbc9ecec381ab5078c1b08067925 --- M src/usb.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/90/36690/1 diff --git a/src/usb.c b/src/usb.c index e4ba6c0..bb1a294 100644 --- a/src/usb.c +++ b/src/usb.c @@ -420,6 +420,18 @@ } } + if ((errcnt->flags & ICE1USB_ERR_F_AIS) != (last->flags & ICE1USB_ERR_F_AIS)) { + LOGPLI(line, DE1D, LOGL_ERROR, "AIS (BLUE) %s\n", + errcnt->flags & ICE1USB_ERR_F_AIS ? "PRESENT" : "ABSENT"); + if (errcnt->flags & ICE1USB_ERR_F_AIS) { + osmo_e1dp_server_event(line->intf->e1d->srv, E1DP_EVT_AIS_ON, + line->intf->id, line->id, 0, NULL, 0); + } else { + osmo_e1dp_server_event(line->intf->e1d->srv, E1DP_EVT_AIS_OFF, + line->intf->id, line->id, 0, NULL, 0); + } + } + if ((errcnt->flags & ICE1USB_ERR_F_RAI) != (last->flags & ICE1USB_ERR_F_RAI)) { LOGPLI(line, DE1D, LOGL_ERROR, "Remote Alarm (YELLOW) %s\n", errcnt->flags & ICE1USB_ERR_F_RAI ? "PRESENT" : "ABSENT"); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36690?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4a35a2ab2537cbc9ecec381ab5078c1b08067925 Gerrit-Change-Number: 36690 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1d[master]: iCE1usb: Transmit LOS events to clients

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36689?usp=email ) Change subject: iCE1usb: Transmit LOS events to clients ...................................................................... iCE1usb: Transmit LOS events to clients Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I8822d24c25f8ba0bb70e9f717ca04dbf0e656e71 --- M src/usb.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/89/36689/1 diff --git a/src/usb.c b/src/usb.c index 3b77b94..e4ba6c0 100644 --- a/src/usb.c +++ b/src/usb.c @@ -410,8 +410,14 @@ if ((errcnt->flags & ICE1USB_ERR_F_LOS) != (last->flags & ICE1USB_ERR_F_LOS)) { LOGPLI(line, DE1D, LOGL_ERROR, "Rx Clock %s\n", errcnt->flags & ICE1USB_ERR_F_LOS ? "LOST" : "REGAINED"); - if (errcnt->flags & ICE1USB_ERR_F_LOS) + if (errcnt->flags & ICE1USB_ERR_F_LOS) { line_ctr_add(line, LINE_CTR_LOS, 1); + osmo_e1dp_server_event(line->intf->e1d->srv, E1DP_EVT_LOS_ON, + line->intf->id, line->id, 0, NULL, 0); + } else { + osmo_e1dp_server_event(line->intf->e1d->srv, E1DP_EVT_LOS_OFF, + line->intf->id, line->id, 0, NULL, 0); + } } if ((errcnt->flags & ICE1USB_ERR_F_RAI) != (last->flags & ICE1USB_ERR_F_RAI)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36689?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8822d24c25f8ba0bb70e9f717ca04dbf0e656e71 Gerrit-Change-Number: 36689 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[M] Change in osmo-e1d[master]: iCE1usb: Add support to configure CRC4 mode for TX/RX

by tnt

Attention is currently required from: laforge, tnt. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: iCE1usb: Add support to configure CRC4 mode for TX/RX ...................................................................... iCE1usb: Add support to configure CRC4 mode for TX/RX Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb --- M src/e1d.h M src/usb.c M src/vty.c 3 files changed, 82 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/53/36653/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b627a9617af4ae9ed98214d672c7d0391f801eb Gerrit-Change-Number: 36653 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1d[master]: Update ice1usb_proto.h

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36688?usp=email ) Change subject: Update ice1usb_proto.h ...................................................................... Update ice1usb_proto.h Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I8e041b3d94723eba9d3d30b9f03815d46dacf995 --- M src/ice1usb_proto.h 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/88/36688/1 diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h index 54b91ab..ee1c307 100644 --- a/src/ice1usb_proto.h +++ b/src/ice1usb_proto.h @@ -16,8 +16,14 @@ /*! returns a bit-mask of optional device capabilities (see enum e1usb_dev_capability) */ #define ICE1USB_DEV_GET_CAPABILITIES 0x01 + +/*! returns a string describing the firmware version */ #define ICE1USB_DEV_GET_FW_BUILD 0x02 +/*! performs an I2C register access (read/write depends on direction) */ +#define ICE1USB_DEV_I2C_REG_ACCESS 0x10 + + enum e1usb_dev_capability { /*! Does this board have a GPS-DO */ ICE1USB_DEV_CAP_GPSDO, @@ -137,6 +143,7 @@ #define ICE1USB_ERR_F_ALIGN_ERR 0x01 #define ICE1USB_ERR_F_LOS 0x02 #define ICE1USB_ERR_F_RAI 0x04 +#define ICE1USB_ERR_F_AIS 0x08 struct ice1usb_irq_err { /* 16-bit little-endian counters */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8e041b3d94723eba9d3d30b9f03815d46dacf995 Gerrit-Change-Number: 36688 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[M] Change in osmo-e1-hardware[master]: icE1usb fw: Rework the way LEDs are used and updated

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36686?usp=email ) Change subject: icE1usb fw: Rework the way LEDs are used and updated ...................................................................... icE1usb fw: Rework the way LEDs are used and updated Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ib3215a676716cc60e27c5857e4559135928a8cf7 --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 91 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/86/36686/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 6baee16..17c1786 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -270,6 +270,11 @@ } linemon; struct e1_error_count errors; + + struct { + enum e1_platform_led_state green; + enum e1_platform_led_state yellow; + } led; }; static struct e1_state g_e1[NUM_E1_PORTS]; @@ -326,6 +331,76 @@ } } +static void +_e1_update_leds(int port) +{ + struct e1_state *e1 = _get_state(port); + + enum e1_platform_led_state green; + enum e1_platform_led_state yellow; + + /* + * Green Yellow Condition + * OFF / LOS + * BLINK OFF LOF + * BLINK ON LOF + AIS + * ON OFF ALIGNED + * ON ON ALIGNED + RAI + */ + + /* Compute expected state */ + if (e1->errors.flags & E1_ERR_F_LOS) { + green = E1P_LED_ST_OFF; + yellow = E1P_LED_ST_OFF; + } else if (e1->errors.flags & E1_ERR_F_ALIGN_ERR) { + green = E1P_LED_ST_BLINK; + yellow = (e1->errors.flags & E1_ERR_F_AIS) ? E1P_LED_ST_ON : E1P_LED_ST_OFF; + } else { + green = E1P_LED_ST_ON; + yellow = (e1->errors.flags & E1_ERR_F_RAI) ? E1P_LED_ST_ON : E1P_LED_ST_OFF; + } + + /* Update actual leds */ + if (e1->led.green != green) + e1_platform_led_set(port, E1P_LED_GREEN, green); + + if (e1->led.yellow != yellow) + e1_platform_led_set(port, E1P_LED_YELLOW, yellow); + + e1->led.green = green; + e1->led.yellow = yellow; + + /* Update the shared RGB led */ + if (port == (NUM_E1_PORTS - 1)) + { + static bool c_ok = true, c_flow = false; + bool n_ok = false, n_flow = false; + + for (int port=0; port<NUM_E1_PORTS; port++) + { + struct e1_state *e1 = _get_state(port); + n_ok |= !(e1->errors.flags & E1_ERR_F_ALIGN_ERR); + n_flow |= (e1->rx.state != IDLE); + n_flow |= (e1->tx.state != IDLE); + } + + if (n_ok != c_ok) { + if (n_ok) + led_color(0, 48, 0); // Green + else + led_color(48, 0, 0); // Red + } + + if (n_flow != c_flow) { + led_blink(n_flow, 200, 1000); + led_breathe(n_flow, 100, 200); + } + + c_ok = n_ok; + c_flow = n_flow; + } +} + void e1_init(int port, uint16_t rx_cr, uint16_t tx_cr) { @@ -490,13 +565,10 @@ } if (rai_possible) { - if (rai_received) { + if (rai_received) e1->errors.flags |= E1_ERR_F_RAI; - e1_platform_led_set(port, E1P_LED_YELLOW, E1P_LED_ST_ON); - } else { + else e1->errors.flags &= ~E1_ERR_F_RAI; - e1_platform_led_set(port, E1P_LED_YELLOW, E1P_LED_ST_OFF); - } } return tot_frames; @@ -561,10 +633,8 @@ uint32_t bd; unsigned int ofs; - /* HACK: LED link status */ + /* Update error flags */ if (e1_regs->rx.csr & E1_RX_SR_ALIGNED) { - e1_platform_led_set(port, E1P_LED_GREEN, E1P_LED_ST_ON); - led_color(0, 48, 0); e1->errors.flags &= ~( E1_ERR_F_LOS | E1_ERR_F_AIS | @@ -572,14 +642,13 @@ E1_ERR_F_ALIGN_ERR ); } else { - e1_platform_led_set(port, E1P_LED_GREEN, E1P_LED_ST_BLINK); - e1_platform_led_set(port, E1P_LED_YELLOW, E1P_LED_ST_OFF); - led_color(48, 0, 0); e1->errors.flags |= E1_ERR_F_ALIGN_ERR; e1->errors.flags &= ~E1_ERR_F_RAI; - /* TODO: completely off if rx tick counter not incrementing */ } + /* Update leds */ + _e1_update_leds(port); + /* Active ? */ if ((e1->rx.state == IDLE) && (e1->tx.state == IDLE)) return; @@ -605,9 +674,6 @@ if (e1->tx.state == STARTING) { if (e1f_unseen_frames(&e1->tx.fifo) < (16 * 5)) return; - /* HACK: LED flow status */ - led_blink(true, 200, 1000); - led_breathe(true, 100, 200); } /* Handle RX */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ib3215a676716cc60e27c5857e4559135928a8cf7 Gerrit-Change-Number: 36686 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Automatically report alarm condition to remote peer

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36687?usp=email ) Change subject: icE1usb fw: Automatically report alarm condition to remote peer ...................................................................... icE1usb fw: Automatically report alarm condition to remote peer Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I5ccf6b92f7be512bad3dda42caaee5f7eabf3ca3 --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/87/36687/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 17c1786..80b3aea 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -646,6 +646,12 @@ e1->errors.flags &= ~E1_ERR_F_RAI; } + /* If we have any local alarm, make sure to notify remote side */ + if (e1->errors.flags & (E1_ERR_F_LOS | E1_ERR_F_AIS | E1_ERR_F_ALIGN_ERR)) + e1_regs->tx.csr = e1->tx.cr.val | E1_TX_CR_ALARM; + else + e1_regs->tx.csr = e1->tx.cr.val; + /* Update leds */ _e1_update_leds(port); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5ccf6b92f7be512bad3dda42caaee5f7eabf3ca3 Gerrit-Change-Number: 36687 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Add AIS error flag and fill it along with LOS from linemon

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36685?usp=email ) Change subject: icE1usb fw: Add AIS error flag and fill it along with LOS from linemon ...................................................................... icE1usb fw: Add AIS error flag and fill it along with LOS from linemon Now that we monitor low level line status, we can fill in a proper LOS signal along with the newly introduced AIS flag Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ied28b6b3da74f6a63a007fae889b571cc2c1e835 --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h M firmware/ice40-riscv/icE1usb/ice1usb_proto.h 3 files changed, 46 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/85/36685/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 1582cec..6baee16 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -565,12 +565,18 @@ if (e1_regs->rx.csr & E1_RX_SR_ALIGNED) { e1_platform_led_set(port, E1P_LED_GREEN, E1P_LED_ST_ON); led_color(0, 48, 0); - e1->errors.flags &= ~(E1_ERR_F_LOS|E1_ERR_F_ALIGN_ERR); + e1->errors.flags &= ~( + E1_ERR_F_LOS | + E1_ERR_F_AIS | + E1_ERR_F_RAI | + E1_ERR_F_ALIGN_ERR + ); } else { e1_platform_led_set(port, E1P_LED_GREEN, E1P_LED_ST_BLINK); e1_platform_led_set(port, E1P_LED_YELLOW, E1P_LED_ST_OFF); led_color(48, 0, 0); - e1->errors.flags |= E1_ERR_F_ALIGN_ERR; + e1->errors.flags |= E1_ERR_F_ALIGN_ERR; + e1->errors.flags &= ~E1_ERR_F_RAI; /* TODO: completely off if rx tick counter not incrementing */ } @@ -748,7 +754,30 @@ /* Next cycle */ if (++cycle == 6) + { + /* We did one full cycle of data, update our local flags */ + for (int port=0; port<NUM_E1_PORTS; port++) + { + struct e1_state *e1 = _get_state(port); + if (e1->linemon.rx_pulse < 16) { + /* No pulse ? -> LOS */ + e1->errors.flags |= E1_ERR_F_LOS; + e1->errors.flags &= ~E1_ERR_F_AIS; + } else { + /* We have "some" pulses, so somone is talking */ + e1->errors.flags &= ~E1_ERR_F_LOS; + + /* If it's mostly ones, consider it AIS */ + if (e1->linemon.rx_one > 2040) + e1->errors.flags |= E1_ERR_F_AIS; + else + e1->errors.flags &= ~E1_ERR_F_AIS; + } + } + + /* Start over */ cycle = 0; + } } void diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 883e1ec..1e8e747 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -35,6 +35,7 @@ #define E1_ERR_F_ALIGN_ERR 0x01 #define E1_ERR_F_LOS 0x02 #define E1_ERR_F_RAI 0x04 +#define E1_ERR_F_AIS 0x08 struct e1_error_count { uint16_t crc; diff --git a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h index 8cf8439..8bc8fbb 100644 --- a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h +++ b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h @@ -143,6 +143,7 @@ #define ICE1USB_ERR_F_ALIGN_ERR 0x01 #define ICE1USB_ERR_F_LOS 0x02 #define ICE1USB_ERR_F_RAI 0x04 +#define ICE1USB_ERR_F_AIS 0x08 struct ice1usb_irq_err { /* 16-bit little-endian counters */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ied28b6b3da74f6a63a007fae889b571cc2c1e835 Gerrit-Change-Number: 36685 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[M] Change in osmo-e1-hardware[master]: icE1usb fw: Implement E1 line monitor task

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36684?usp=email ) Change subject: icE1usb fw: Implement E1 line monitor task ...................................................................... icE1usb fw: Implement E1 line monitor task The results are not used yet, just collected ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id310b65b7cd83c3bbae90ecd4a82b09a3989d91f --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h M firmware/ice40-riscv/icE1usb/usb_e1.c 3 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/84/36684/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 5e4fa33..1582cec 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -16,6 +16,7 @@ #include "dma.h" #include "led.h" // FIXME +#include "misc.h" #include "utils.h" @@ -260,6 +261,14 @@ enum e1_pipe_state state; } tx; + struct { + uint16_t rx_pulse; + uint16_t rx_sample; + uint16_t rx_one; + + uint16_t _val; + } linemon; + struct e1_error_count errors; }; @@ -696,6 +705,53 @@ } void +e1_linemon_update(void) +{ + static int cycle = -1; + + /* Initial boot */ + if (cycle == -1) { + e1_tick_sel(TICK_RX_PULSE); + cycle = 0; + return; + } + + /* Current cycle ? */ + switch (cycle) { + /* Read initial values */ + case 0: + case 2: + case 4: + for (int port=0; port<NUM_E1_PORTS; port++) + g_e1[port].linemon._val = e1_tick_read(port); + break; + + /* Actual reading */ + case 1: + for (int port=0; port<NUM_E1_PORTS; port++) + g_e1[port].linemon.rx_pulse = e1_tick_read(port) - g_e1[port].linemon._val; + e1_tick_sel(TICK_RX_SAMPLE); + break; + + case 3: + for (int port=0; port<NUM_E1_PORTS; port++) + g_e1[port].linemon.rx_sample = e1_tick_read(port) - g_e1[port].linemon._val; + e1_tick_sel(TICK_RX_ONE); + break; + + case 5: + for (int port=0; port<NUM_E1_PORTS; port++) + g_e1[port].linemon.rx_one = e1_tick_read(port) - g_e1[port].linemon._val; + e1_tick_sel(TICK_RX_PULSE); + break; + } + + /* Next cycle */ + if (++cycle == 6) + cycle = 0; +} + +void e1_debug_print(int port, bool data) { volatile struct e1_core *e1_regs = _get_regs(port); @@ -706,6 +762,8 @@ printf("CSR: Rx %04x / Tx %04x\n", e1_regs->rx.csr, e1_regs->tx.csr); printf("InF: Rx %d / Tx %d\n", e1->rx.in_flight, e1->tx.in_flight); printf("Sta: Rx %d / Tx %d\n", e1->rx.state, e1->tx.state); + printf("Tck: P %d / S %d / O %d\n", + e1->linemon.rx_pulse, e1->linemon.rx_sample, e1->linemon.rx_one); e1f_debug(&e1->rx.fifo, "Rx FIFO"); e1f_debug(&e1->tx.fifo, "Tx FIFO"); diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 0ed43c4..883e1ec 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -15,6 +15,7 @@ void e1_stop(int port); void e1_poll(int port); +void e1_linemon_update(void); void e1_debug_print(int port, bool data); void e1_rx_config(int port, uint16_t cr); diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 18d8516..843aeef 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -433,6 +433,7 @@ static struct usb_fn_drv _e1_drv = { + .sof = e1_linemon_update, .set_conf = _e1_set_conf, .set_intf = _e1_set_intf, .get_intf = _e1_get_intf, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id310b65b7cd83c3bbae90ecd4a82b09a3989d91f Gerrit-Change-Number: 36684 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Fix some formatting (tab vs space)

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?usp=email ) Change subject: icE1usb fw: Fix some formatting (tab vs space) ...................................................................... icE1usb fw: Fix some formatting (tab vs space) Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id47025320e65a27fc46e9204e050c57d108dab56 --- M firmware/ice40-riscv/icE1usb/usb_e1.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/82/36682/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index 11c7401..18d8516 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -434,8 +434,8 @@ static struct usb_fn_drv _e1_drv = { .set_conf = _e1_set_conf, - .set_intf = _e1_set_intf, - .get_intf = _e1_get_intf, + .set_intf = _e1_set_intf, + .get_intf = _e1_get_intf, .ctrl_req = _e1_ctrl_req, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id47025320e65a27fc46e9204e050c57d108dab56 Gerrit-Change-Number: 36682 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Use NUM_E1_PORTS in e1.c

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?usp=email ) Change subject: icE1usb fw: Use NUM_E1_PORTS in e1.c ...................................................................... icE1usb fw: Use NUM_E1_PORTS in e1.c Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id69b4429a67ccb8834fee26b83839539a5ad8b31 --- M firmware/ice40-riscv/icE1usb/e1.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/83/36683/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index bfc042e..5e4fa33 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -263,13 +263,13 @@ struct e1_error_count errors; }; -static struct e1_state g_e1[2]; +static struct e1_state g_e1[NUM_E1_PORTS]; static volatile struct e1_core * _get_regs(int port) { - if ((port < 0) || (port > 1)) + if ((port < 0) || (port >= NUM_E1_PORTS)) panic("_get_regs invalid port %d", port); return &e1_regs_base[port]; } @@ -277,7 +277,7 @@ static struct e1_state * _get_state(int port) { - if ((port < 0) || (port > 1)) + if ((port < 0) || (port >= NUM_E1_PORTS)) panic("_get_state invalid port %d", port); return &g_e1[port]; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id69b4429a67ccb8834fee26b83839539a5ad8b31 Gerrit-Change-Number: 36683 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[M] Change in osmo-e1-hardware[master]: gateware: Rework the low-level line state monitoring ticks

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email ) Change subject: gateware: Rework the low-level line state monitoring ticks ...................................................................... gateware: Rework the low-level line state monitoring ticks The 'tick' system was meant to allow the firmware to monitor the low level state of the line, beyong just "not aligned", but it was never really useful in the present state. Now we have more tick source available (but only one can be measured at the same time). More specifically, the firmware can monitor the presence/absence of raw pulses (LOS condition), it can also monitor the number of '1' pulses to detect an AIS signals, or simply the rate of RX pulses (to tune the local oscillator to incoming signal rate). Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e --- M gateware/common/rtl/soc_base.v M gateware/cores/no2e1 M gateware/e1-tracer/doc/mem-map.md M gateware/e1-tracer/rtl/misc.v M gateware/e1-tracer/rtl/top.v M gateware/icE1usb-proto/doc/mem-map.md M gateware/icE1usb-proto/rtl/misc.v M gateware/icE1usb-proto/rtl/top.v M gateware/icE1usb/doc/mem-map.md M gateware/icE1usb/rtl/misc.v M gateware/icE1usb/rtl/top.v 11 files changed, 176 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/79/36679/1 diff --git a/gateware/common/rtl/soc_base.v b/gateware/common/rtl/soc_base.v index 25c4af8..be7766a 100644 --- a/gateware/common/rtl/soc_base.v +++ b/gateware/common/rtl/soc_base.v @@ -72,9 +72,8 @@ input wire [ WB_N -1:0] wb_m_ack, // Ticks - output wire [E1_N-1:0] tick_e1_rx, - output wire [E1_N-1:0] tick_e1_tx, - output wire tick_usb_sof, + output wire [4*E1_N-1:0] tick_e1, + output wire tick_usb_sof, // Clock / Reset input wire clk_sys, @@ -502,8 +501,7 @@ .wb_cyc (wb_cyc[7]), .wb_ack (wb_ack[7]), .irq (), - .tick_rx (tick_e1_rx), - .tick_tx (tick_e1_tx), + .mon_tick (tick_e1), .clk (clk_sys), .rst (rst_sys) ); diff --git a/gateware/cores/no2e1 b/gateware/cores/no2e1 index 9a11118..82040f1 160000 --- a/gateware/cores/no2e1 +++ b/gateware/cores/no2e1 @@ -1 +1 @@ -Subproject commit 9a1111855cb265a6271a8a43fd3809e7ad6ac040 +Subproject commit 82040f15ec54a6e22d9ad72cdcd72af37f3961dd diff --git a/gateware/e1-tracer/doc/mem-map.md b/gateware/e1-tracer/doc/mem-map.md index 06cfad0..aa79948 100644 --- a/gateware/e1-tracer/doc/mem-map.md +++ b/gateware/e1-tracer/doc/mem-map.md @@ -156,21 +156,43 @@ Write to this register with bit 2 set will trigger a FPGA reload of the selected image. -#### E1 tick channel 0/1 (Read Only, addr `0x04` / `0x05`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| / | rx_tick | +| / |ts[1]| / |ts[0]| '-----------------------------------------------------------------------------------------------' - * [15:0] - rx_tick + * [17:16] - ts[1] : Tick Source for channel 1 + * [ 1: 0] - ts[0] : Tick Source for channel 0 ``` -An internal counter is incremented at every bit received by the corresponding E1 channel. That -counter value is then captured at every USB Start-of-Frame packet and the last captured value -made available here. +Selects the tick source for the counters below for each E1 channel. +Available sources are : + +* `0`: (reserved) +* `1`: (reserved) +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| chan[1] | chan[0] | +'-----------------------------------------------------------------------------------------------' + + * [31:16] - chan[1] : Tick counter for channel 1 + * [15: 0] - chan[0] : Tick counter for channel 0 +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 +channel. That counter value is then captured at every USB Start-of-Frame packet and the last +captured value made available here. #### Time (Read Only, addr `0x07`) diff --git a/gateware/e1-tracer/rtl/misc.v b/gateware/e1-tracer/rtl/misc.v index e39a787..5d1c1f4 100644 --- a/gateware/e1-tracer/rtl/misc.v +++ b/gateware/e1-tracer/rtl/misc.v @@ -16,7 +16,7 @@ input wire btn, // Ticks - input wire [1:0] tick_e1_rx, + input wire [7:0] tick_e1, input wire tick_usb_sof, // Reset request @@ -43,9 +43,13 @@ // Bus wire bus_clr; reg bus_we_boot; + reg bus_we_tick_sel; // Counters - wire [15:0] cap_e1_rx[0:1]; + reg [1:0] tick_e1_sel[0:1]; + wire [1:0] tick_e1_mux; + + wire [15:0] cap_e1[0:1]; wire [31:0] cnt_time; // Boot @@ -64,10 +68,13 @@ // Write enables always @(posedge clk) - if (bus_clr | ~wb_we) - bus_we_boot <= 1'b0; - else - bus_we_boot <= wb_addr == 4'h0; + if (bus_clr | ~wb_we) begin + bus_we_boot <= 1'b0; + bus_we_tick_sel <= 1'b0; + end else begin + bus_we_boot <= wb_addr == 4'h0; + bus_we_tick_sel <= wb_addr == 4'h4; + end // Read mux always @(posedge clk) @@ -75,8 +82,7 @@ wb_rdata <= 32'h00000000; else case (wb_addr[3:0]) - 4'h4: wb_rdata <= { 16'h000, cap_e1_rx[0] }; - 4'h5: wb_rdata <= { 16'h000, cap_e1_rx[1] }; + 4'h4: wb_rdata <= { cap_e1[1], cap_e1[0] }; 4'h7: wb_rdata <= cnt_time; default: wb_rdata <= 32'hxxxxxxxx; endcase @@ -86,12 +92,21 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) begin + tick_e1_sel[1] <= wb_wdata[17:16]; + tick_e1_sel[0] <= wb_wdata[ 1: 0]; + end + + assign tick_e1_mux[0] = tick_e1[{1'b0, tick_e1_sel[0]}]; + assign tick_e1_mux[1] = tick_e1[{1'b1, tick_e1_sel[1]}]; + capcnt #( .W(16) ) e1_cnt_I[1:0] ( .cnt_cur (), - .cnt_cap ({cap_e1_rx[1], cap_e1_rx[0] }), - .inc ({tick_e1_rx[1], tick_e1_rx[0]}), + .cnt_cap ({ cap_e1[1], cap_e1[0] }), + .inc ({ tick_e1_mux[1], tick_e1_mux[0] }), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/e1-tracer/rtl/top.v b/gateware/e1-tracer/rtl/top.v index 0e76c5a..8e1d67b 100644 --- a/gateware/e1-tracer/rtl/top.v +++ b/gateware/e1-tracer/rtl/top.v @@ -80,7 +80,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire [1:0] tick_e1_rx; + wire [7:0] tick_e1; wire tick_usb_sof; // Clocks / Reset @@ -136,7 +136,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -167,7 +167,7 @@ misc misc_I ( .btn (btn), - .tick_e1_rx (tick_e1_rx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), diff --git a/gateware/icE1usb-proto/doc/mem-map.md b/gateware/icE1usb-proto/doc/mem-map.md index d8f9cba..b326619 100644 --- a/gateware/icE1usb-proto/doc/mem-map.md +++ b/gateware/icE1usb-proto/doc/mem-map.md @@ -156,20 +156,39 @@ Write to this register with bit 2 set will trigger a FPGA reload of the selected image. -#### E1 tick channel 0 (Read Only, addr `0x04`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| tx_tick | rx_tick | +| / | tss | '-----------------------------------------------------------------------------------------------' - * [31:16] - tx_tick - * [15: 0] - rx_tick + * [ 1: 0] - tss : Tick Source Select ``` -An internal counter is incremented at every bit received/transmitted by the corresponding E1 +Selects the tick source for the counters below. +Available sources are : + +* `0`: TX tick, for every bit sent +* `1`: RX Pulse, for every detected pulse on the input +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| / | tick_cnt | +'-----------------------------------------------------------------------------------------------' + + * [15: 0] - tick_cnt : Tick counter value +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 channel. That counter value is then captured at every USB Start-of-Frame packet and the last captured value made available here. diff --git a/gateware/icE1usb-proto/rtl/misc.v b/gateware/icE1usb-proto/rtl/misc.v index 8ff14d9..68ac624 100644 --- a/gateware/icE1usb-proto/rtl/misc.v +++ b/gateware/icE1usb-proto/rtl/misc.v @@ -26,9 +26,8 @@ input wire btn, // Ticks - input wire tick_e1_rx, - input wire tick_e1_tx, - input wire tick_usb_sof, + input wire [3:0] tick_e1, + input wire tick_usb_sof, // Reset request output wire rst_req, @@ -52,12 +51,15 @@ // Bus wire bus_clr; reg bus_we_boot; + reg bus_we_tick_sel; reg [ 1:0] bus_we_pdm_clk; reg [ 2:0] bus_we_pdm_e1; // Counters - wire [15:0] cap_e1_rx; - wire [15:0] cap_e1_tx; + reg [1:0] tick_e1_sel; + wire tick_e1_mux; + + wire [15:0] cap_e1; wire [31:0] cnt_time; // PDM @@ -82,6 +84,7 @@ always @(posedge clk) if (bus_clr | ~wb_we) begin bus_we_boot <= 1'b0; + bus_we_tick_sel <= 1'b0; bus_we_pdm_clk[0] <= 1'b0; bus_we_pdm_clk[1] <= 1'b0; bus_we_pdm_e1[0] <= 1'b0; @@ -89,6 +92,7 @@ bus_we_pdm_e1[2] <= 1'b0; end else begin bus_we_boot <= wb_addr == 4'h0; + bus_we_tick_sel <= wb_addr == 4'h4; bus_we_pdm_clk[0] <= wb_addr == 4'h8; bus_we_pdm_clk[1] <= wb_addr == 4'h9; bus_we_pdm_e1[0] <= wb_addr == 4'ha; @@ -102,7 +106,7 @@ wb_rdata <= 32'h00000000; else case (wb_addr[3:0]) - 4'h4: wb_rdata <= { cap_e1_tx, cap_e1_rx }; + 4'h4: wb_rdata <= { 16'h0000, cap_e1 }; 4'h7: wb_rdata <= cnt_time; `ifdef WITH_PDM_READBACK 4'h8: wb_rdata <= { pdm_clk[0][12], 19'h00000, pdm_clk[0][11:0] }; @@ -119,12 +123,18 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) + tick_e1_sel <= wb_wdata[1:0]; + + assign tick_e1_mux = tick_e1[tick_e1_sel]; + capcnt #( .W(16) - ) e1_cnt_I[1:0] ( + ) e1_cnt_I ( .cnt_cur (), - .cnt_cap ({cap_e1_tx, cap_e1_rx }), - .inc ({tick_e1_tx, tick_e1_rx}), + .cnt_cap (cap_e1), + .inc (tick_e1_mux), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/icE1usb-proto/rtl/top.v b/gateware/icE1usb-proto/rtl/top.v index 7cefeac..40eaf5c 100644 --- a/gateware/icE1usb-proto/rtl/top.v +++ b/gateware/icE1usb-proto/rtl/top.v @@ -78,8 +78,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire tick_e1_rx; - wire tick_e1_tx; + wire [3:0] tick_e1; wire tick_usb_sof; // Clocks / Reset @@ -135,8 +134,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -172,8 +170,7 @@ .clk_tune_hi (clk_tune_hi), .clk_tune_lo (clk_tune_lo), .btn (btn), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), diff --git a/gateware/icE1usb/doc/mem-map.md b/gateware/icE1usb/doc/mem-map.md index 75d7b69..395a577 100644 --- a/gateware/icE1usb/doc/mem-map.md +++ b/gateware/icE1usb/doc/mem-map.md @@ -206,20 +206,41 @@ * `10`: Slow blink * `11`: Fast blink -#### E1 tick channel 0/1 (Read Only, addr `0x04-0x05`) +#### E1 tick source select (Write Only, addr `0x04`) ```text ,-----------------------------------------------------------------------------------------------, |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| |-----------------------------------------------------------------------------------------------| -| tx_tick | rx_tick | +| / |ts[1]| / |ts[0]| '-----------------------------------------------------------------------------------------------' - * [31:16] - tx_tick - * [15: 0] - rx_tick + * [17:16] - ts[1] : Tick Source for channel 1 + * [ 1: 0] - ts[0] : Tick Source for channel 0 ``` -An internal counter is incremented at every bit received/transmitted by the corresponding E1 +Selects the tick source for the counters below for each E1 channel. +Available sources are : + +* `0`: TX tick, for every bit sent +* `1`: RX Pulse, for every detected pulse on the input +* `2`: RX Sample, for every bit received +* `3`: RX One, for every `1` bit received + +#### E1 tick counters (Read Only, addr `0x04`) + +```text +,-----------------------------------------------------------------------------------------------, +|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| +|-----------------------------------------------------------------------------------------------| +| chan[1] | chan[0] | +'-----------------------------------------------------------------------------------------------' + + * [31:16] - chan[1] : Tick counter for channel 1 + * [15: 0] - chan[0] : Tick counter for channel 0 +``` + +An internal counter is incremented at every E1 tick (tick source selected above) for each E1 channel. That counter value is then captured at every USB Start-of-Frame packet and the last captured value made available here. diff --git a/gateware/icE1usb/rtl/misc.v b/gateware/icE1usb/rtl/misc.v index 7aaa068..347412c 100644 --- a/gateware/icE1usb/rtl/misc.v +++ b/gateware/icE1usb/rtl/misc.v @@ -37,8 +37,7 @@ input wire btn_stb, // Ticks - input wire [ 1:0] tick_e1_rx, - input wire [ 1:0] tick_e1_tx, + input wire [ 7:0] tick_e1, input wire tick_usb_sof, // Reset request @@ -67,6 +66,7 @@ reg bus_we_boot; reg bus_we_gpio; reg bus_we_led; + reg bus_we_tick_sel; reg [ 1:0] bus_we_pdm_clk; reg [ 1:0] bus_we_pdm_e1; @@ -83,8 +83,10 @@ wire gps_pps_r; // Counters - wire [15:0] cap_e1_rx[0:1]; - wire [15:0] cap_e1_tx[0:1]; + reg [1:0] tick_e1_sel[0:1]; + wire [1:0] tick_e1_mux; + + wire [15:0] cap_e1[0:1]; wire [31:0] cap_gps; wire [31:0] cnt_time; @@ -112,6 +114,7 @@ bus_we_boot <= 1'b0; bus_we_gpio <= 1'b0; bus_we_led <= 1'b0; + bus_we_tick_sel <= 1'b0; bus_we_pdm_clk[0] <= 1'b0; bus_we_pdm_clk[1] <= 1'b0; bus_we_pdm_e1[0] <= 1'b0; @@ -120,6 +123,7 @@ bus_we_boot <= wb_addr == 4'h0; bus_we_gpio <= wb_addr == 4'h1; bus_we_led <= wb_addr == 4'h2; + bus_we_tick_sel <= wb_addr == 4'h4; bus_we_pdm_clk[0] <= wb_addr == 4'h8; bus_we_pdm_clk[1] <= wb_addr == 4'h9; bus_we_pdm_e1[0] <= wb_addr == 4'ha; @@ -134,8 +138,7 @@ case (wb_addr[3:0]) 4'h1: wb_rdata <= { 12'h000, gpio_in, 4'h0, gpio_oe, 4'h0, gpio_out }; 4'h2: wb_rdata <= { 22'h000000, e1_led_active, e1_led }; - 4'h4: wb_rdata <= { cap_e1_tx[0], cap_e1_rx[0] }; - 4'h5: wb_rdata <= { cap_e1_tx[1], cap_e1_rx[1] }; + 4'h4: wb_rdata <= { cap_e1[1], cap_e1[0] }; 4'h6: wb_rdata <= cap_gps; 4'h7: wb_rdata <= cnt_time; `ifdef WITH_PDM_READBACK @@ -229,12 +232,21 @@ // -------- // E1 ticks + always @(posedge clk) + if (bus_we_tick_sel) begin + tick_e1_sel[1] <= wb_wdata[17:16]; + tick_e1_sel[0] <= wb_wdata[ 1: 0]; + end + + assign tick_e1_mux[0] = tick_e1[{1'b0, tick_e1_sel[0]}]; + assign tick_e1_mux[1] = tick_e1[{1'b1, tick_e1_sel[1]}]; + capcnt #( .W(16) - ) e1_cnt_I[3:0] ( + ) e1_cnt_I[1:0] ( .cnt_cur (), - .cnt_cap ({cap_e1_tx[1], cap_e1_rx[1], cap_e1_tx[0], cap_e1_rx[0] }), - .inc ({tick_e1_tx[1], tick_e1_rx[1], tick_e1_tx[0], tick_e1_rx[0]}), + .cnt_cap ({ cap_e1[1], cap_e1[0] }), + .inc ({ tick_e1_mux[1], tick_e1_mux[0] }), .cap (tick_usb_sof), .clk (clk), .rst (rst) diff --git a/gateware/icE1usb/rtl/top.v b/gateware/icE1usb/rtl/top.v index a2b8979..472c1ff 100644 --- a/gateware/icE1usb/rtl/top.v +++ b/gateware/icE1usb/rtl/top.v @@ -99,8 +99,7 @@ wire [(WB_N*32)-1:0] wb_rdata_flat; // Ticks - wire [1:0] tick_e1_rx; - wire [1:0] tick_e1_tx; + wire [7:0] tick_e1; wire tick_usb_sof; // I2C @@ -182,8 +181,7 @@ .wb_m_we (wb_we), .wb_m_cyc (wb_cyc), .wb_m_ack (wb_ack), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .clk_sys (clk_sys), .rst_sys (rst_sys), @@ -255,8 +253,7 @@ .e1_led_active (e1_led_active), .btn_val (btn_val), .btn_stb (btn_stb), - .tick_e1_rx (tick_e1_rx), - .tick_e1_tx (tick_e1_tx), + .tick_e1 (tick_e1), .tick_usb_sof (tick_usb_sof), .rst_req (rst_req), .wb_addr (wb_addr[7:0]), -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36679?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I31fa8a717a26643f1b6ca5644bee1d8c41a2512e Gerrit-Change-Number: 36679 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Always define NUM_E1_PORTS in Makefile

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?usp=email ) Change subject: icE1usb fw: Always define NUM_E1_PORTS in Makefile ...................................................................... icE1usb fw: Always define NUM_E1_PORTS in Makefile So that it's available without having to include the USB include ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I0b434cef7a662c19e5f48072285c013e8c02e254 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/usb_desc_ids.h 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/81/36681/1 diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index f385408..5fcd1f7 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -19,6 +19,8 @@ ifeq ($(SINGLE_CHANNEL),1) CFLAGS += -DNUM_E1_PORTS=1 +else +CFLAGS += -DNUM_E1_PORTS=2 endif NO2USB_FW_VERSION=0 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index df0331e..b9a7032 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -7,10 +7,6 @@ #pragma once -#ifndef NUM_E1_PORTS -# define NUM_E1_PORTS 2 -#endif - #define USB_INTF_E1(p) (0 + (p)) #define USB_INTF_GPS_CDC_CTL (NUM_E1_PORTS + 0) #define USB_INTF_GPS_CDC_DATA (NUM_E1_PORTS + 1) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I0b434cef7a662c19e5f48072285c013e8c02e254 Gerrit-Change-Number: 36681 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

1 day, 19 hours

1
0
0 0

2024

2023

2022

gerrit-log April 2024