Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32499 )
Change subject: jobs/gerrit: disable endianness check for osmo-ci
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> what is this about?
updated the commit message to explain it
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32499
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib9a2ed2ce02a171f0bdca56728f8cdabf8f4cd1f
Gerrit-Change-Number: 32499
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 27 Apr 2023 12:42:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello Jenkins Builder, msuraev,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/32499
to look at the new patch set (#2).
Change subject: jobs/gerrit: disable endianness check for osmo-ci
......................................................................
jobs/gerrit: disable endianness check for osmo-ci
Do not run struct_endianness.py from libosmocore.git on osmo-ci.git, as
it doesn't contain C code.
Change-Id: Ib9a2ed2ce02a171f0bdca56728f8cdabf8f4cd1f
---
M jobs/gerrit-verifications.yml
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/99/32499/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32499
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib9a2ed2ce02a171f0bdca56728f8cdabf8f4cd1f
Gerrit-Change-Number: 32499
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32218 )
Change subject: mgcp_codec: fix codec decision
......................................................................
Patch Set 10:
(2 comments)
File src/libosmo-mgcp/mgcp_codec.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/32218/comment/cb505aff_45cc6906
PS8, Line 401: * a tentative decision is made.
> 1) The decision is made for both directions and each side keeps the result in end.codec. […]
1) ack for dexter. In an endpoint there's 2 connections (sides), and there's 2 directions on each conn, one Tx and one Rx. A decision has to be taken for each conn Tx direction (hence 2 decisions).
2) ack for dexter. UDP connections exists I see no weird use in there. In any case in here we talk about mgcp_conn(_rtp).
3) ack, we must choose when in loopback mode I guess.
File src/libosmo-mgcp/mgcp_network.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/32218/comment/6af8ff5b_95b588d5
PS8, Line 511: rtp_hdr->payload_type = (uint8_t) conn_dst->end.codec->payload_type;
> I think there must be a consciously chosen payload type for each connection (endpoint is the entity […]
ACK, AFAIU the PayloadType is assigned to a connection, not to an endpoint.
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32218
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6c3291f825488e5d8ce136aeb18450156794aeb5
Gerrit-Change-Number: 32218
Gerrit-PatchSet: 10
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 27 Apr 2023 12:37:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/32487 )
Change subject: Cosmetic: fix CI errors
......................................................................
Cosmetic: fix CI errors
* Fix UTF-8 encoding. This caused the endianness check to fail, which
reads all .c and .h files.
* Add .checkpatch.conf to skip linting for:
firmware/atmel_softpack_libraries
Change-Id: Ibb2e42e9b4307275a33e4000c201847a6bd60137
---
A .checkpatch.conf
M firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
M firmware/atmel_softpack_libraries/usb/include/USBD.h
M firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
M firmware/libcommon/include/cciddriver.h
M firmware/libcommon/source/cciddriver.c
6 files changed, 36 insertions(+), 20 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/.checkpatch.conf b/.checkpatch.conf
new file mode 100644
index 0000000..591ff65
--- /dev/null
+++ b/.checkpatch.conf
@@ -0,0 +1 @@
+--exclude ^firmware/atmel_softpack_libraries/.*$
diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h b/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
index e6af94e..8ae70df 100644
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
@@ -15,7 +15,7 @@
/* Define attribute */
-#if defined ( __CC_ARM ) /* Keil µVision 4 */
+#if defined ( __CC_ARM ) /* Keil µVision 4 */
#define WEAK __attribute__ ((weak))
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define WEAK __weak
diff --git a/firmware/atmel_softpack_libraries/usb/include/USBD.h b/firmware/atmel_softpack_libraries/usb/include/USBD.h
index 6fc931f..6eeb68a 100644
--- a/firmware/atmel_softpack_libraries/usb/include/USBD.h
+++ b/firmware/atmel_softpack_libraries/usb/include/USBD.h
@@ -63,7 +63,7 @@
*------------------------------------------------------------------------------*/
/* Define attribute */
-#if defined ( __CC_ARM ) /* Keil µVision 4 */
+#if defined ( __CC_ARM ) /* Keil µVision 4 */
#define WEAK __attribute__ ((weak))
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define WEAK __weak
diff --git a/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
index 84b5ef6..aada0f1 100644
--- a/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
+++ b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
@@ -296,7 +296,7 @@
*/
#pragma pack(1)
-#if defined ( __CC_ARM ) /* Keil µVision 4 */
+#if defined ( __CC_ARM ) /* Keil µVision 4 */
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define __attribute__(...)
#elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */
diff --git a/firmware/libcommon/include/cciddriver.h b/firmware/libcommon/include/cciddriver.h
index f9be027..df77fa3 100644
--- a/firmware/libcommon/include/cciddriver.h
+++ b/firmware/libcommon/include/cciddriver.h
@@ -175,11 +175,11 @@
{
/// Number of seconds. If 00h then CCID default value is used.
unsigned char bTimeOut;
- /// Several parameters for the PIN format options (defined in § 6.1.11.4)
+ /// Several parameters for the PIN format options (defined in § 6.1.11.4)
unsigned char bmFormatString4;
/// Define the length of the PIN to present in the APDU command
unsigned char bmPINBlockString;
- /// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
+ /// Allows the length PIN insertion in the APDU command (defined in § 6.1.11.6)
unsigned char bmPinLengthFormat;
/// Insertion position offset in byte for the current PIN
unsigned char bInsertionOffsetOld;
@@ -218,13 +218,13 @@
/// Protocol Data Structure for Protocol T=0 (bProtocolNum=0, dwLength=00000005h)
typedef struct
{
- /// B7-4 FI Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
+ /// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
/// clock rate conversion factor
- /// B3-0 DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
+ /// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
/// baud rate conversion factor
unsigned char bmFindexDindex;
- /// For T=0 ,B0 0b, B7-2 000000b
- /// B1 Convention used (b1=0 for direct, b1=1 for inverse)
+ /// For T=0 ,B0 - 0b, B7-2 - 000000b
+ /// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
unsigned char bmTCCKST0; // 0 to 2
/// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
/// guardtime of 12etu. FFh is the same as 00h.
@@ -243,14 +243,14 @@
/// Protocol Data Structure for Protocol T=1 (bProtocolNum=1, dwLength=00000007h)
typedef struct
{
- /// B7-4 FI Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
+ /// B7-4 - FI - Index into the table 7 in ISO/IEC 7816-3:1997 selecting a
/// clock rate conversion factor
- /// B3-0 DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
+ /// B3-0 - DI - Index into the table 8 in ISO/IEC 7816-3:1997 selecting a
/// baud rate conversion factor
unsigned char bmFindexDindex;
- /// For T=1, B7-2 000100b
- /// B0 Checksum type (b0=0 for LRC, b0=1 for CRC
- /// B1 Convention used (b1=0 for direct, b1=1 for inverse)
+ /// For T=1, B7-2 - 000100b
+ /// B0 - Checksum type (b0=0 for LRC, b0=1 for CRC
+ /// B1 - Convention used (b1=0 for direct, b1=1 for inverse)
unsigned char bmTCCKST1; // 10h, 11h, 12h, 13h
/// Extra Guardtime (0 to 254 etu between two characters).
/// If value is FFh, then guardtime is reduced by 1.
@@ -292,8 +292,8 @@
/// - 04h 1.8V
/// Other bits are RFU.
unsigned char bVoltageSupport;
- /// RRRR Upper Word- is RFU = 0000h
- /// PPPP Lower Word- Encodes the supported protocol types. A 1 in a given
+ /// RRRR -Upper Word- is RFU = 0000h
+ /// PPPP -Lower Word- Encodes the supported protocol types. A "1" in a given
/// bit position indicates support for the associated ISO protocol.
/// 0001h = Protocol T=0
/// 0002h = Protocol T=1
@@ -318,7 +318,7 @@
/// Indicates the maximum IFSD supported by CCID for protocol T=1.
unsigned long dwMaxIFSD;
/// - RRRR-Upper Word- is RFU = 0000h
- /// - PPPP-Lower Word- encodes the supported protocol types. A 1 in a given
+ /// - PPPP-Lower Word- encodes the supported protocol types. A "1" in a given
/// bit position indicates support for the associated protocol.
/// 0001h indicates support for the 2-wire protocol 1
/// 0002h indicates support for the 3-wire protocol 1
diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c
index dfadd6b..b4ff451 100644
--- a/firmware/libcommon/source/cciddriver.c
+++ b/firmware/libcommon/source/cciddriver.c
@@ -193,8 +193,8 @@
ccidDriver.ProtocolDataStructure[0] = Atr[2]; // TA(1)
// bmTCCKST0
- // For T=0 ,B0 0b, B7-2 000000b
- // B1 Convention used (b1=0 for direct, b1=1 for inverse)
+ // For T=0 ,B0 - 0b, B7-2 - 000000b
+ // B1 - Convention used (b1=0 for direct, b1=1 for inverse)
// bGuardTimeT0
// Extra Guardtime between two characters. Add 0 to 254 etu to the normal
@@ -1005,7 +1005,7 @@
//------------------------------------------------------------------------------
/// Interrupt-IN Messages
/// This message is sent when any bit in the bHardwareErrorCode field is set.
-/// If this message is sent when there is no outstanding command, the bSeq
+/// If this message is sent when there is no "outstanding" command, the bSeq
/// field will be undefined.
/// \param bSlot ICC slot number
/// \param bSeq Sequence number of the bulk OUT command when the hardware error
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/32487
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Ibb2e42e9b4307275a33e4000c201847a6bd60137
Gerrit-Change-Number: 32487
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/32500 )
Change subject: debian/rules: remove override_dh_autoreconf
......................................................................
debian/rules: remove override_dh_autoreconf
The Makefile already runs autoreconf -fi in the "utils" target:
utils:
(cd host && \
autoreconf -fi && \
./configure --prefix=/usr --disable-werror && \
make)
The override is not useful, as it leads to debhelper running autoreconf
as well, but without running ./configure and make in the host directory
afterwards. So autoreconf just runs twice.
I've also considered to change debian/rules to only run the "fw"
target, and not the "utils" target of the Makefile. But that only makes
it more complex, as debhelper would then need to run make twice, once in
the root directory (as "make fw"), and once in the host directory. We
would need to add several lines to debian/rules to do effectively the
same thing.
Make this change now, as "cd host && dh_autoreconf" doesn't work with
debhelper compat level v10 anymore (--sourcedir could be used instead,
but as mentioned above, it's not useful).
Related: OS#5958
Change-Id: I12f379b4ec2de6adc86557d89319ab1d04ed5e73
---
M debian/rules
1 file changed, 33 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
msuraev: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/debian/rules b/debian/rules
index 2c615db..9d1fa4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,3 @@
%:
dh $@
-
-override_dh_autoreconf:
- cd host && dh_autoreconf
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/32500
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I12f379b4ec2de6adc86557d89319ab1d04ed5e73
Gerrit-Change-Number: 32500
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged