January 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: cosmetic: Use EF.FDN instead of EF_FDN in ts_51_011.py

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26963 ) Change subject: cosmetic: Use EF.FDN instead of EF_FDN in ts_51_011.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icabb892408a40ea37c7ebeb7db545b383aa01d99 Gerrit-Change-Number: 26963 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 22 Jan 2022 12:58:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in pysim[master]: ts_31_102: Add support for EF.ECC (emergency call codes)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26962 ) Change subject: ts_31_102: Add support for EF.ECC (emergency call codes) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If8b4972af4f5be1707446d335cfc6e729c973abb Gerrit-Change-Number: 26962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 22 Jan 2022 12:58:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in pysim[master]: add missing bit definition for NG-RAN in xAcT

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26956 ) Change subject: add missing bit definition for NG-RAN in xAcT ...................................................................... add missing bit definition for NG-RAN in xAcT when encoding the AcT value bit 11 is correctly set when NG-RAN is present in the string representation, however the decoding of bit 11 was missing. Adds tests for the decoder as well. Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M tests/test_utils.py 6 files changed, 14 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/utils.py b/pySim/utils.py index e30c970..1806d0d 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -464,6 +464,7 @@ act_list = [ {'bit': 15, 'name': "UTRAN"}, {'bit': 14, 'name': "E-UTRAN"}, + {'bit': 11, 'name': "NG-RAN"}, {'bit': 7, 'name': "GSM"}, {'bit': 6, 'name': "GSM COMPACT"}, {'bit': 5, 'name': "cdma2000 HRPD"}, diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok index 2a912e2..f07c033 100644 --- a/pysim-testdata/Fairwaves-SIM.ok +++ b/pysim-testdata/Fairwaves-SIM.ok @@ -31,7 +31,7 @@ ffffff0000 # unused HPLMNAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok index 0eb8cc8..d8f1a6f 100644 --- a/pysim-testdata/Wavemobile-SIM.ok +++ b/pysim-testdata/Wavemobile-SIM.ok @@ -11,7 +11,7 @@ Hide in OPLMN: False PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused @@ -29,7 +29,7 @@ ffffff0000 # unused OPLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index 87cb857..a8c98d9 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -11,7 +11,7 @@ Hide in OPLMN: True PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused @@ -25,7 +25,7 @@ ffffff0000 # unused OPLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused @@ -39,7 +39,7 @@ ffffff0000 # unused HPLMNAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index e65f276..14d7110 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -11,7 +11,7 @@ Hide in OPLMN: True PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff PLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused @@ -25,7 +25,7 @@ ffffff0000 # unused OPLMNwAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused @@ -39,7 +39,7 @@ ffffff0000 # unused HPLMNAcT: - 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + 00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, NG-RAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT ffffff0000 # unused ffffff0000 # unused ffffff0000 # unused diff --git a/tests/test_utils.py b/tests/test_utils.py index ed22eff..ae23461 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -80,6 +80,9 @@ def testDecAct_onlyEUtran(self): self.assertEqual(utils.dec_act("4000"), ["E-UTRAN"]) + def testDecAct_onlyNgRan(self): + self.assertEqual(utils.dec_act("0800"), ["NG-RAN"]) + def testDecAct_onlyGsm(self): self.assertEqual(utils.dec_act("0080"), ["GSM"]) @@ -93,7 +96,7 @@ self.assertEqual(utils.dec_act("0010"), ["cdma2000 1xRTT"]) def testDecAct_allSet(self): - self.assertEqual(utils.dec_act("ffff"), ["UTRAN", "E-UTRAN WB-S1", "E-UTRAN NB-S1", "GSM", "GSM COMPACT", "cdma2000 HRPD", "cdma2000 1xRTT"]) + self.assertEqual(utils.dec_act("ffff"), ["UTRAN", "E-UTRAN WB-S1", "E-UTRAN NB-S1", "NG-RAN", "GSM", "GSM COMPACT", "cdma2000 HRPD", "cdma2000 1xRTT"]) def testDecxPlmn_w_act(self): expected = {'mcc': '295', 'mnc': '10', 'act': ["UTRAN"]} -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 Gerrit-Change-Number: 26956 Gerrit-PatchSet: 4 Gerrit-Owner: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in pysim[master]: add missing bit definition for NG-RAN in xAcT

by laforge

Attention is currently required from: bjoern, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26956 ) Change subject: add missing bit definition for NG-RAN in xAcT ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I910df28c4c59ec94cce9603377786325f6d8c1a3 Gerrit-Change-Number: 26956 Gerrit-PatchSet: 3 Gerrit-Owner: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: bjoern <bjoern.c3(a)nixda.biz> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Jan 2022 12:57:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26968 ) Change subject: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s ...................................................................... icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s This seems to be the kernel default for CTRL request timeout, let's use it here. Change-Id: I7b7c1a2b13f61372e839e34a376e66c91190bdb3 --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 7744828..13af6fc 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -209,7 +209,8 @@ rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0), ICE1USB_INTF_SET_TX_CFG, USB_RT_VEND_IF, - 0, 0, &ieu->cfg.tx, sizeof(ieu->cfg.tx), 1000); + 0, 0, &ieu->cfg.tx, sizeof(ieu->cfg.tx), + USB_CTRL_SET_TIMEOUT); if (rc < 0) return rc; if (rc != sizeof(ieu->cfg.tx)) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7b7c1a2b13f61372e839e34a376e66c91190bdb3 Gerrit-Change-Number: 26968 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26968 ) Change subject: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7b7c1a2b13f61372e839e34a376e66c91190bdb3 Gerrit-Change-Number: 26968 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 22 Jan 2022 12:57:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: update ice1usb_proto.h to firmware 0.2

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26967 ) Change subject: icE1usb: update ice1usb_proto.h to firmware 0.2 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: as I wrote on IRC last night, I think the GPS-DO should actually be exposed as anoter interface descriptor (with no endpoints). This would substantially simplify the DAHDI (or any Linux kernel) driver. Wondering if we should at thta point move the requests from device to interface level? -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 Gerrit-Change-Number: 26967 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Sat, 22 Jan 2022 12:57:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmocore in openSUSE_Factory_ARM/aarch64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmocore failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 50s] [190/207] cumulate pam_unix-1.5.2-5.3 [ 50s] [191/207] cumulate python38-3.8.12-3.4 [ 50s] [192/207] cumulate libgnutls-devel-3.7.3-1.1 [ 50s] [193/207] cumulate libgio-2_0-0-2.70.2-1.2 [ 50s] [194/207] cumulate systemd-mini-249.9-1.1 [ 50s] [195/207] cumulate shadow-4.11.1-1.1 [ 50s] [196/207] cumulate util-linux-2.37.2-2.3 [ 50s] [197/207] cumulate gcc-PIE-11-4.3 [ 50s] [198/207] cumulate gio-branding-upstream-2.70.2-1.2 [ 50s] [199/207] cumulate glib2-tools-2.70.2-1.2 [ 50s] [200/207] cumulate polkit-0.120-1.2 [ 50s] [201/207] cumulate rpm-build-4.17.0-2.4 [ 50s] [202/207] cumulate libpolkit-gobject-1-0-0.120-1.2 [ 50s] [203/207] cumulate polkit-default-privs-1550+20211214.daf2765-1.1 [ 50s] [204/207] cumulate rpmlint-mini-2.2.0+git20220106.43867d0-3.2 [ 50s] [205/207] cumulate libpolkit-agent-1-0-0.120-1.2 [ 50s] [206/207] cumulate pcsc-lite-1.9.5-1.2 [ 50s] [207/207] cumulate pcsc-lite-devel-1.9.5-1.2 [ 50s] now installing cumulated packages [ 50s] error: .init_b_cache/libbz2-1.rpm: signature region trailer: BAD, tag 0 type 0 offset 0 count 0 [ 50s] error: .init_b_cache/libbz2-1.rpm cannot be installed [ 51s] exit ... [ 51s] ### VM INTERACTION START ### [ 54s] [ 8.829939][ T391] sysrq: Power Off [ 54s] [ 8.830436][ T262] reboot: Power down [ 54s] ### VM INTERACTION END ### [ 54s] [ 54s] obs-arm-11 failed "build libosmocore.spec" at Sat Jan 22 00:29:07 UTC 2022. [ 54s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26968 ) Change subject: icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s ...................................................................... icE1usb: Use USB_CTRL_SET_TIMEOUT (5s) instead of hand-coded 1s This seems to be the kernel default for CTRL request timeout, let's use it here. Change-Id: I7b7c1a2b13f61372e839e34a376e66c91190bdb3 --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/68/26968/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 9339933..87a7422 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -209,7 +209,8 @@ rc = usb_control_msg(ieu->usb_dev, usb_sndctrlpipe(ieu->usb_dev, 0), ICE1USB_INTF_SET_TX_CFG, USB_RT_VEND_IF, - 0, 0, &ieu->cfg.tx, sizeof(ieu->cfg.tx), 1000); + 0, 0, &ieu->cfg.tx, sizeof(ieu->cfg.tx), + USB_CTRL_SET_TIMEOUT); if (rc < 0) return rc; if (rc != sizeof(ieu->cfg.tx)) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I7b7c1a2b13f61372e839e34a376e66c91190bdb3 Gerrit-Change-Number: 26968 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: update ice1usb_proto.h to firmware 0.2

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/26967 ) Change subject: icE1usb: update ice1usb_proto.h to firmware 0.2 ...................................................................... icE1usb: update ice1usb_proto.h to firmware 0.2 git revision c308334de7f7fb92504364f29bd815014002d3ce of https://git.osmocom.org/osmo-e1-hardware Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 --- M drivers/dahdi/icE1usb/icE1usb.c M drivers/dahdi/icE1usb/ice1usb_proto.h 2 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/67/26967/1 diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index 7744828..9339933 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -1012,6 +1012,8 @@ dev_err(&intf->dev, "Cannot find ON altsetting"); goto error; } + dev_info(&intf->dev, "altsetting off=%u, on=%u\n", + ieu->alt_off->desc.bAlternateSetting, ieu->alt_on->desc.bAlternateSetting); /* locate ON / OFF altsettings */ if (find_endpoints(ieu, ieu->alt_on) < 4) { @@ -1034,6 +1036,7 @@ //ddev->location = USB_BUS_PATH; dspan = &ieu->dahdi.span; + /* TODO: include USB path info? */ snprintf(dspan->name, sizeof(dspan->name), "icE1usb/1/%d", ieu->alt_on->desc.bInterfaceNumber); //TDOO: device != 1 snprintf(dspan->desc, sizeof(dspan->desc), "Osmocom icE1USB Card 1 Span %d", diff --git a/drivers/dahdi/icE1usb/ice1usb_proto.h b/drivers/dahdi/icE1usb/ice1usb_proto.h index d0d7304..a249537 100644 --- a/drivers/dahdi/icE1usb/ice1usb_proto.h +++ b/drivers/dahdi/icE1usb/ice1usb_proto.h @@ -17,12 +17,51 @@ /*! returns a bit-mask of optional device capabilities (see enum e1usb_dev_capability) */ #define ICE1USB_DEV_GET_CAPABILITIES 0x01 #define ICE1USB_DEV_GET_FW_BUILD 0x02 +#define ICE1USB_DEV_GET_GPSDO_STATUS 0x10 +#define ICE1USB_DEV_GET_GPSDO_MODE 0x12 /*!< uint8_t */ +#define ICE1USB_DEV_SET_GPSDO_MODE 0x13 /*!< wValue = mode */ +#define ICE1USB_DEV_GET_GPSDO_TUNE 0x14 /*!< data = struct e1usb_gpsdo_tune */ +#define ICE1USB_DEV_SET_GPSDO_TUNE 0x15 /*!< data = struct e1usb_gpsdo_tune */ enum e1usb_dev_capability { /*! Does this board have a GPS-DO */ ICE1USB_DEV_CAP_GPSDO, }; +enum ice1usb_gpsdo_mode { + ICE1USB_GPSDO_MODE_DISABLED = 0, + ICE1USB_GPSDO_MODE_AUTO = 1, +}; + +enum ice1usb_gpsdo_antenna_state { + ICE1USB_GPSDO_ANT_UNKNOWN = 0, + ICE1USB_GPSDO_ANT_OK = 1, + ICE1USB_GPSDO_ANT_OPEN = 2, + ICE1USB_GPSDO_ANT_SHORT = 3, +}; + +enum ice1usb_gpsdo_state { + ICE1USB_GPSDO_STATE_DISABLED = 0, + ICE1USB_GPSDO_STATE_CALIBRATE = 1, + ICE1USB_GPSDO_STATE_HOLD_OVER = 2, + ICE1USB_GPSDO_STATE_TUNE_COARSE = 3, + ICE1USB_GPSDO_STATE_TUNE_FINE = 4, +}; + +struct e1usb_gpsdo_tune { + uint16_t coarse; + uint16_t fine; +} __attribute__((packed)); + +struct e1usb_gpsdo_status { + uint8_t state; + uint8_t antenna_status; /*!< Antenna status */ + uint8_t valid_fix; /*!< Valid GPS Fix (0/1) */ + uint8_t mode; /*!< Current configured operating mode */ + struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ + uint32_t freq_est; /*!< Latest frequency estimate measurement */ +} __attribute__((packed)); + /* Interface Requests */ @@ -32,6 +71,7 @@ #define ICE1USB_INTF_GET_TX_CFG 0x03 /*!< struct ice1usb_tx_config */ #define ICE1USB_INTF_SET_RX_CFG 0x04 /*!< struct ice1usb_rx_config */ #define ICE1USB_INTF_GET_RX_CFG 0x05 /*!< struct ice1usb_rx_config */ +#define ICE1USB_INTF_GET_ERRORS 0x06 /*!< struct ice1usb_irq_err */ //enum e1usb_intf_capability { }; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/26967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I1423531470a1c9165d713108fb6a87ff47ff6e29 Gerrit-Change-Number: 26967 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2022