aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-30 23:06:19 +0900
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2023-10-30 23:06:19 +0900
commit778c19021f8eb15e3d8f8e605dad8fab636b3aef (patch)
treea9ba8aee8eb7307e1e0efadbfb379d3300dada2a
parent48dec86873939e458bcd31b94a39c70318f04ce6 (diff)
downloadhinoko-rs-778c19021f8eb15e3d8f8e605dad8fab636b3aef.tar.gz
hinoko-sys: regenerate sys crate
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--README.rst2
-rw-r--r--hinoko/README.md2
-rw-r--r--hinoko/sys/Cargo.toml7
-rw-r--r--hinoko/sys/README.md4
-rw-r--r--hinoko/sys/src/lib.rs20
5 files changed, 18 insertions, 17 deletions
diff --git a/README.rst b/README.rst
index 5f7fc1e..17d122f 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,7 @@ Dependencies
* ``libc`` >= 0.2
* ``glib-sys`` >= 0.15
* ``gobject-sys`` >= 0.15
- * ``hinawa-sys`` >= 0.8
+ * ``hinawa-sys`` >= 0.9
* API crate (``hinoko``)
diff --git a/hinoko/README.md b/hinoko/README.md
index 2f846bb..565e857 100644
--- a/hinoko/README.md
+++ b/hinoko/README.md
@@ -4,7 +4,7 @@ Rust API bindings and wrappers for
[hinoko library](https://git.kernel.org/pub/scm/libs/ieee1394/libhinoko.git/) to operate OHCI 1394
hardware via Linux FireWire character device for isochronous communication in IEEE 1394 bus.
-The hinoko library version 0.8.0 is the minimum supported version for underlying library.
+The hinoko library version 1.0 is the minimum supported version for underlying library.
The hinoko crate is automatically generated by [gir tool](https://gtk-rs.org/gir/book/) provided
by [gtk-rs project](https://gtk-rs.org/). Hinoko-0.0 file from hinoko library is used for the
diff --git a/hinoko/sys/Cargo.toml b/hinoko/sys/Cargo.toml
index af0ead1..1a094a8 100644
--- a/hinoko/sys/Cargo.toml
+++ b/hinoko/sys/Cargo.toml
@@ -18,14 +18,15 @@ repository = "https://git.kernel.org/pub/scm/libs/ieee1394/hinoko-rs.git/"
features = ["dox"]
[package.metadata.system-deps.hinoko]
name = "hinoko"
-version = "0.8.0"
+version = "1.0.0"
[lib]
name = "hinoko_sys"
[build-dependencies]
pkg-config = "0.3.7"
-system-deps = "6"
+# To avoid MSRV in cfg-expr against rustc 1.67.
+system-deps = "=6.0.4"
[dependencies]
libc = "0.2"
@@ -40,7 +41,7 @@ version = "0.15"
[dependencies.hinawa]
package = "hinawa-sys"
-version = "0.8.0"
+version = "0.9"
[dev-dependencies]
shell-words = "1.0.0"
diff --git a/hinoko/sys/README.md b/hinoko/sys/README.md
index 5ee0f93..e6a8085 100644
--- a/hinoko/sys/README.md
+++ b/hinoko/sys/README.md
@@ -1,10 +1,10 @@
# hinoko-sys crate
Rust FFI bindings and wrappers for
-[hinoko library](https://git.kernel.org/pub/scm/libs/ieee1394/libhinoko.git/) to operate OHCI 1394
+[hinoko library](https://git.kernel.org/pub/scm/libs/ieee1394/libhinoko.git/) to operate 1394 OHCI
hardware via Linux FireWire character device for isochronous communication in IEEE 1394 bus.
-The hinoko library version 0.8.0 is the minimum supported version for underlying library.
+The hinoko library version 1.0 is the minimum supported version for underlying library.
The hinoko-sys crate is automatically generated by [gir tool](https://gtk-rs.org/gir/book/) provided
by [gtk-rs project](https://gtk-rs.org/). Hinoko-0.0 file from hinoko library is used for the
diff --git a/hinoko/sys/src/lib.rs b/hinoko/sys/src/lib.rs
index 3687e8d..00fb3f3 100644
--- a/hinoko/sys/src/lib.rs
+++ b/hinoko/sys/src/lib.rs
@@ -76,7 +76,7 @@ pub struct HinokoFwIsoCtxInterface {
unsafe extern "C" fn(
*mut HinokoFwIsoCtx,
c_int,
- *const *mut hinawa::HinawaCycleTime,
+ *mut *mut hinawa::HinawaCycleTime,
*mut *mut glib::GError,
) -> gboolean,
>,
@@ -184,7 +184,7 @@ pub struct HinokoFwIsoResourceInterface {
*mut *mut glib::GError,
) -> gboolean,
>,
- pub allocate_async: Option<
+ pub allocate: Option<
unsafe extern "C" fn(
*mut HinokoFwIsoResource,
*const u8,
@@ -211,7 +211,7 @@ impl ::std::fmt::Debug for HinokoFwIsoResourceInterface {
f.debug_struct(&format!("HinokoFwIsoResourceInterface @ {:p}", self))
.field("parent_iface", &self.parent_iface)
.field("open", &self.open)
- .field("allocate_async", &self.allocate_async)
+ .field("allocate", &self.allocate)
.field("create_source", &self.create_source)
.field("allocated", &self.allocated)
.field("deallocated", &self.deallocated)
@@ -476,11 +476,11 @@ extern "C" {
//=========================================================================
pub fn hinoko_fw_iso_resource_auto_get_type() -> GType;
pub fn hinoko_fw_iso_resource_auto_new() -> *mut HinokoFwIsoResourceAuto;
- pub fn hinoko_fw_iso_resource_auto_deallocate_async(
+ pub fn hinoko_fw_iso_resource_auto_deallocate(
self_: *mut HinokoFwIsoResourceAuto,
error: *mut *mut glib::GError,
) -> gboolean;
- pub fn hinoko_fw_iso_resource_auto_deallocate_sync(
+ pub fn hinoko_fw_iso_resource_auto_deallocate_wait(
self_: *mut HinokoFwIsoResourceAuto,
timeout_ms: c_uint,
error: *mut *mut glib::GError,
@@ -491,13 +491,13 @@ extern "C" {
//=========================================================================
pub fn hinoko_fw_iso_resource_once_get_type() -> GType;
pub fn hinoko_fw_iso_resource_once_new() -> *mut HinokoFwIsoResourceOnce;
- pub fn hinoko_fw_iso_resource_once_deallocate_async(
+ pub fn hinoko_fw_iso_resource_once_deallocate(
self_: *mut HinokoFwIsoResourceOnce,
channel: c_uint,
bandwidth: c_uint,
error: *mut *mut glib::GError,
) -> gboolean;
- pub fn hinoko_fw_iso_resource_once_deallocate_sync(
+ pub fn hinoko_fw_iso_resource_once_deallocate_wait(
self_: *mut HinokoFwIsoResourceOnce,
channel: c_uint,
bandwidth: c_uint,
@@ -521,7 +521,7 @@ extern "C" {
pub fn hinoko_fw_iso_ctx_read_cycle_time(
self_: *mut HinokoFwIsoCtx,
clock_id: c_int,
- cycle_time: *const *mut hinawa::HinawaCycleTime,
+ cycle_time: *mut *mut hinawa::HinawaCycleTime,
error: *mut *mut glib::GError,
) -> gboolean;
pub fn hinoko_fw_iso_ctx_release(self_: *mut HinokoFwIsoCtx);
@@ -536,14 +536,14 @@ extern "C" {
bytes_per_payload: c_uint,
scode: HinokoFwScode,
) -> c_uint;
- pub fn hinoko_fw_iso_resource_allocate_async(
+ pub fn hinoko_fw_iso_resource_allocate(
self_: *mut HinokoFwIsoResource,
channel_candidates: *const u8,
channel_candidates_count: size_t,
bandwidth: c_uint,
error: *mut *mut glib::GError,
) -> gboolean;
- pub fn hinoko_fw_iso_resource_allocate_sync(
+ pub fn hinoko_fw_iso_resource_allocate_wait(
self_: *mut HinokoFwIsoResource,
channel_candidates: *const u8,
channel_candidates_count: size_t,