Mark rusb-async::{Error, Result} as public

.github/workflows/github-ci.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 env:
   CARGO_TERM_COLOR: always
@@ -13,18 +13,18 @@ jobs:
   check-code:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: true
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
 
-    - name: Install
-      run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libusb-1.0-0-dev
+      - name: Install
+        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libusb-1.0-0-dev
 
-    - name: Run check and format
-      run: |
-        cargo check --all-targets --examples
-        cargo fmt --check
+      - name: Run check and format
+        run: |
+          cargo check --all-targets --examples
+          cargo fmt --check
 
   build:
     needs: [check-code]
@@ -34,12 +34,12 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            apt: 'libusb-1.0-0-dev'
+            apt: "libusb-1.0-0-dev"
             experimental: false
             features: ""
 
           - os: ubuntu-latest
-            apt: 'libudev-dev'
+            apt: "libudev-dev"
             experimental: false
             features: ""
 
@@ -67,7 +67,7 @@ jobs:
             features: ""
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 

CHANGELOG.md

@@ -1,6 +1,52 @@
 # Changes
 
-## unreleased
+## 0.9.4
+
+* bLength, bDescriptorType and wTotalLength to descriptors [#185]
+* Use &self reference for all DeviceHandle methods [#186]
+* fix: panic when trying to iterate over an interface with zero endpoints [#195]
+* Log callback API added [#194]
+* Bump libusb1-sys 0.7.0 [#205]
+
+[#185]: https://github.com/a1ien/rusb/pull/185
+[#186]: https://github.com/a1ien/rusb/pull/186
+[#195]: https://github.com/a1ien/rusb/pull/195
+[#194]: https://github.com/a1ien/rusb/pull/194
+[#205]: https://github.com/a1ien/rusb/pull/205
+
+## 0.9.3
+* impl serde::{Serialize, Deserialize} for public enums [#167]
+* Update deprecated doc link about language identifiers [#165]
+* Fix changelog URLs for 0.9.2 [#164]
+
+
+[#167]: https://github.com/a1ien/rusb/pull/167
+[#165]: https://github.com/a1ien/rusb/pull/165
+[#164]: https://github.com/a1ien/rusb/pull/164
+
+## 0.9.2
+* Random corrections around the code [#127]
+* examples: list_devices: Add vendor and product name [#128]
+* examples: read_devices: Improve usage [#125]
+* context: create rusb `Context` from existing `libusb_context` [#135]
+* `new` now uses `from_raw` [#135]
+* Fix stack use after scope in tests [#138]
+* Fix United Kingdom misspelling in languages docs [#137]
+* fields.rs: Make request_type function a const fn [#142]
+* Increase endpoint descriptor's lifetime [#149]
+* Fix timeout documentation [#151]
+
+[#127]: https://github.com/a1ien/rusb/pull/127
+[#128]: https://github.com/a1ien/rusb/pull/128
+[#125]: https://github.com/a1ien/rusb/pull/125
+[#135]: https://github.com/a1ien/rusb/pull/135
+[#138]: https://github.com/a1ien/rusb/pull/135
+[#137]: https://github.com/a1ien/rusb/pull/137
+[#142]: https://github.com/a1ien/rusb/pull/142
+[#149]: https://github.com/a1ien/rusb/pull/149
+[#151]: https://github.com/a1ien/rusb/pull/151
+
+## 0.9.1
 * impl Ord and PartialOrd for Version [#116]
 
 [#116]: https://github.com/a1ien/rusb/pull/116

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rusb"
-version = "0.9.1"
+version = "0.9.4"
 authors = ["David Cuddeback <[email protected]>", "Ilya Averyanov <[email protected]>"]
 description = "Rust library for accessing USB devices."
 license = "MIT"
@@ -21,9 +21,10 @@ vendored = [ "libusb1-sys/vendored" ]
 members = [ "libusb1-sys", "rusb-async" ]
 
 [dependencies]
-libusb1-sys = { path = "libusb1-sys", version = "0.6.0" }
+libusb1-sys = { path = "libusb1-sys", version = "0.7" }
 libc = "0.2"
+serde = { version = "1.0", features = ["derive"], optional = true }
 
 [dev-dependencies]
 regex = "1"
-usb-ids = "0.2.2"
+usb-ids = "1.2023.0"

examples/list_devices.rs

@@ -94,6 +94,8 @@ fn print_device<T: UsbContext>(device_desc: &DeviceDescriptor, handle: &mut Opti
         };
 
     println!("Device Descriptor:");
+    println!("  bLength              {:3}", device_desc.length());
+    println!("  bDescriptorType      {:3}", device_desc.descriptor_type());
     println!(
         "  bcdUSB             {:2}.{}{}",
         device_desc.usb_version().major(),
@@ -147,6 +149,12 @@ fn print_device<T: UsbContext>(device_desc: &DeviceDescriptor, handle: &mut Opti
 
 fn print_config<T: UsbContext>(config_desc: &ConfigDescriptor, handle: &mut Option<UsbDevice<T>>) {
     println!("  Config Descriptor:");
+    println!("    bLength              {:3}", config_desc.length());
+    println!(
+        "    bDescriptorType      {:3}",
+        config_desc.descriptor_type()
+    );
+    println!("    wTotalLength      {:#06x}", config_desc.total_length());
     println!(
         "    bNumInterfaces       {:3}",
         config_desc.num_interfaces()
@@ -177,6 +185,11 @@ fn print_interface<T: UsbContext>(
     handle: &mut Option<UsbDevice<T>>,
 ) {
     println!("    Interface Descriptor:");
+    println!("      bLength              {:3}", interface_desc.length());
+    println!(
+        "      bDescriptorType      {:3}",
+        interface_desc.descriptor_type()
+    );
     println!(
         "      bInterfaceNumber     {:3}",
         interface_desc.interface_number()
@@ -219,6 +232,11 @@ fn print_interface<T: UsbContext>(
 
 fn print_endpoint(endpoint_desc: &EndpointDescriptor) {
     println!("      Endpoint Descriptor:");
+    println!("        bLength              {:3}", endpoint_desc.length());
+    println!(
+        "        bDescriptorType      {:3}",
+        endpoint_desc.descriptor_type()
+    );
     println!(
         "        bEndpointAddress    {:#04x} EP {} {:?}",
         endpoint_desc.address(),

libusb1-sys/CHANGELOG.md

@@ -1,6 +1,41 @@
 # Changes
 
-## unreleased
+## 0.7.0
+
+* fix: Add missing fields to libusb_bos_descriptor and libusb_bos_dev_capability_descriptor [#161]
+* Bump libusb to 1.0.27 [#201]
+* Remove unneeded mut [#204]
+
+[#161]: https://github.com/a1ien/rusb/pull/161
+[#201]: https://github.com/a1ien/rusb/pull/201
+[#204]: https://github.com/a1ien/rusb/pull/204
+
+## 0.6.5
+* Support pkg_config for MSVC. [#191]
+* Fix package detection and build when cross-compiling from MSVC to GNU [#180]
+* libusb_set_iso_packet_lengths panics on debug builds in newest nightly (2024-03-27) [#199]
+* Added libusb_free_pollfds() in the available FFI methods. [#203]
+
+[#191]: https://github.com/a1ien/rusb/pull/191
+[#180]: https://github.com/a1ien/rusb/pull/180
+[#199]: https://github.com/a1ien/rusb/pull/199
+[#203]: https://github.com/a1ien/rusb/pull/203
+
+## 0.6.3-0.6.4
+* Patch for macOS Big Sur and newer allowing to link statically [#133]
+* Add libudev include paths as specified by pkg-config [#140]
+
+[#133]: https://github.com/a1ien/rusb/pull/133
+[#140]: https://github.com/a1ien/rusb/pull/140
+
+
+## 0.6.2
+* Rename compiled library when vendored libusb is used [#130]
+
+[#130]: https://github.com/a1ien/rusb/pull/130
+
+## 0.6.1
+* Add LIBUSB_OPTION_NO_DEVICE_DISCOVERY constant
 * Bump vendored libusb version from 1.0.24 to 1.0.25 [#119]
 
 [#119]: https://github.com/a1ien/rusb/pull/119

libusb1-sys/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "libusb1-sys"
-version = "0.6.4"
+version = "0.7.0"
 authors = ["David Cuddeback <[email protected]>",
             "Ilya Averyanov <[email protected]>"]
 description = "FFI bindings for libusb."
@@ -39,7 +39,7 @@ vendored = []
 [dependencies]
 libc = "0.2"
 
-[target.'cfg(target_env = "msvc")'.build-dependencies]
+[target.'cfg(target_os = "windows")'.build-dependencies]
 vcpkg = "0.2"
 
 [build-dependencies]

libusb1-sys/build.rs

@@ -1,6 +1,6 @@
 use std::{env, fs, path::PathBuf};
 
-static VERSION: &str = "1.0.24";
+static VERSION: &str = "1.0.27";
 
 fn link(name: &str, bundled: bool) {
     use std::env::var;
@@ -19,17 +19,6 @@ pub fn link_framework(name: &str) {
     println!("cargo:rustc-link-lib=framework={}", name);
 }
 
-#[cfg(target_env = "msvc")]
-fn find_libusb_pkg(_statik: bool) -> bool {
-    match vcpkg::Config::new().find_package("libusb") {
-        Ok(_) => true,
-        Err(e) => {
-            println!("Can't find libusb pkg: {:?}", e);
-            false
-        }
-    }
-}
-
 fn get_macos_major_version() -> Option<usize> {
     if !cfg!(target_os = "macos") {
         return None;
@@ -45,8 +34,21 @@ fn get_macos_major_version() -> Option<usize> {
     Some(major)
 }
 
-#[cfg(not(target_env = "msvc"))]
 fn find_libusb_pkg(statik: bool) -> bool {
+    if std::env::var("CARGO_CFG_TARGET_ENV") == Ok("msvc".into()) {
+        #[cfg(target_os = "windows")]
+        return match vcpkg::Config::new().find_package("libusb") {
+            Ok(_) => true,
+            Err(e) => {
+                if pkg_config::probe_library("libusb-1.0").is_ok() {
+                    true
+                } else {
+                    println!("Can't find libusb pkg: {:?}", e);
+                    false
+                }
+            }
+        };
+    }
     // https://github.com/rust-lang/rust/issues/96943
     let needs_rustc_issue_96943_workaround: bool = get_macos_major_version()
         .map(|major| major >= 11)
@@ -156,23 +158,26 @@ fn make_source() {
             Some("__attribute__((visibility(\"default\")))"),
         );
 
-        if let Ok(lib) = pkg_config::probe_library("libudev") {
-            base_config.define("USE_UDEV", Some("1"));
-            base_config.define("HAVE_LIBUDEV", Some("1"));
-            base_config.file(libusb_source.join("libusb/os/linux_udev.c"));
-            for path in lib.include_paths {
-                base_config.include(path.to_str().unwrap());
-            }
-        };
+        if std::env::var("CARGO_CFG_TARGET_OS") != Ok("android".into()) {
+            if let Ok(lib) = pkg_config::probe_library("libudev") {
+                base_config.define("USE_UDEV", Some("1"));
+                base_config.define("HAVE_LIBUDEV", Some("1"));
+                base_config.file(libusb_source.join("libusb/os/linux_udev.c"));
+                for path in lib.include_paths {
+                    base_config.include(path.to_str().unwrap());
+                }
+            };
+        }
 
         println!("Including posix!");
         base_config.file(libusb_source.join("libusb/os/events_posix.c"));
         base_config.file(libusb_source.join("libusb/os/threads_posix.c"));
     }
 
     if std::env::var("CARGO_CFG_TARGET_OS") == Ok("windows".into()) {
-        #[cfg(target_env = "msvc")]
-        base_config.flag("/source-charset:utf-8");
+        if std::env::var("CARGO_CFG_TARGET_ENV") == Ok("msvc".into()) {
+            base_config.flag("/source-charset:utf-8");
+        }
 
         base_config.warnings(false);
         base_config.define("OS_WINDOWS", Some("1"));