diff --git a/0001-SPDX-bill-of-material-is-supposed-to-be-project_name.patch b/0001-SPDX-bill-of-material-is-supposed-to-be-project_name.patch new file mode 100644 index 0000000..95fca96 --- /dev/null +++ b/0001-SPDX-bill-of-material-is-supposed-to-be-project_name.patch @@ -0,0 +1,20 @@ +From 187ea8e53db652a29bc0b79cdd2d2ced146560ee Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 15 May 2018 21:46:52 +0200 +Subject: [PATCH 1/9] SPDX bill-of-material is supposed to be project_name.spdx + +So rename bom.spdx to usbutils.spdx + +Signed-off-by: Greg Kroah-Hartman +--- + bom.spdx => usbutils.spdx | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + rename bom.spdx => usbutils.spdx (100%) + +diff --git a/bom.spdx b/usbutils.spdx +similarity index 100% +rename from bom.spdx +rename to usbutils.spdx +-- +2.14.4 + diff --git a/0002-Makefile.am-add-files-with-licenses-to-archive.patch b/0002-Makefile.am-add-files-with-licenses-to-archive.patch new file mode 100644 index 0000000..dc5ac8e --- /dev/null +++ b/0002-Makefile.am-add-files-with-licenses-to-archive.patch @@ -0,0 +1,27 @@ +From 747db4bc75e1e7380e2cf7aef4ac2076ae27017d Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Wed, 16 May 2018 11:05:41 +0200 +Subject: [PATCH 2/9] Makefile.am: add files with licenses to archive + +--- + Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 60d1b79..57d0fee 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -48,7 +48,9 @@ EXTRA_DIST = \ + usb-devices.1.in \ + usb-devices \ + lsusb.py.in \ +- usbreset.c ++ usbreset.c \ ++ LICENSES/GPL-2.0.txt \ ++ LICENSES/GPL-3.0.txt + + lsusb.py: $(srcdir)/lsusb.py.in + sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ +-- +2.14.4 + diff --git a/0003-usbutils.spdx-rerun-report-it-is-properly-sorted.patch b/0003-usbutils.spdx-rerun-report-it-is-properly-sorted.patch new file mode 100644 index 0000000..8ef55d9 --- /dev/null +++ b/0003-usbutils.spdx-rerun-report-it-is-properly-sorted.patch @@ -0,0 +1,547 @@ +From 077027f791b1d23b243bccf836b6d4b6d87a82e7 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 16 May 2018 19:20:53 +0200 +Subject: [PATCH 3/9] usbutils.spdx: rerun report, it is properly sorted. + +Signed-off-by: Greg Kroah-Hartman +--- + usbutils.spdx | 358 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 179 insertions(+), 179 deletions(-) + +diff --git a/usbutils.spdx b/usbutils.spdx +index b1ae34a..872abfc 100644 +--- a/usbutils.spdx ++++ b/usbutils.spdx +@@ -2,88 +2,85 @@ SPDXVersion: SPDX-2.1 + DataLicense: CC0-1.0 + SPDXID: SPDXRef-DOCUMENT + DocumentName: usbutils +-DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-4e8b7ede-2ef4-4380-a63c-533dd02e4f47 ++DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-b022d760-8c39-4f7c-a6f9-83d822e47025 + Creator: Person: Anonymous () + Creator: Organization: Anonymous () +-Creator: Tool: reuse-0.2.0 +-Created: 2018-05-15T14:17:33Z ++Creator: Tool: reuse-0.3.0 ++Created: 2018-05-16T17:19:59Z + CreatorComment: This document was created automatically using available reuse information consistent with the REUSE Initiative. +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-6c17d1dd6beb0ac4e8dbdc1d3d89d077d1ed091f +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-d1f43f45055e4f55af9904a21c03f3ac2e23f780 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-dea01dd89a3b602828e630677fde5d77c06441c8 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-d5b4de16d947214ec306bd57bed1bd23a939b5f9 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-9f621eb5fd3bcb2fa5c7bd228c9b1ad42edc46c8 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-6c3981b5733e947489b6d6359cea90114e5edbca + Relationship: SPDXRef-DOCUMENT describes SPDXRef-8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-d76c453f0eb741d665569f48cd3df8d69535edad +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-e375f2da25f0471168cc6c97a8ac35c43eb9e951 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-01f9f98ab7d1aacab858a82f2243dfbc6ec781ff +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-acc196920bb7c53a8e1932c42e4ae88bdfbba913 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-25ba0c97baff0f8a9d08ad328942a324acdc6523 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-e736d76d2b41789dff55067923064015cedce1ae ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-152c3993c79ed609cfec1b4276c2eb31f4d518b3 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-87db583be5c13c1f7b3c958b10e03d67b6a2ca06 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-7b5d245d23c26fe4b0b395d0c0c1a91d2e68e16d + Relationship: SPDXRef-DOCUMENT describes SPDXRef-311ad8c899f518cdbe5ab94754d182f09d6ed6fc +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-c648c84097681019e5f1446c635b85ff2a486198 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-87db583be5c13c1f7b3c958b10e03d67b6a2ca06 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-f0c5c70d49864d35245e4b1a630182e33fb993ca +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-b5afcfeafd17ff89556dcde7e7d1baefc4b36c76 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-e736d76d2b41789dff55067923064015cedce1ae ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-d76c453f0eb741d665569f48cd3df8d69535edad ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-9d45eba6476202ac65ec45c3ba12118d12f2ef84 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-01f9f98ab7d1aacab858a82f2243dfbc6ec781ff ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-6c17d1dd6beb0ac4e8dbdc1d3d89d077d1ed091f ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-de5d0aaef5920a283d740908c6e021d40fe12de0 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-f17f27205281653e3e67d0509a122b1861090085 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-152c3993c79ed609cfec1b4276c2eb31f4d518b3 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-6c3981b5733e947489b6d6359cea90114e5edbca ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-25ba0c97baff0f8a9d08ad328942a324acdc6523 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-3063d6bd093390b22c258c36bc7d09aa42baf7f5 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-306a1cc131ed293066f5657c413a396b70065483 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-dea01dd89a3b602828e630677fde5d77c06441c8 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-de5d0aaef5920a283d740908c6e021d40fe12de0 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-9d45eba6476202ac65ec45c3ba12118d12f2ef84 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-b5afcfeafd17ff89556dcde7e7d1baefc4b36c76 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-e375f2da25f0471168cc6c97a8ac35c43eb9e951 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-d1f43f45055e4f55af9904a21c03f3ac2e23f780 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-c648c84097681019e5f1446c635b85ff2a486198 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-727e654f9158303b2dddb5c435ccffb7df627d09 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-534c09b61b58cbfef5a383f5be6864051db5bd1a + Relationship: SPDXRef-DOCUMENT describes SPDXRef-e7c1d0ffd0ba8ea407f4fcb7ee3717c2460456b8 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-5edef310d5d94ad7293749401bc114eda84bdf27 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-0ccb2a5e2004a47c238a1ad5f97a8b6b140f6609 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-5edef310d5d94ad7293749401bc114eda84bdf27 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-3bb3d8ca023b0861c7f6dfcc04e06f2c37fe1bb7 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-d75a77accdc47f63ea09d5e541fb17c075259791 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-f8ffd668553b011c77c049c23596f4ac16b2442b + Relationship: SPDXRef-DOCUMENT describes SPDXRef-c0d6c4c7b3ffddbebd269646cb37316dd18ce702 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-c8becd4c81cfd2a2dec5bf5f98096f24dcea48e9 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-a8e3a2d9873b55c84b0cb046855447674b65146e + Relationship: SPDXRef-DOCUMENT describes SPDXRef-d073c8d1cdb5b1f1c923af71a80f3317b21e62ed + Relationship: SPDXRef-DOCUMENT describes SPDXRef-6b2a3e275cae2f8322ff624e013951d8e7d23b83 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-a66285338b82121f7347923b8ca006b160125d01 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-a8e3a2d9873b55c84b0cb046855447674b65146e + Relationship: SPDXRef-DOCUMENT describes SPDXRef-3055f9d157f6ce27aef346c81bdf132fdd5bc2f8 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-9ffeec08dbf2185c660fc69f401c6754cc250aff +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-4cb440034519ea41c61d5a741cf167faa947a5d5 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-3bb3d8ca023b0861c7f6dfcc04e06f2c37fe1bb7 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-d75a77accdc47f63ea09d5e541fb17c075259791 + Relationship: SPDXRef-DOCUMENT describes SPDXRef-7c44a8e2ff7c7482515cc94e0244db0c747da71d +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-73de39af2d0e901f694232da4801eb2c8a66d20b + Relationship: SPDXRef-DOCUMENT describes SPDXRef-a5f2edbd8b8b3304dea21ffd974c0bc9bd772af5 +-Relationship: SPDXRef-DOCUMENT describes SPDXRef-e8ec4dd62c7540c8cb45b05a895c168bcc13048b + Relationship: SPDXRef-DOCUMENT describes SPDXRef-d57b0b3be1ce716faee2d4c80c5f9a91ba8f1ecc ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-e8ec4dd62c7540c8cb45b05a895c168bcc13048b ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-73de39af2d0e901f694232da4801eb2c8a66d20b + Relationship: SPDXRef-DOCUMENT describes SPDXRef-6454de685ba7cf12cfc0804a23c0bd7bdfa0bfd7 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-9ffeec08dbf2185c660fc69f401c6754cc250aff ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-4cb440034519ea41c61d5a741cf167faa947a5d5 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-f0c5c70d49864d35245e4b1a630182e33fb993ca ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-acc196920bb7c53a8e1932c42e4ae88bdfbba913 ++Relationship: SPDXRef-DOCUMENT describes SPDXRef-306a1cc131ed293066f5657c413a396b70065483 + +-FileName: ./lsusb.c +-SPDXID: SPDXRef-6c17d1dd6beb0ac4e8dbdc1d3d89d077d1ed091f +-FileChecksum: SHA1: f36d9493b6aec212f8d1a8f498ae8e46fd1b4244 ++FileName: ./.gitmodules ++SPDXID: SPDXRef-7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44 ++FileChecksum: SHA1: 1560d4ed9c29045a03ed4a1c660e15ffcf71b6d4 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 1999-2001, 2003 Thomas Sailer (t.sailer@alumni.ethz.ch) +-FileCopyrightText: Copyright (C) 2003-2005 David Brownell ++FileCopyrightText: Copyright (c) 2010 Nikolai Kondrashov + +-FileName: ./usb-devices.1.in +-SPDXID: SPDXRef-d1f43f45055e4f55af9904a21c03f3ac2e23f780 +-FileChecksum: SHA1: ec56b9e8c52cff364db5cca7215ac659dcecbd35 ++FileName: ./.travis.yml ++SPDXID: SPDXRef-dea01dd89a3b602828e630677fde5d77c06441c8 ++FileChecksum: SHA1: 7fe7e4ddb26f40832ddc33adf2733f6ddf8685b4 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2004 Frans Pop +-FileCopyrightText: Copyright (c) 2004 Randy Dunlap +-FileCopyrightText: Copyright (c) 2004 Greg Kroah-Hartman ++FileCopyrightText: Copyright 2016 Stephan Linz + + FileName: ./Makefile.am + SPDXID: SPDXRef-d5b4de16d947214ec306bd57bed1bd23a939b5f9 + FileChecksum: SHA1: c167455c7c1eea2d5e142c9690875a4514e0f0f9 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ ++FileCopyrightText: Copyright (c) 2004 Thomas Sailer + FileCopyrightText: Copyright (c) 2005-2006 David Brownell +-FileCopyrightText: Copyright (c) 2009 Kay Sievers + FileCopyrightText: Copyright (c) 2009 Greg Kroah-Hartman +-FileCopyrightText: Copyright (c) 2004 Thomas Sailer ++FileCopyrightText: Copyright (c) 2009 Kay Sievers + + FileName: ./NEWS + SPDXID: SPDXRef-9f621eb5fd3bcb2fa5c7bd228c9b1ad42edc46c8 +@@ -93,14 +90,6 @@ LicenseInfoInFile: GPL-2.0 + FileCopyrightText: Copyright (c) 2018 Greg Kroah-Hartman + FileCopyrightText: Copyright strings + +-FileName: ./names.c +-SPDXID: SPDXRef-6c3981b5733e947489b6d6359cea90114e5edbca +-FileChecksum: SHA1: b09952044590cb5c7a6efd0f1cf4c2c8e9acd8cd +-LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 1999, 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) +-FileCopyrightText: Copyright (C) 2013 Tom Gundersen (teg@jklm.no) +- + FileName: ./README.md + SPDXID: SPDXRef-8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d + FileChecksum: SHA1: 9ba7826a2617f4d769be0db957c6386d98377ca5 +@@ -108,106 +97,106 @@ LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ + FileCopyrightText: Copyright (c) 2018 Greg Kroah-Hartman + +-FileName: ./list.h +-SPDXID: SPDXRef-d76c453f0eb741d665569f48cd3df8d69535edad +-FileChecksum: SHA1: ca31cb6d90c4bc81730910f6f48105c04dddb669 ++FileName: ./autogen.sh ++SPDXID: SPDXRef-152c3993c79ed609cfec1b4276c2eb31f4d518b3 ++FileChecksum: SHA1: 03131c461ea90b53e3813f7895da75116c04f426 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2004 Thomas Sailer +- +-FileName: ./usb-devices +-SPDXID: SPDXRef-e375f2da25f0471168cc6c97a8ac35c43eb9e951 +-FileChecksum: SHA1: 0d407269e4572232221dac9487f95ead3256c627 +-LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (c) 2009 Frans Pop +-FileCopyrightText: Copyright (c) 2009 Greg Kroah-Hartman +-FileCopyrightText: Copyright (c) 2009 Randy Dunlap ++FileCopyrightText: Copyright (c) 2009,2010 Greg Kroah-Hartman + +-FileName: ./lsusb.8.in +-SPDXID: SPDXRef-01f9f98ab7d1aacab858a82f2243dfbc6ec781ff +-FileChecksum: SHA1: cd01c90ca1b907d349e5f8f5c4229222121c46ed ++FileName: ./configure.ac ++SPDXID: SPDXRef-87db583be5c13c1f7b3c958b10e03d67b6a2ca06 ++FileChecksum: SHA1: 04ab423765541b3a34eca63f04a8688c2aef1816 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 1999 Thomas Sailer ++FileCopyrightText: Copyright (c) 2009 Kay Sievers + +-FileName: ./usbmisc.h +-SPDXID: SPDXRef-acc196920bb7c53a8e1932c42e4ae88bdfbba913 +-FileChecksum: SHA1: b12afc48068aba9913a06709c42153223bc11860 ++FileName: ./desc-defs.c ++SPDXID: SPDXRef-7b5d245d23c26fe4b0b395d0c0c1a91d2e68e16d ++FileChecksum: SHA1: c59f51b1fd5d62ba19a463afc5d671772394d30d + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 2003 Aurelien Jarno (aurelien@aurel32.net) ++FileCopyrightText: Copyright (C) 2017 Michael Drake + +-FileName: ./names.h +-SPDXID: SPDXRef-25ba0c97baff0f8a9d08ad328942a324acdc6523 +-FileChecksum: SHA1: 33d326b5b664bd6d586018d6a745cb23599f09a0 ++FileName: ./desc-defs.h ++SPDXID: SPDXRef-311ad8c899f518cdbe5ab94754d182f09d6ed6fc ++FileChecksum: SHA1: b918b79d00ced67534a755ba452603cc25da0f5f + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 1999, 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) ++FileCopyrightText: Copyright (C) 2017 Michael Drake + +-FileName: ./desc-dump.h +-SPDXID: SPDXRef-e736d76d2b41789dff55067923064015cedce1ae +-FileChecksum: SHA1: 4d409e266e6c978ab2ee65232789bd345817a3cb ++FileName: ./desc-dump.c ++SPDXID: SPDXRef-b5afcfeafd17ff89556dcde7e7d1baefc4b36c76 ++FileChecksum: SHA1: 2402892718aacfdd9275e7428b288e863b8ea6bc + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ + FileCopyrightText: Copyright (C) 2017 Michael Drake + +-FileName: ./desc-defs.c +-SPDXID: SPDXRef-7b5d245d23c26fe4b0b395d0c0c1a91d2e68e16d +-FileChecksum: SHA1: c59f51b1fd5d62ba19a463afc5d671772394d30d ++FileName: ./desc-dump.h ++SPDXID: SPDXRef-e736d76d2b41789dff55067923064015cedce1ae ++FileChecksum: SHA1: 4d409e266e6c978ab2ee65232789bd345817a3cb + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ + FileCopyrightText: Copyright (C) 2017 Michael Drake + +-FileName: ./desc-defs.h +-SPDXID: SPDXRef-311ad8c899f518cdbe5ab94754d182f09d6ed6fc +-FileChecksum: SHA1: b918b79d00ced67534a755ba452603cc25da0f5f ++FileName: ./list.h ++SPDXID: SPDXRef-d76c453f0eb741d665569f48cd3df8d69535edad ++FileChecksum: SHA1: ca31cb6d90c4bc81730910f6f48105c04dddb669 + LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 2017 Michael Drake ++LicenseInfoInFile: GPL-2.0 ++FileCopyrightText: Copyright (c) 2004 Thomas Sailer + +-FileName: ./usb-spec.h +-SPDXID: SPDXRef-c648c84097681019e5f1446c635b85ff2a486198 +-FileChecksum: SHA1: 8caa588edf7307bb5bdc0556b5d80696ed4e7cfc ++FileName: ./lsusb-t.c ++SPDXID: SPDXRef-9d45eba6476202ac65ec45c3ba12118d12f2ef84 ++FileChecksum: SHA1: 9366eda2ceb3abed27c60c4db816af4245d0b350 + LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 2013 Tom Gundersen ++LicenseInfoInFile: GPL-2.0 ++FileCopyrightText: Copyright (c) 2009 Greg Kroah-Hartman + +-FileName: ./configure.ac +-SPDXID: SPDXRef-87db583be5c13c1f7b3c958b10e03d67b6a2ca06 +-FileChecksum: SHA1: 04ab423765541b3a34eca63f04a8688c2aef1816 ++FileName: ./lsusb.8.in ++SPDXID: SPDXRef-01f9f98ab7d1aacab858a82f2243dfbc6ec781ff ++FileChecksum: SHA1: cd01c90ca1b907d349e5f8f5c4229222121c46ed + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2009 Kay Sievers ++FileCopyrightText: Copyright (c) 1999 Thomas Sailer + +-FileName: ./usbmisc.c +-SPDXID: SPDXRef-f0c5c70d49864d35245e4b1a630182e33fb993ca +-FileChecksum: SHA1: a13c902ebe2e7086c985dfde4cc2bad0b77c613a ++FileName: ./lsusb.c ++SPDXID: SPDXRef-6c17d1dd6beb0ac4e8dbdc1d3d89d077d1ed091f ++FileChecksum: SHA1: f36d9493b6aec212f8d1a8f498ae8e46fd1b4244 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 2003 Aurelien Jarno (aurelien@aurel32.net) ++FileCopyrightText: Copyright (C) 1999-2001, 2003 Thomas Sailer (t.sailer@alumni.ethz.ch) ++FileCopyrightText: Copyright (C) 2003-2005 David Brownell + +-FileName: ./.gitmodules +-SPDXID: SPDXRef-7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44 +-FileChecksum: SHA1: 1560d4ed9c29045a03ed4a1c660e15ffcf71b6d4 ++FileName: ./lsusb.h ++SPDXID: SPDXRef-de5d0aaef5920a283d740908c6e021d40fe12de0 ++FileChecksum: SHA1: b703a54ba37b7f77816f77365034b9800c0da613 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (c) 2010 Nikolai Kondrashov ++FileCopyrightText: Copyright 2011 (c) Greg Kroah-Hartman + + FileName: ./lsusb.py.in + SPDXID: SPDXRef-f17f27205281653e3e67d0509a122b1861090085 + FileChecksum: SHA1: 59e8b90ae66abc28f863824f40304ddc023ab0b2 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 OR GPL-3.0 +-FileCopyrightText: Copyright (c) 2013 Kurt Garloff + FileCopyrightText: Copyright (c) 2009 Kurt Garloff ++FileCopyrightText: Copyright (c) 2013 Kurt Garloff + +-FileName: ./autogen.sh +-SPDXID: SPDXRef-152c3993c79ed609cfec1b4276c2eb31f4d518b3 +-FileChecksum: SHA1: 03131c461ea90b53e3813f7895da75116c04f426 ++FileName: ./names.c ++SPDXID: SPDXRef-6c3981b5733e947489b6d6359cea90114e5edbca ++FileChecksum: SHA1: b09952044590cb5c7a6efd0f1cf4c2c8e9acd8cd + LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2009,2010 Greg Kroah-Hartman ++LicenseInfoInFile: GPL-2.0+ ++FileCopyrightText: Copyright (C) 1999, 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) ++FileCopyrightText: Copyright (C) 2013 Tom Gundersen (teg@jklm.no) ++ ++FileName: ./names.h ++SPDXID: SPDXRef-25ba0c97baff0f8a9d08ad328942a324acdc6523 ++FileChecksum: SHA1: 33d326b5b664bd6d586018d6a745cb23599f09a0 ++LicenseConcluded: NOASSERTION ++LicenseInfoInFile: GPL-2.0+ ++FileCopyrightText: Copyright (C) 1999, 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) + + FileName: ./travis-autogen.sh + SPDXID: SPDXRef-3063d6bd093390b22c258c36bc7d09aa42baf7f5 +@@ -216,40 +205,30 @@ LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 + FileCopyrightText: Copyright 2016 Stephan Linz + +-FileName: ./usbreset.c +-SPDXID: SPDXRef-306a1cc131ed293066f5657c413a396b70065483 +-FileChecksum: SHA1: 3640969c413e0468eff2130aaf4015fab42c4a4f +-LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2009-2016 Alan Stern +- +-FileName: ./.travis.yml +-SPDXID: SPDXRef-dea01dd89a3b602828e630677fde5d77c06441c8 +-FileChecksum: SHA1: 7fe7e4ddb26f40832ddc33adf2733f6ddf8685b4 +-LicenseConcluded: NOASSERTION +-LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright 2016 Stephan Linz +- +-FileName: ./lsusb.h +-SPDXID: SPDXRef-de5d0aaef5920a283d740908c6e021d40fe12de0 +-FileChecksum: SHA1: b703a54ba37b7f77816f77365034b9800c0da613 ++FileName: ./usb-devices ++SPDXID: SPDXRef-e375f2da25f0471168cc6c97a8ac35c43eb9e951 ++FileChecksum: SHA1: 0d407269e4572232221dac9487f95ead3256c627 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright 2011 (c) Greg Kroah-Hartman ++FileCopyrightText: Copyright (c) 2009 Frans Pop ++FileCopyrightText: Copyright (c) 2009 Greg Kroah-Hartman ++FileCopyrightText: Copyright (c) 2009 Randy Dunlap + +-FileName: ./lsusb-t.c +-SPDXID: SPDXRef-9d45eba6476202ac65ec45c3ba12118d12f2ef84 +-FileChecksum: SHA1: 9366eda2ceb3abed27c60c4db816af4245d0b350 ++FileName: ./usb-devices.1.in ++SPDXID: SPDXRef-d1f43f45055e4f55af9904a21c03f3ac2e23f780 ++FileChecksum: SHA1: ec56b9e8c52cff364db5cca7215ac659dcecbd35 + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0 +-FileCopyrightText: Copyright (c) 2009 Greg Kroah-Hartman ++FileCopyrightText: Copyright (c) 2004 Frans Pop ++FileCopyrightText: Copyright (c) 2004 Greg Kroah-Hartman ++FileCopyrightText: Copyright (c) 2004 Randy Dunlap + +-FileName: ./desc-dump.c +-SPDXID: SPDXRef-b5afcfeafd17ff89556dcde7e7d1baefc4b36c76 +-FileChecksum: SHA1: 2402892718aacfdd9275e7428b288e863b8ea6bc ++FileName: ./usb-spec.h ++SPDXID: SPDXRef-c648c84097681019e5f1446c635b85ff2a486198 ++FileChecksum: SHA1: 8caa588edf7307bb5bdc0556b5d80696ed4e7cfc + LicenseConcluded: NOASSERTION + LicenseInfoInFile: GPL-2.0+ +-FileCopyrightText: Copyright (C) 2017 Michael Drake ++FileCopyrightText: Copyright (C) 2013 Tom Gundersen + + FileName: ./usbhid-dump/Makefile.am + SPDXID: SPDXRef-727e654f9158303b2dddb5c435ccffb7df627d09 +@@ -269,17 +248,29 @@ FileChecksum: SHA1: 783567bddef5cfee242810cec17a2dd1da8d2a9a + LicenseConcluded: NOASSERTION + FileCopyrightText: NONE + ++FileName: ./usbhid-dump/bootstrap ++SPDXID: SPDXRef-0ccb2a5e2004a47c238a1ad5f97a8b6b140f6609 ++FileChecksum: SHA1: 4d3b5ad4b4eddfb431dff0e932636f9de4ab3d93 ++LicenseConcluded: NOASSERTION ++FileCopyrightText: Copyright (c) 2010 Nikolai Kondrashov ++ + FileName: ./usbhid-dump/configure.ac + SPDXID: SPDXRef-5edef310d5d94ad7293749401bc114eda84bdf27 + FileChecksum: SHA1: 2b7a78bb3b06bd10a384dfaafd3a68309efa6a22 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov + +-FileName: ./usbhid-dump/bootstrap +-SPDXID: SPDXRef-0ccb2a5e2004a47c238a1ad5f97a8b6b140f6609 +-FileChecksum: SHA1: 4d3b5ad4b4eddfb431dff0e932636f9de4ab3d93 ++FileName: ./usbhid-dump/doc/Makefile.am ++SPDXID: SPDXRef-3bb3d8ca023b0861c7f6dfcc04e06f2c37fe1bb7 ++FileChecksum: SHA1: 9be240875c99a8abc4703dee8d184e28f84a1cb9 + LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (c) 2010 Nikolai Kondrashov ++FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov ++ ++FileName: ./usbhid-dump/doc/usbhid-dump.8 ++SPDXID: SPDXRef-d75a77accdc47f63ea09d5e541fb17c075259791 ++FileChecksum: SHA1: 366ab4785a54650ddcfb4f8663ff5b9630fe4e62 ++LicenseConcluded: NOASSERTION ++FileCopyrightText: NONE + + FileName: ./usbhid-dump/include/Makefile.am + SPDXID: SPDXRef-f8ffd668553b011c77c049c23596f4ac16b2442b +@@ -299,6 +290,12 @@ FileChecksum: SHA1: 715b1e0ae2eff0104a379a92f6ea0f117c992c97 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov + ++FileName: ./usbhid-dump/include/uhd/dev_list.h ++SPDXID: SPDXRef-a8e3a2d9873b55c84b0cb046855447674b65146e ++FileChecksum: SHA1: 529334bc310028933bed64be6ae6e54dd3ebf3a5 ++LicenseConcluded: NOASSERTION ++FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov ++ + FileName: ./usbhid-dump/include/uhd/iface.h + SPDXID: SPDXRef-d073c8d1cdb5b1f1c923af71a80f3317b21e62ed + FileChecksum: SHA1: da7f40ed9dfdc03048af1512fa96f1e166bf1ba7 +@@ -317,69 +314,39 @@ FileChecksum: SHA1: 29b0e137d8d9ebc27534d6d62a9a778759eefb0d + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov + +-FileName: ./usbhid-dump/include/uhd/dev_list.h +-SPDXID: SPDXRef-a8e3a2d9873b55c84b0cb046855447674b65146e +-FileChecksum: SHA1: 529334bc310028933bed64be6ae6e54dd3ebf3a5 +-LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov +- + FileName: ./usbhid-dump/include/uhd/misc.h + SPDXID: SPDXRef-3055f9d157f6ce27aef346c81bdf132fdd5bc2f8 + FileChecksum: SHA1: 5d77ac9550fdf8eb747288791847ac8dc49043ac + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov + +-FileName: ./usbhid-dump/src/Makefile.am +-SPDXID: SPDXRef-9ffeec08dbf2185c660fc69f401c6754cc250aff +-FileChecksum: SHA1: 0a472632a048aa27df19971060f70541d39998df +-LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov +- +-FileName: ./usbhid-dump/src/usbhid-dump.c +-SPDXID: SPDXRef-4cb440034519ea41c61d5a741cf167faa947a5d5 +-FileChecksum: SHA1: f766dc2ec7821f9a24b7ed54798e820e3a2e81cb +-LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov +- +-FileName: ./usbhid-dump/doc/Makefile.am +-SPDXID: SPDXRef-3bb3d8ca023b0861c7f6dfcc04e06f2c37fe1bb7 +-FileChecksum: SHA1: 9be240875c99a8abc4703dee8d184e28f84a1cb9 +-LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov +- +-FileName: ./usbhid-dump/doc/usbhid-dump.8 +-SPDXID: SPDXRef-d75a77accdc47f63ea09d5e541fb17c075259791 +-FileChecksum: SHA1: 366ab4785a54650ddcfb4f8663ff5b9630fe4e62 +-LicenseConcluded: NOASSERTION +-FileCopyrightText: NONE +- + FileName: ./usbhid-dump/lib/Makefile.am + SPDXID: SPDXRef-7c44a8e2ff7c7482515cc94e0244db0c747da71d + FileChecksum: SHA1: edaa1c6500e6144af33a259d4334d95130aa5d13 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2009-2010 Nikolai Kondrashov + +-FileName: ./usbhid-dump/lib/iface_list.c +-SPDXID: SPDXRef-73de39af2d0e901f694232da4801eb2c8a66d20b +-FileChecksum: SHA1: 26fbfbadf28b0a4a6219873464594ddd4d95f145 +-LicenseConcluded: NOASSERTION +-FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov +- + FileName: ./usbhid-dump/lib/dev.c + SPDXID: SPDXRef-a5f2edbd8b8b3304dea21ffd974c0bc9bd772af5 + FileChecksum: SHA1: 0a03aec4473b8bf11917d6d6955eb1a81e687aca + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov + ++FileName: ./usbhid-dump/lib/dev_list.c ++SPDXID: SPDXRef-d57b0b3be1ce716faee2d4c80c5f9a91ba8f1ecc ++FileChecksum: SHA1: 2fc4fd5b6c8fcfde7a563b56cf0ba639cdad679b ++LicenseConcluded: NOASSERTION ++FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov ++ + FileName: ./usbhid-dump/lib/iface.c + SPDXID: SPDXRef-e8ec4dd62c7540c8cb45b05a895c168bcc13048b + FileChecksum: SHA1: b3c828cceeaea8d20fd440f6f7e5225d5ec26146 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov + +-FileName: ./usbhid-dump/lib/dev_list.c +-SPDXID: SPDXRef-d57b0b3be1ce716faee2d4c80c5f9a91ba8f1ecc +-FileChecksum: SHA1: 2fc4fd5b6c8fcfde7a563b56cf0ba639cdad679b ++FileName: ./usbhid-dump/lib/iface_list.c ++SPDXID: SPDXRef-73de39af2d0e901f694232da4801eb2c8a66d20b ++FileChecksum: SHA1: 26fbfbadf28b0a4a6219873464594ddd4d95f145 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov + +@@ -388,3 +355,36 @@ SPDXID: SPDXRef-6454de685ba7cf12cfc0804a23c0bd7bdfa0bfd7 + FileChecksum: SHA1: 58f7d1c78541bfd310e46e24435540a0ec83d3c4 + LicenseConcluded: NOASSERTION + FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov ++ ++FileName: ./usbhid-dump/src/Makefile.am ++SPDXID: SPDXRef-9ffeec08dbf2185c660fc69f401c6754cc250aff ++FileChecksum: SHA1: 0a472632a048aa27df19971060f70541d39998df ++LicenseConcluded: NOASSERTION ++FileCopyrightText: Copyright (C) 2010 Nikolai Kondrashov ++ ++FileName: ./usbhid-dump/src/usbhid-dump.c ++SPDXID: SPDXRef-4cb440034519ea41c61d5a741cf167faa947a5d5 ++FileChecksum: SHA1: f766dc2ec7821f9a24b7ed54798e820e3a2e81cb ++LicenseConcluded: NOASSERTION ++FileCopyrightText: Copyright (C) 2010-2011 Nikolai Kondrashov ++ ++FileName: ./usbmisc.c ++SPDXID: SPDXRef-f0c5c70d49864d35245e4b1a630182e33fb993ca ++FileChecksum: SHA1: a13c902ebe2e7086c985dfde4cc2bad0b77c613a ++LicenseConcluded: NOASSERTION ++LicenseInfoInFile: GPL-2.0+ ++FileCopyrightText: Copyright (C) 2003 Aurelien Jarno (aurelien@aurel32.net) ++ ++FileName: ./usbmisc.h ++SPDXID: SPDXRef-acc196920bb7c53a8e1932c42e4ae88bdfbba913 ++FileChecksum: SHA1: b12afc48068aba9913a06709c42153223bc11860 ++LicenseConcluded: NOASSERTION ++LicenseInfoInFile: GPL-2.0+ ++FileCopyrightText: Copyright (C) 2003 Aurelien Jarno (aurelien@aurel32.net) ++ ++FileName: ./usbreset.c ++SPDXID: SPDXRef-306a1cc131ed293066f5657c413a396b70065483 ++FileChecksum: SHA1: 3640969c413e0468eff2130aaf4015fab42c4a4f ++LicenseConcluded: NOASSERTION ++LicenseInfoInFile: GPL-2.0 ++FileCopyrightText: Copyright (c) 2009-2016 Alan Stern +-- +2.14.4 + diff --git a/0004-lsusb.py-fix-up-Python-3-conversion.patch b/0004-lsusb.py-fix-up-Python-3-conversion.patch new file mode 100644 index 0000000..406c141 --- /dev/null +++ b/0004-lsusb.py-fix-up-Python-3-conversion.patch @@ -0,0 +1,148 @@ +From a7c25eadbc998bf359e5b7dac03aaea8c30d2932 Mon Sep 17 00:00:00 2001 +From: Georg Brandl +Date: Thu, 17 May 2018 08:51:27 +0200 +Subject: [PATCH 4/9] lsusb.py: fix up Python 3 conversion + +- Use open() and ignore encoding errors +- Replace removed __cmp__ by rich comparison methods +- Convert commented-out print statements, remove unused future import + +Fixes #68 +--- + lsusb.py.in | 50 ++++++++++++++++++++++---------------------------- + 1 file changed, 22 insertions(+), 28 deletions(-) + +diff --git a/lsusb.py.in b/lsusb.py.in +index 0f4d318..083b512 100644 +--- a/lsusb.py.in ++++ b/lsusb.py.in +@@ -12,8 +12,6 @@ + + import os, sys, re, getopt + +-# from __future__ import print_function +- + # Global options + showint = False + showhubint = False +@@ -53,15 +51,12 @@ class UsbClass: + self.desc = str + def __repr__(self): + return self.desc +- def __cmp__(self, oth): +- # Works only on 64bit systems: +- #return self.pclass*0x10000+self.subclass*0x100+self.proto \ +- # - oth.pclass*0x10000-oth.subclass*0x100-oth.proto +- if self.pclass != oth.pclass: +- return self.pclass - oth.pclass +- if self.subclass != oth.subclass: +- return self.subclass - oth.subclass +- return self.proto - oth.proto ++ def __lt__(self, oth): ++ return (self.pclass, self.subclass, self.proto) < \ ++ (oth.pclass, oth.subclass, oth.proto) ++ def __eq__(self, oth): ++ return (self.pclass, self.subclass, self.proto) == \ ++ (oth.pclass, oth.subclass, oth.proto) + + class UsbVendor: + "Container for USB Vendors" +@@ -70,8 +65,10 @@ class UsbVendor: + self.vname = vname + def __repr__(self): + return self.vname +- def __cmp__(self, oth): +- return self.vid - oth.vid ++ def __lt__(self, oth): ++ return self.vid < oth.vid ++ def __eq__(self, oth): ++ return self.vid == oth.vid + + class UsbProduct: + "Container for USB VID:PID devices" +@@ -81,13 +78,10 @@ class UsbProduct: + self.pname = pname + def __repr__(self): + return self.pname +- def __cmp__(self, oth): +- # Works only on 64bit systems: +- # return self.vid*0x10000 + self.pid \ +- # - oth.vid*0x10000 - oth.pid +- if self.vid != oth.vid: +- return self.vid - oth.vid +- return self.pid - oth.pid ++ def __lt__(self, oth): ++ return (self.vid, self.pid) < (oth.vid, oth.pid) ++ def __eq__(self, oth): ++ return (self.vid, self.pid) == (oth.vid, oth.pid) + + usbvendors = [] + usbproducts = [] +@@ -107,7 +101,7 @@ def parse_usb_ids(): + mode = 0 + strg = "" + cstrg = "" +- for ln in file(usbids, "r").readlines(): ++ for ln in open(usbids, "r", errors="ignore"): + if ln[0] == '#': + continue + ln = ln.rstrip('\n') +@@ -146,7 +140,7 @@ def parse_usb_ids(): + + def bin_search(first, last, item, list): + "binary search on list, returns -1 on fail, match idx otherwise, recursive" +- #print "bin_search(%i,%i)" % (first, last) ++ #print("bin_search(%i,%i)" % (first, last)) + if first == last: + return -1 + if first == last-1: +@@ -233,7 +227,7 @@ def find_dev(driver, usbname): + for nm in devlst: + dir = prefix + usbname + prep = "" +- #print nm ++ #print(nm) + idx = nm.find('/') + if idx != -1: + prep = nm[:idx+1] +@@ -404,8 +398,8 @@ class UsbDevice: + try: + self.nointerfaces = int(readattr(fname, "bNumInterfaces")) + except: +- #print "ERROR: %s/bNumInterfaces = %s" % (fname, +- # readattr(fname, "bNumInterfaces"))a ++ #print("ERROR: %s/bNumInterfaces = %s" % (fname, ++ # readattr(fname, "bNumInterfaces"))) + self.nointerfaces = 0 + try: + self.driver = readlink(fname, "driver") +@@ -421,7 +415,7 @@ class UsbDevice: + for dirent in os.listdir(prefix + self.fname): + if not dirent[0:1].isdigit(): + continue +- #print dirent ++ #print(dirent) + if os.access(prefix + dirent + "/bInterfaceClass", os.R_OK): + iface = UsbInterface(self, self.level+1) + iface.read(dirent) +@@ -532,7 +526,7 @@ def usage(): + def read_usb(): + "Read toplevel USB entries and print" + for dirent in os.listdir(prefix): +- #print dirent, ++ #print(dirent) + if not dirent[0:3] == "usb": + continue + usbdev = UsbDevice(None, 0) +@@ -590,7 +584,7 @@ def main(argv): + fix_usbclass() + except: + print(" WARNING: Failure to read usb.ids", file=sys.stderr) +- #print >>sys.stderr, sys.exc_info() ++ #print(sys.exc_info(), file=sys.stderr) + read_usb() + + # Entry point +-- +2.14.4 + diff --git a/0005-lsusb-Split-out-routine-that-fetches-value-for-given.patch b/0005-lsusb-Split-out-routine-that-fetches-value-for-given.patch new file mode 100644 index 0000000..3019641 --- /dev/null +++ b/0005-lsusb-Split-out-routine-that-fetches-value-for-given.patch @@ -0,0 +1,166 @@ +From e497fcd9d69f2ba6b8672e430ee273db4afbea17 Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Thu, 7 Jun 2018 11:01:37 +0100 +Subject: [PATCH 5/9] lsusb: Split out routine that fetches value for given + field. + +Field value lookup was done in multiple places, so it's useful +as a helper function. + +Signed-off-by: Michael Drake +--- + desc-dump.c | 106 +++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 58 insertions(+), 48 deletions(-) + +diff --git a/desc-dump.c b/desc-dump.c +index 9210df7..393ff70 100644 +--- a/desc-dump.c ++++ b/desc-dump.c +@@ -2,7 +2,7 @@ + /* + * USB descriptor dumping + * +- * Copyright (C) 2017 Michael Drake ++ * Copyright (C) 2017-2018 Michael Drake + */ + + #include "config.h" +@@ -109,6 +109,57 @@ static unsigned long long get_n_bytes_as_ull( + return ret; + } + ++/** ++ * Get the size of a descriptor field in bytes. ++ * ++ * Normally the size is provided in the entry's size parameter, but some ++ * fields have a variable size, with the actual size being stored in as ++ * the value of another field. ++ * ++ * \param[in] buf Descriptor data. ++ * \param[in] desc First field in the descriptor definition array. ++ * \param[in] entry The descriptor definition field to get size for. ++ * \return Size of the field in bytes. ++ */ ++static unsigned int get_entry_size( ++ const unsigned char *buf, ++ const struct desc *desc, ++ const struct desc *entry); ++ ++/** ++ * Read a value from a field of given name. ++ * ++ * \param[in] buf Descriptor data. ++ * \param[in] desc First field in the descriptor definition array. ++ * \param[in] field The name of the field to get the value for. ++ * \return The value from the given field. ++ */ ++static unsigned long long get_value_from_field( ++ const unsigned char *buf, ++ const struct desc *desc, ++ const char *field) ++{ ++ size_t offset = 0; ++ const struct desc *current; ++ unsigned long long value = 0; ++ ++ /* Search descriptor definition array for the field who's value ++ * gives the value of the entry we're interested in. */ ++ for (current = desc; current->field != NULL; current++) { ++ if (strcmp(current->field, field) == 0) { ++ value = get_n_bytes_as_ull(buf, offset, ++ current->size); ++ break; ++ } ++ ++ /* Keep track of our offset in the descriptor data ++ * as we look for the field we want. */ ++ offset += get_entry_size(buf, desc, current); ++ } ++ ++ return value; ++} ++ + /** + * Dump a number as hex to stdout. + * +@@ -270,18 +321,7 @@ static void value_renderer( + } + } + +-/** +- * Get the size of a descriptor field in bytes. +- * +- * Normally the size is provided in the entry's size parameter, but some +- * fields have a variable size, with the actual size being stored in as +- * the value of another field. +- * +- * \param[in] buf Descriptor data. +- * \param[in] desc First field in the descriptor definition array. +- * \param[in] entry The descriptor definition field to get size for. +- * \return Size of the field in bytes. +- */ ++/* Documented at forward declaration above. */ + static unsigned int get_entry_size( + const unsigned char *buf, + const struct desc *desc, +@@ -292,24 +332,7 @@ static unsigned int get_entry_size( + + if (entry->size_field != NULL) { + /* Variable field length, given by `size_field`'s value. */ +- size_t offset = 0; +- +- /* Search descriptor definition array for the field who's value +- * gives the size of the entry we're interested in. */ +- for (current = desc; current->field != NULL; current++) { +- if (strcmp(current->field, entry->size_field) == 0) { +- /* Found the field who's value gives us the +- * size of, so read that field's value out of +- * the descriptor data buffer. */ +- size = get_n_bytes_as_ull(buf, offset, +- current->size); +- break; +- } +- +- /* Keep track of our offset in the descriptor data +- * as we look for the field we want. */ +- offset += get_entry_size(buf, desc, current); +- } ++ size = get_value_from_field(buf, desc, entry->size_field); + } + + if (size == 0) { +@@ -347,27 +370,14 @@ static unsigned int get_array_entry_count( + + if (array_entry->array.length_field1) { + /* We can get the array size from the length_field1. */ +- size_t offset = 0; +- for (current = desc; current->field != NULL; current++) { +- if (strcmp(current->field, array_entry->array.length_field1) == 0) { +- entries = get_n_bytes_as_ull(buf, offset, current->size); +- break; +- } ++ entries = get_value_from_field(buf, desc, ++ array_entry->array.length_field1); + +- offset += get_entry_size(buf, desc, current); +- } +- offset = 0; /* skip first three common 1-byte fields */ + if (array_entry->array.length_field2 != NULL) { + /* There's a second field specifying length. The two + * lengths are multiplied. */ +- for (current = desc; current->field != NULL; current++) { +- if (strcmp(current->field, array_entry->array.length_field2) == 0) { +- entries *= get_n_bytes_as_ull(buf, offset, current->size); +- break; +- } +- +- offset += get_entry_size(buf, desc, current); +- } ++ entries *= get_value_from_field(buf, desc, ++ array_entry->array.length_field2); + } + + /* If the bits flag is set, then the entry count so far +-- +2.14.4 + diff --git a/0006-lsusb-Split-out-field-name-rendering.patch b/0006-lsusb-Split-out-field-name-rendering.patch new file mode 100644 index 0000000..2ebe906 --- /dev/null +++ b/0006-lsusb-Split-out-field-name-rendering.patch @@ -0,0 +1,81 @@ +From 80843d0818c61823bd9dd4c365442d29a8a6f2af Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Thu, 7 Jun 2018 12:37:13 +0100 +Subject: [PATCH 6/9] lsusb: Split out field name rendering. + +Splits out the rendering of fields from desc_dump() since it +is a single unit of functionality and the desc_dump() function +had grown quite complex. + +Signed-off-by: Michael Drake +--- + desc-dump.c | 45 +++++++++++++++++++++++++++++++++------------ + 1 file changed, 33 insertions(+), 12 deletions(-) + +diff --git a/desc-dump.c b/desc-dump.c +index 393ff70..2f92768 100644 +--- a/desc-dump.c ++++ b/desc-dump.c +@@ -446,6 +446,35 @@ static unsigned int get_char_count_for_array_index(unsigned int array_entries) + return 3; + } + ++/** ++ * Render a field's name. ++ * ++ * \param[in] entry Current entry number (for arrays). ++ * \param[in] entries Entry count (for arrays). ++ * \param[in] field_len Character width of field name space for alignment. ++ * \param[in] current Descriptor definition of field to render. ++ * \param[in] indent Current indent level. ++ */ ++static void field_render( ++ unsigned int entry, ++ unsigned int entries, ++ unsigned int field_len, ++ const struct desc *current, ++ unsigned int indent) ++{ ++ if (current->array.array) { ++ unsigned int needed_chars = field_len - ++ get_char_count_for_array_index(entries) - ++ strlen(current->field); ++ printf("%*s%s(%u)%*s", indent * 2, "", ++ current->field, entry, ++ needed_chars, ""); ++ } else { ++ printf("%*s%-*s", indent * 2, "", ++ field_len, current->field); ++ } ++} ++ + /* Function documented in desc-dump.h */ + void desc_dump( + libusb_device_handle *dev, +@@ -506,19 +535,11 @@ void desc_dump( + printf("\n"); + return; + } ++ + /* Dump the field name */ +- if (current->array.array) { +- needed_chars = field_len - +- get_char_count_for_array_index( +- entries) - +- strlen(current->field); +- printf("%*s%s(%u)%*s", indent * 2, "", +- current->field, entry, +- needed_chars, ""); +- } else { +- printf("%*s%-*s", indent * 2, "", +- field_len, current->field); +- } ++ field_render(entry, entries, field_len, ++ current, indent); ++ + /* Dump the value */ + value_renderer(dev, current, current_size, buf, + indent, offset); +-- +2.14.4 + diff --git a/0007-lsusb-Add-support-for-descriptor-extensions.patch b/0007-lsusb-Add-support-for-descriptor-extensions.patch new file mode 100644 index 0000000..494166e --- /dev/null +++ b/0007-lsusb-Add-support-for-descriptor-extensions.patch @@ -0,0 +1,207 @@ +From 4f2a365e20831076816b8672735118f654ccfcd8 Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Thu, 7 Jun 2018 12:41:16 +0100 +Subject: [PATCH 7/9] lsusb: Add support for descriptor extensions. + +These allow descriptors with common fields at the start, one of +which common fields specifies a field whos value determines which +of a set of descriptor extensions should be used to render the +remainder of the descriptor. + +Signed-off-by: Michael Drake +--- + desc-defs.c | 11 ++++++++++- + desc-defs.h | 39 ++++++++++++++++++++++++++++++++++++++- + desc-dump.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- + 3 files changed, 93 insertions(+), 9 deletions(-) + +diff --git a/desc-defs.c b/desc-defs.c +index 4c374e0..60cc603 100644 +--- a/desc-defs.c ++++ b/desc-defs.c +@@ -2,7 +2,7 @@ + /* + * USB descriptor definitions + * +- * Copyright (C) 2017 Michael Drake ++ * Copyright (C) 2017-2018 Michael Drake + */ + + #include "config.h" +@@ -441,6 +441,15 @@ static const struct desc desc_audio_2_ac_processing_unit[] = { + { .field = NULL } + }; + ++/** ++ * Undefined descriptor ++ * ++ * Ensures remaining data is dumped as garbage at end of descriptor. ++ */ ++const struct desc desc_undefined[] = { ++ { .field = NULL } ++}; ++ + /** UAC3: 4.5.2.10 Processing Unit Descriptor; Table 4-38. */ + static const struct desc desc_audio_3_ac_processing_unit[] = { + { .field = "bUnitID", .size = 1, .type = DESC_NUMBER }, +diff --git a/desc-defs.h b/desc-defs.h +index 99d5caa..aa695e4 100644 +--- a/desc-defs.h ++++ b/desc-defs.h +@@ -2,7 +2,7 @@ + /* + * USB descriptor definitions + * +- * Copyright (C) 2017 Michael Drake ++ * Copyright (C) 2017-2018 Michael Drake + */ + + #ifndef _DESC_DEFS_H +@@ -33,6 +33,7 @@ enum desc_type { + DESC_TERMINAL_STR, /**< Audio terminal string. */ + DESC_BITMAP_STRINGS, /**< Bitfield with string per bit. */ + DESC_NUMBER_STRINGS, /**< Use for enum-style value to string. */ ++ DESC_EXTENSION, /**< Various possible descriptor extensions. */ + DESC_SNOWFLAKE, /**< Value with custom annotation callback function. */ + }; + +@@ -95,6 +96,39 @@ struct desc { + * Must be a '\0' terminated string. + */ + const char *number_postfix; ++ /** ++ * Corresponds to type DESC_EXTENSION. ++ * ++ * This allows the value of this field to be processed by ++ * another descriptor definition. The definition used to ++ * process the value of this field can be controlled by ++ * the value of another field. ++ */ ++ struct { ++ /** ++ * Name of field specifying descriptor type to select. ++ */ ++ const char *type_field; ++ /** ++ * Array of descriptor definitions and their ++ * associated types values. Array must be terminated ++ * by entry with NULL `desc` member. ++ */ ++ const struct desc_ext { ++ /** ++ * Array of descriptor field definitions. ++ * Terminated by entry with NULL `field` member. ++ */ ++ const struct desc *desc; ++ /** ++ * Type value for this descriptor definition. ++ * If it matches the type read from the ++ * field `type_field`, then this descriptor ++ * definition will be used to decode this value. ++ */ ++ unsigned int type; ++ } *d; ++ } extension; + /** + * Corresponds to type DESC_SNOWFLAKE. + * +@@ -116,6 +150,9 @@ struct desc { + + /* ---------------------------------------------------------------------- */ + ++/* Undefined descriptor */ ++extern const struct desc desc_undefined[]; ++ + /* Audio Control (AC) descriptor definitions */ + extern const struct desc * const desc_audio_ac_header[3]; + extern const struct desc * const desc_audio_ac_effect_unit[3]; +diff --git a/desc-dump.c b/desc-dump.c +index 2f92768..19d2cc7 100644 +--- a/desc-dump.c ++++ b/desc-dump.c +@@ -211,8 +211,10 @@ static void number_renderer( + * + * \param[in] dev LibUSB device handle. + * \param[in] current Descriptor definition field to render. +- * \param[in] current_size Descriptor definition field to render. ++ * \param[in] current_size Size of value to render. + * \param[in] buf Byte array containing the descriptor date to dump. ++ * \param[in] buf_len Byte length of `buf`. ++ * \param[in] desc First field in the descriptor definition. + * \param[in] indent Current indent level. + * \param[in] offset Offset to current value in `buf`. + */ +@@ -221,6 +223,8 @@ static void value_renderer( + const struct desc *current, + unsigned int current_size, + const unsigned char *buf, ++ unsigned int buf_len, ++ const struct desc *desc, + unsigned int indent, + size_t offset) + { +@@ -312,6 +316,31 @@ static void value_renderer( + printf(" %s\n", names_audioterminal( + get_n_bytes_as_ull(buf, offset, current_size))); + break; ++ case DESC_EXTENSION: { ++ unsigned int type = get_value_from_field(buf, desc, ++ current->extension.type_field); ++ const struct desc *ext_desc; ++ const struct desc_ext *ext; ++ ++ /* Lookup the extention descriptor definitions to use, */ ++ for (ext = current->extension.d; ext->desc != NULL; ext++) { ++ if (ext->type == type) { ++ ext_desc = ext->desc; ++ break; ++ } ++ } ++ ++ /* If the type didn't match a known type, use the ++ * undefined descriptor. */ ++ if (ext->desc == NULL) { ++ ext_desc = desc_undefined; ++ } ++ ++ desc_dump(dev, ext_desc, buf + offset, ++ buf_len - offset, indent); ++ ++ break; ++ } + case DESC_SNOWFLAKE: + number_renderer(buf, size_chars, offset, current_size); + current->snowflake( +@@ -537,14 +566,23 @@ void desc_dump( + } + + /* Dump the field name */ +- field_render(entry, entries, field_len, +- current, indent); ++ if (current->type != DESC_EXTENSION) { ++ field_render(entry, entries, field_len, ++ current, indent); ++ } + + /* Dump the value */ +- value_renderer(dev, current, current_size, buf, +- indent, offset); +- /* Advance offset in buffer */ +- offset += current_size; ++ value_renderer(dev, current, current_size, buf, buf_len, ++ desc, indent, offset); ++ ++ if (current->type == DESC_EXTENSION) { ++ /* A desc extension consumes all remaining ++ * value buffer. */ ++ offset = buf_len; ++ } else { ++ /* Advance offset in buffer */ ++ offset += current_size; ++ } + } + } + +-- +2.14.4 + diff --git a/0008-lsusb-Add-support-for-audio-processing-unit-type-spe.patch b/0008-lsusb-Add-support-for-audio-processing-unit-type-spe.patch new file mode 100644 index 0000000..89ce6ff --- /dev/null +++ b/0008-lsusb-Add-support-for-audio-processing-unit-type-spe.patch @@ -0,0 +1,250 @@ +From e5b6d24c5de9039606953bf8159f94ea6611e84d Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Thu, 7 Jun 2018 11:40:30 +0100 +Subject: [PATCH 8/9] lsusb: Add support for audio processing unit + type-specific fields. + +Previously the data was rendered as hex as a "Process-specific" +array type field. Now the data is interpreted properly as +descriptor fields. + +Signed-off-by: Michael Drake +--- + desc-defs.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 159 insertions(+), 18 deletions(-) + +diff --git a/desc-defs.c b/desc-defs.c +index 60cc603..d348abc 100644 +--- a/desc-defs.c ++++ b/desc-defs.c +@@ -16,6 +16,15 @@ + /** Macro for computing number of elements in array. */ + #define ARRAY_LEN(a) ((sizeof(a)) / (sizeof(a[0]))) + ++/** ++ * Undefined descriptor ++ * ++ * Ensures remaining data is dumped as garbage at end of descriptor. ++ */ ++const struct desc desc_undefined[] = { ++ { .field = NULL } ++}; ++ + /** USB Audio Device Class 1 Channel Names. (Note: Order matters.) */ + static const char * const uac1_channel_names[] = { + "Left Front (L)", "Right Front (R)", "Center Front (C)", +@@ -401,10 +410,38 @@ const struct desc * const desc_audio_ac_selector_unit[3] = { + desc_audio_3_ac_selector_unit, + }; + ++/** UAC1: Table A-7: Processing Unit Process Types */ ++static const char * const uac1_proc_unit_types[] = { ++ [0] = "Undefined", ++ [1] = "Up/Down-mix", ++ [2] = "Dolby Prologic", ++ [3] = "3D Stereo Extender", ++ [4] = "Reverberation", ++ [5] = "Chorus", ++ [6] = "Dyn Range Comp", ++ [7] = NULL ++}; ++ ++/** UAC1: Up/Down-mix and Dolby Prologic proc unit descriptor extensions Table 4-9, Table 4-10. */ ++static const struct desc desc_audio_1_ac_proc_unit_extended[] = { ++ { .field = "bNrModes", .size = 1, .type = DESC_NUMBER }, ++ { .field = "waModes", .size = 2, .type = DESC_BITMAP, ++ .array = { .array = true, .length_field1 = "bNrModes" } }, ++ { .field = NULL } ++}; ++ ++/** UAC1: Table A-7: Processing Unit Process Types */ ++static const struct desc_ext desc_audio_1_ac_proc_unit_specific[] = { ++ { .type = 1, .desc = desc_audio_1_ac_proc_unit_extended }, ++ { .type = 2, .desc = desc_audio_1_ac_proc_unit_extended }, ++ { .desc = NULL } ++}; ++ + /** UAC1: 4.3.2.6 Processing Unit Descriptor; Table 4-8. */ + static const struct desc desc_audio_1_ac_processing_unit[] = { + { .field = "bUnitID", .size = 1, .type = DESC_NUMBER }, +- { .field = "wProcessType", .size = 2, .type = DESC_CONSTANT }, ++ { .field = "wProcessType", .size = 2, .type = DESC_NUMBER_STRINGS, ++ .number_strings = uac1_proc_unit_types }, + { .field = "bNrInPins", .size = 1, .type = DESC_NUMBER }, + { .field = "baSourceID", .size = 1, .type = DESC_NUMBER, + .array = { .array = true, .length_field1 = "bNrInPins" } }, +@@ -416,15 +453,48 @@ static const struct desc desc_audio_1_ac_processing_unit[] = { + { .field = "bmControls", .size = 1, .type = DESC_BITMAP, + .array = { .array = true, .length_field1 = "bControlSize" } }, + { .field = "iProcessing", .size = 1, .type = DESC_STR_DESC_INDEX }, +- { .field = "Process-specific", .size = 1, .type = DESC_BITMAP, +- .array = { .array = true } }, ++ { .field = "Process-specific", .size = 1, .type = DESC_EXTENSION, ++ .extension = { .type_field = "wProcessType", .d = desc_audio_1_ac_proc_unit_specific } }, ++ { .field = NULL } ++}; ++ ++/** UAC2: 4.7.2.11.1 Up/Down-mix Processing Unit Descriptor; Table 4-21. */ ++static const struct desc desc_audio_2_ac_proc_unit_up_down_mix[] = { ++ { .field = "bNrModes", .size = 1, .type = DESC_NUMBER }, ++ { .field = "daModes", .size = 4, .type = DESC_BITMAP, ++ .array = { .array = true, .length_field1 = "bNrModes" } }, ++ { .field = NULL } ++}; ++ ++/** UAC2: 4.7.2.11.2 Dolby prologic Processing Unit Descriptor; Table 4-22. */ ++static const struct desc desc_audio_2_ac_proc_unit_dolby_prologic[] = { ++ { .field = "bNrModes", .size = 1, .type = DESC_NUMBER }, ++ { .field = "daModes", .size = 4, .type = DESC_BITMAP, ++ .array = { .array = true, .length_field1 = "bNrModes" } }, + { .field = NULL } + }; + ++/** UAC2: Table A-12: Processing Unit Process Types */ ++static const struct desc_ext desc_audio_2_ac_proc_unit_specific[] = { ++ { .type = 1, .desc = desc_audio_2_ac_proc_unit_up_down_mix }, ++ { .type = 2, .desc = desc_audio_2_ac_proc_unit_dolby_prologic }, ++ { .desc = NULL } ++}; ++ ++/** UAC2: Table A-12: Processing Unit Process Types */ ++static const char * const uac2_proc_unit_types[] = { ++ [0] = "Undefined", ++ [1] = "Up/Down-mix", ++ [2] = "Dolby Prologic", ++ [3] = "Stereo Extender", ++ [4] = NULL ++}; ++ + /** UAC2: 4.7.2.11 Processing Unit Descriptor; Table 4-20. */ + static const struct desc desc_audio_2_ac_processing_unit[] = { + { .field = "bUnitID", .size = 1, .type = DESC_NUMBER }, +- { .field = "wProcessType", .size = 2, .type = DESC_CONSTANT }, ++ { .field = "wProcessType", .size = 2, .type = DESC_NUMBER_STRINGS, ++ .number_strings = uac2_proc_unit_types }, + { .field = "bNrInPins", .size = 1, .type = DESC_NUMBER }, + { .field = "baSourceID", .size = 1, .type = DESC_NUMBER, + .array = { .array = true, .length_field1 = "bNrInPins" } }, +@@ -432,34 +502,105 @@ static const struct desc desc_audio_2_ac_processing_unit[] = { + { .field = "bmChannelConfig", .size = 4, .type = DESC_BITMAP_STRINGS, + .bitmap_strings = { .strings = uac2_channel_names, .count = 26 } }, + { .field = "iChannelNames", .size = 1, .type = DESC_STR_DESC_INDEX }, +- { .field = "bControlSize", .size = 1, .type = DESC_NUMBER }, +- { .field = "bmControls", .size = 2, .type = DESC_BITMAP, +- .array = { .array = true, .length_field1 = "bControlSize" } }, ++ { .field = "bmControls", .size = 2, .type = DESC_BITMAP }, + { .field = "iProcessing", .size = 1, .type = DESC_STR_DESC_INDEX }, +- { .field = "Process-specific", .size = 1, .type = DESC_BITMAP, +- .array = { .array = true } }, ++ { .field = "Process-specific", .size = 1, .type = DESC_EXTENSION, ++ .extension = { .type_field = "wProcessType", .d = desc_audio_2_ac_proc_unit_specific } }, + { .field = NULL } + }; + +-/** +- * Undefined descriptor +- * +- * Ensures remaining data is dumped as garbage at end of descriptor. +- */ +-const struct desc desc_undefined[] = { ++/** Processor unit Up/Down-mix bmControls; Human readable bit meanings. */ ++static const char * const uac3_proc_unit_up_down_mix_bmcontrols[] = { ++ [0] = "Mode Select", ++ [1] = "Underflow", ++ [2] = "Overflow", ++ [3] = NULL ++}; ++ ++/** UAC3: 4.5.2.10.1 Up/Down-mix Processing Unit Descriptor; Table 4-39. */ ++static const struct desc desc_audio_3_ac_proc_unit_up_down_mix[] = { ++ { .field = "bmControls", .size = 4, .type = DESC_BMCONTROL_2, ++ .bmcontrol = uac3_proc_unit_up_down_mix_bmcontrols }, ++ { .field = "bNrModes", .size = 1, .type = DESC_NUMBER }, ++ { .field = "waClusterDescrID", .size = 2, .type = DESC_NUMBER, ++ .array = { .array = true, .length_field1 = "bNrModes" } }, ++ { .field = NULL } ++}; ++ ++/** Processor unit stereo extender bmControls; Human readable bit meanings. */ ++static const char * const uac3_proc_unit_stereo_extender_bmcontrols[] = { ++ [0] = "Width", ++ [1] = "Underflow", ++ [2] = "Overflow", ++ [3] = NULL ++}; ++ ++/** UAC3: 4.5.2.10.2 Stereo Extender Processing Unit Descriptor; Table 4-40. */ ++static const struct desc desc_audio_3_ac_proc_unit_stereo_extender[] = { ++ { .field = "bmControls", .size = 4, .type = DESC_BMCONTROL_2, ++ .bmcontrol = uac3_proc_unit_stereo_extender_bmcontrols }, ++ { .field = NULL } ++}; ++ ++/** UAC3: 4.5.2.10.3 Multi Func Proc Unit Descriptor; Algorithms; Table 4-41. */ ++static const char *uac3_proc_unit_multi_func_algorithms[] = { ++ [0] = "Algorithm Undefined.", ++ [1] = "Beam Forming.", ++ [2] = "Acoustic Echo Cancellation.", ++ [3] = "Active Noise Cancellation.", ++ [4] = "Blind Source Separation.", ++ [5] = "Noise Suppression/Reduction.", ++ [6] = NULL ++}; ++ ++/** Processor unit Multi Func bmControls; Human readable bit meanings. */ ++static const char * const uac3_proc_unit_multi_func_bmcontrols[] = { ++ [0] = "Underflow", ++ [1] = "Overflow", ++ [2] = NULL ++}; ++ ++/** UAC3: 4.5.2.10.3 Multi Function Processing Unit Descriptor; Table 4-41. */ ++static const struct desc desc_audio_3_ac_proc_unit_multi_function[] = { ++ { .field = "bmControls", .size = 4, .type = DESC_BMCONTROL_2, ++ .bmcontrol = uac3_proc_unit_multi_func_bmcontrols }, ++ { .field = "wClusterDescrID", .size = 2, .type = DESC_NUMBER, }, ++ { .field = "bmAlgorithms", .size = 4, .type = DESC_BITMAP_STRINGS, ++ .bitmap_strings = { ++ .strings = uac3_proc_unit_multi_func_algorithms, ++ .count = 6 ++ } }, + { .field = NULL } + }; + ++/** UAC3: Table A-20: Processing Unit Process Types */ ++static const char * const uac3_proc_unit_types[] = { ++ [0] = "Undefined", ++ [1] = "Up/Down-mix", ++ [2] = "Stereo Extender", ++ [3] = "Multi-Function", ++ [4] = NULL ++}; ++ ++/** UAC3: Table A-20: Processing Unit Process Types */ ++static const struct desc_ext desc_audio_3_ac_proc_unit_specific[] = { ++ { .type = 1, .desc = desc_audio_3_ac_proc_unit_up_down_mix }, ++ { .type = 2, .desc = desc_audio_3_ac_proc_unit_stereo_extender }, ++ { .type = 3, .desc = desc_audio_3_ac_proc_unit_multi_function }, ++ { .desc = NULL } ++}; ++ + /** UAC3: 4.5.2.10 Processing Unit Descriptor; Table 4-38. */ + static const struct desc desc_audio_3_ac_processing_unit[] = { + { .field = "bUnitID", .size = 1, .type = DESC_NUMBER }, +- { .field = "wProcessType", .size = 2, .type = DESC_CONSTANT }, ++ { .field = "wProcessType", .size = 2, .type = DESC_NUMBER_STRINGS, ++ .number_strings = uac3_proc_unit_types }, + { .field = "bNrInPins", .size = 1, .type = DESC_NUMBER }, + { .field = "baSourceID", .size = 1, .type = DESC_NUMBER, + .array = { .array = true, .length_field1 = "bNrInPins" } }, + { .field = "wProcessingDescrStr", .size = 2, .type = DESC_CS_STR_DESC_ID }, +- { .field = "Process-specific", .size = 1, .type = DESC_BITMAP, +- .array = { .array = true } }, ++ { .field = "Process-specific", .size = 1, .type = DESC_EXTENSION, ++ .extension = { .type_field = "wProcessType", .d = desc_audio_3_ac_proc_unit_specific } }, + { .field = NULL } + }; + +-- +2.14.4 + diff --git a/0009-desc-dump.c-fix-compiler-warning-about-unused-variab.patch b/0009-desc-dump.c-fix-compiler-warning-about-unused-variab.patch new file mode 100644 index 0000000..fd3d079 --- /dev/null +++ b/0009-desc-dump.c-fix-compiler-warning-about-unused-variab.patch @@ -0,0 +1,27 @@ +From e63347dfecc90c6658229d8636b8d1e50a126b31 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 7 Jun 2018 19:04:44 +0200 +Subject: [PATCH 9/9] desc-dump.c: fix compiler warning about unused variable + +Left over from the descriptor changes that just got merged. + +Signed-off-by: Greg Kroah-Hartman +--- + desc-dump.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/desc-dump.c b/desc-dump.c +index 19d2cc7..a8759f4 100644 +--- a/desc-dump.c ++++ b/desc-dump.c +@@ -356,7 +356,6 @@ static unsigned int get_entry_size( + const struct desc *desc, + const struct desc *entry) + { +- const struct desc *current; + unsigned int size = entry->size; + + if (entry->size_field != NULL) { +-- +2.14.4 + diff --git a/GPL-2.0.txt b/GPL-2.0.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/GPL-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/GPL-3.0.txt b/GPL-3.0.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/GPL-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/sources b/sources index c462d11..adc6b6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usbutils-009.tar.xz) = e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a +938e3707593974be99a0dd6d1de76671 usbutils-010.tar.xz diff --git a/usbutils.spec b/usbutils.spec index 1767a8d..33e6b58 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,11 +1,25 @@ Name: usbutils Summary: Linux USB utilities -Version: 009 +Version: 010 Release: 2%{?dist} URL: http://www.linux-usb.org/ License: GPLv2+ Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz +Source1: GPL-2.0.txt +Source2: GPL-3.0.txt + +#Patch1: 0001-SPDX-bill-of-material-is-supposed-to-be-project_name.patch +Patch2: 0002-Makefile.am-add-files-with-licenses-to-archive.patch +Patch3: 0003-usbutils.spdx-rerun-report-it-is-properly-sorted.patch +Patch4: 0004-lsusb.py-fix-up-Python-3-conversion.patch +Patch5: 0005-lsusb-Split-out-routine-that-fetches-value-for-given.patch +Patch6: 0006-lsusb-Split-out-field-name-rendering.patch +Patch7: 0007-lsusb-Add-support-for-descriptor-extensions.patch +Patch8: 0008-lsusb-Add-support-for-audio-processing-unit-type-spe.patch +Patch9: 0009-desc-dump.c-fix-compiler-warning-about-unused-variab.patch + +%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} BuildRequires: libusbx-devel BuildRequires: systemd-devel @@ -18,6 +32,17 @@ USB bus. %prep %setup -q +%if %{num_patches} +git init +git config user.email "usbutils@redhat.com" +git config user.name "usbutils" +git add . +git commit -a -q -m "%{version} baseline." + +# Apply all the patches. +git am --exclude=project_name.spdx --exclude=bom.spdx --exclude=usbutils.spdx %{patches} +%endif + %build %configure --sbindir=%{_sbindir} --datadir=%{_datadir}/hwdata --disable-usbids make %{?_smp_mflags} @@ -26,14 +51,25 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc +#FIXME: remove with usbutils-011 +mkdir -p %{buildroot}%{_prefix}/share/licenses/usbutils/ +install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/share/licenses/usbutils/ +install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/share/licenses/usbutils/ + %files %{!?_licensedir:%global license %%doc} -%license COPYING -%doc AUTHORS NEWS README +%license GPL-2.0.txt GPL-3.0.txt +%doc NEWS %{_mandir}/*/* %{_bindir}/* %changelog +* Fri Jun 08 2018 Lukas Nykryn - 010-2 +- add upstream fixes + +* Wed May 16 2018 Lukas Nykryn - 010-1 +- New 010 release + * Fri Feb 09 2018 Fedora Release Engineering - 009-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild