diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-08-03 21:54:22 +0900 |
---|---|---|
committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2023-08-03 21:54:22 +0900 |
commit | b2a0b4b7ff87511253354c35e015414a24f02a9f (patch) | |
tree | e9be2cffece40d506a3a2f1ca7ea8cced53bcb47 | |
parent | d69e950c280aec2d8241e93df0a2f287be6a6c5a (diff) | |
download | hinawa-rs-b2a0b4b7ff87511253354c35e015414a24f02a9f.tar.gz |
hinawa-sys: regenerate crate
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r-- | hinawa/sys/Cargo.toml | 7 | ||||
-rw-r--r-- | hinawa/sys/README.md | 4 | ||||
-rw-r--r-- | hinawa/sys/src/lib.rs | 559 | ||||
-rw-r--r-- | hinawa/sys/tests/abi.rs | 154 | ||||
-rw-r--r-- | hinawa/sys/tests/constant.c | 35 | ||||
-rw-r--r-- | hinawa/sys/tests/layout.c | 17 |
6 files changed, 24 insertions, 752 deletions
diff --git a/hinawa/sys/Cargo.toml b/hinawa/sys/Cargo.toml index 0cb7dd8..221dad5 100644 --- a/hinawa/sys/Cargo.toml +++ b/hinawa/sys/Cargo.toml @@ -19,11 +19,7 @@ repository = "https://git.kernel.org/pub/scm/libs/ieee1394/hinawa-rs.git/" features = ["dox"] [package.metadata.system-deps.hinawa] name = "hinawa" -version = "2.6" - -[package.metadata.system-deps.hinawa.v2_6] -name = "hinawa" -version = "2.6" +version = "4.0" [lib] name = "hinawa_sys" @@ -51,4 +47,3 @@ tempfile = "3" [features] # To suppress linking to C library when generating documentation. dox = [] -v2_6 = [] diff --git a/hinawa/sys/README.md b/hinawa/sys/README.md index 23e8581..5413b82 100644 --- a/hinawa/sys/README.md +++ b/hinawa/sys/README.md @@ -4,10 +4,10 @@ Rust FFI bindings and wrappers for [hinawa library](https://git.kernel.org/pub/scm/libs/ieee1394/libhinawa.git/) to operate OHCI 1394 hardware via Linux FireWire character device for asynchronous communication in IEEE 1394 bus. -The hinawa library version 2.6 is the minimum supported version for underlying library. +The hinawa library version 4.0 is the minimum supported version for underlying library. The hinawa-sys crate is automatically generated by [gir tool](https://gtk-rs.org/gir/book/) provided -by [gtk-rs project](https://gtk-rs.org/). Hinawa-3.0 file from hinawa library is used for the +by [gtk-rs project](https://gtk-rs.org/). Hinawa-4.0 file from hinawa library is used for the generation. ## License diff --git a/hinawa/sys/src/lib.rs b/hinawa/sys/src/lib.rs index b3eb349..fc45b4f 100644 --- a/hinawa/sys/src/lib.rs +++ b/hinawa/sys/src/lib.rs @@ -3,7 +3,6 @@ // from gir-files (https://github.com/gtk-rs/gir-files) // DO NOT EDIT -#![doc = include_str!("../README.md")] #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] #![allow( clippy::approx_constant, @@ -26,6 +25,7 @@ use glib::{gboolean, gconstpointer, gpointer, GType}; pub type HinawaFwFcpError = c_int; pub const HINAWA_FW_FCP_ERROR_TIMEOUT: HinawaFwFcpError = 0; pub const HINAWA_FW_FCP_ERROR_LARGE_RESP: HinawaFwFcpError = 1; +pub const HINAWA_FW_FCP_ERROR_ABORTED: HinawaFwFcpError = 2; pub type HinawaFwNodeError = c_int; pub const HINAWA_FW_NODE_ERROR_DISCONNECTED: HinawaFwNodeError = 0; @@ -83,48 +83,6 @@ pub const HINAWA_FW_TCODE_LOCK_BOUNDED_ADD: HinawaFwTcode = 21; pub const HINAWA_FW_TCODE_LOCK_WRAP_ADD: HinawaFwTcode = 22; pub const HINAWA_FW_TCODE_LOCK_VENDOR_DEPENDENT: HinawaFwTcode = 23; -pub type HinawaSndDiceError = c_int; -pub const HINAWA_SND_DICE_ERROR_TIMEOUT: HinawaSndDiceError = 0; - -pub type HinawaSndEfwStatus = c_int; -pub const HINAWA_SND_EFW_STATUS_OK: HinawaSndEfwStatus = 0; -pub const HINAWA_SND_EFW_STATUS_BAD: HinawaSndEfwStatus = 1; -pub const HINAWA_SND_EFW_STATUS_BAD_COMMAND: HinawaSndEfwStatus = 2; -pub const HINAWA_SND_EFW_STATUS_COMM_ERR: HinawaSndEfwStatus = 3; -pub const HINAWA_SND_EFW_STATUS_BAD_QUAD_COUNT: HinawaSndEfwStatus = 4; -pub const HINAWA_SND_EFW_STATUS_UNSUPPORTED: HinawaSndEfwStatus = 5; -pub const HINAWA_SND_EFW_STATUS_TIMEOUT: HinawaSndEfwStatus = 6; -pub const HINAWA_SND_EFW_STATUS_DSP_TIMEOUT: HinawaSndEfwStatus = 7; -pub const HINAWA_SND_EFW_STATUS_BAD_RATE: HinawaSndEfwStatus = 8; -pub const HINAWA_SND_EFW_STATUS_BAD_CLOCK: HinawaSndEfwStatus = 9; -pub const HINAWA_SND_EFW_STATUS_BAD_CHANNEL: HinawaSndEfwStatus = 10; -pub const HINAWA_SND_EFW_STATUS_BAD_PAN: HinawaSndEfwStatus = 11; -pub const HINAWA_SND_EFW_STATUS_FLASH_BUSY: HinawaSndEfwStatus = 12; -pub const HINAWA_SND_EFW_STATUS_BAD_MIRROR: HinawaSndEfwStatus = 13; -pub const HINAWA_SND_EFW_STATUS_BAD_LED: HinawaSndEfwStatus = 14; -pub const HINAWA_SND_EFW_STATUS_BAD_PARAMETER: HinawaSndEfwStatus = 15; -pub const HINAWA_SND_EFW_STATUS_LARGE_RESP: HinawaSndEfwStatus = 16; - -pub type HinawaSndUnitError = c_int; -pub const HINAWA_SND_UNIT_ERROR_DISCONNECTED: HinawaSndUnitError = 0; -pub const HINAWA_SND_UNIT_ERROR_USED: HinawaSndUnitError = 1; -pub const HINAWA_SND_UNIT_ERROR_OPENED: HinawaSndUnitError = 2; -pub const HINAWA_SND_UNIT_ERROR_NOT_OPENED: HinawaSndUnitError = 3; -pub const HINAWA_SND_UNIT_ERROR_LOCKED: HinawaSndUnitError = 4; -pub const HINAWA_SND_UNIT_ERROR_UNLOCKED: HinawaSndUnitError = 5; -pub const HINAWA_SND_UNIT_ERROR_WRONG_CLASS: HinawaSndUnitError = 6; -pub const HINAWA_SND_UNIT_ERROR_FAILED: HinawaSndUnitError = 7; - -pub type HinawaSndUnitType = c_int; -pub const HINAWA_SND_UNIT_TYPE_DICE: HinawaSndUnitType = 1; -pub const HINAWA_SND_UNIT_TYPE_FIREWORKS: HinawaSndUnitType = 2; -pub const HINAWA_SND_UNIT_TYPE_BEBOB: HinawaSndUnitType = 3; -pub const HINAWA_SND_UNIT_TYPE_OXFW: HinawaSndUnitType = 4; -pub const HINAWA_SND_UNIT_TYPE_DIGI00X: HinawaSndUnitType = 5; -pub const HINAWA_SND_UNIT_TYPE_TASCAM: HinawaSndUnitType = 6; -pub const HINAWA_SND_UNIT_TYPE_MOTU: HinawaSndUnitType = 7; -pub const HINAWA_SND_UNIT_TYPE_FIREFACE: HinawaSndUnitType = 8; - // Records #[repr(C)] pub struct HinawaCycleTime { @@ -143,8 +101,8 @@ impl ::std::fmt::Debug for HinawaCycleTime { #[repr(C)] pub struct HinawaFwFcpClass { pub parent_class: HinawaFwRespClass, - pub responded: Option<unsafe extern "C" fn(*mut HinawaFwFcp, *const u8, c_uint)>, - pub responded2: Option<unsafe extern "C" fn(*mut HinawaFwFcp, c_uint, *const u8, c_uint)>, + pub responded: + Option<unsafe extern "C" fn(*mut HinawaFwFcp, c_uint, c_uint, *const u8, c_uint)>, } impl ::std::fmt::Debug for HinawaFwFcpClass { @@ -152,7 +110,6 @@ impl ::std::fmt::Debug for HinawaFwFcpClass { f.debug_struct(&format!("HinawaFwFcpClass @ {:p}", self)) .field("parent_class", &self.parent_class) .field("responded", &self.responded) - .field("responded2", &self.responded2) .finish() } } @@ -179,8 +136,7 @@ impl ::std::fmt::Debug for HinawaFwNodeClass { #[repr(C)] pub struct HinawaFwReqClass { pub parent_class: gobject::GObjectClass, - pub responded: Option<unsafe extern "C" fn(*mut HinawaFwReq, HinawaFwRcode, *const u8, c_uint)>, - pub responded2: Option< + pub responded: Option< unsafe extern "C" fn(*mut HinawaFwReq, HinawaFwRcode, c_uint, c_uint, *const u8, c_uint), >, } @@ -190,7 +146,6 @@ impl ::std::fmt::Debug for HinawaFwReqClass { f.debug_struct(&format!("HinawaFwReqClass @ {:p}", self)) .field("parent_class", &self.parent_class) .field("responded", &self.responded) - .field("responded2", &self.responded2) .finish() } } @@ -199,21 +154,7 @@ impl ::std::fmt::Debug for HinawaFwReqClass { #[repr(C)] pub struct HinawaFwRespClass { pub parent_class: gobject::GObjectClass, - pub requested: Option<unsafe extern "C" fn(*mut HinawaFwResp, HinawaFwTcode) -> HinawaFwRcode>, - pub requested2: Option< - unsafe extern "C" fn( - *mut HinawaFwResp, - HinawaFwTcode, - u64, - u32, - u32, - u32, - u32, - *const u8, - c_uint, - ) -> HinawaFwRcode, - >, - pub requested3: Option< + pub requested: Option< unsafe extern "C" fn( *mut HinawaFwResp, HinawaFwTcode, @@ -234,131 +175,6 @@ impl ::std::fmt::Debug for HinawaFwRespClass { f.debug_struct(&format!("HinawaFwRespClass @ {:p}", self)) .field("parent_class", &self.parent_class) .field("requested", &self.requested) - .field("requested2", &self.requested2) - .field("requested3", &self.requested3) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndDg00xClass { - pub parent_class: HinawaSndUnitClass, - pub message: Option<unsafe extern "C" fn(*mut HinawaSndDg00x, u32)>, -} - -impl ::std::fmt::Debug for HinawaSndDg00xClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndDg00xClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("message", &self.message) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndDiceClass { - pub parent_class: HinawaSndUnitClass, - pub notified: Option<unsafe extern "C" fn(*mut HinawaSndDice, c_uint)>, -} - -impl ::std::fmt::Debug for HinawaSndDiceClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndDiceClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("notified", &self.notified) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndEfwClass { - pub parent_class: HinawaSndUnitClass, - pub responded: Option< - unsafe extern "C" fn( - *mut HinawaSndEfw, - HinawaSndEfwStatus, - c_uint, - c_uint, - c_uint, - *const u32, - c_uint, - ), - >, -} - -impl ::std::fmt::Debug for HinawaSndEfwClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndEfwClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("responded", &self.responded) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndMotuClass { - pub parent_class: HinawaSndUnitClass, - pub notified: Option<unsafe extern "C" fn(*mut HinawaSndMotu, c_uint)>, - pub register_dsp_changed: Option<unsafe extern "C" fn(*mut HinawaSndMotu, *const u32, c_uint)>, -} - -impl ::std::fmt::Debug for HinawaSndMotuClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndMotuClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("notified", &self.notified) - .field("register_dsp_changed", &self.register_dsp_changed) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndMotuRegisterDspParameter { - pub parameter: [u8; 512], -} - -impl ::std::fmt::Debug for HinawaSndMotuRegisterDspParameter { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndMotuRegisterDspParameter @ {:p}", self)) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndTscmClass { - pub parent_class: HinawaSndUnitClass, - pub control: Option<unsafe extern "C" fn(*mut HinawaSndTscm, c_uint, c_uint, c_uint)>, -} - -impl ::std::fmt::Debug for HinawaSndTscmClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndTscmClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("control", &self.control) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndUnitClass { - pub parent_class: gobject::GObjectClass, - pub lock_status: Option<unsafe extern "C" fn(*mut HinawaSndUnit, gboolean)>, - pub disconnected: Option<unsafe extern "C" fn(*mut HinawaSndUnit)>, -} - -impl ::std::fmt::Debug for HinawaSndUnitClass { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndUnitClass @ {:p}", self)) - .field("parent_class", &self.parent_class) - .field("lock_status", &self.lock_status) - .field("disconnected", &self.disconnected) .finish() } } @@ -420,90 +236,6 @@ impl ::std::fmt::Debug for HinawaFwResp { } } -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndDg00x { - pub parent_instance: HinawaSndUnit, -} - -impl ::std::fmt::Debug for HinawaSndDg00x { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndDg00x @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndDice { - pub parent_instance: HinawaSndUnit, -} - -impl ::std::fmt::Debug for HinawaSndDice { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndDice @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndEfw { - pub parent_instance: HinawaSndUnit, -} - -impl ::std::fmt::Debug for HinawaSndEfw { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndEfw @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndMotu { - pub parent_instance: HinawaSndUnit, -} - -impl ::std::fmt::Debug for HinawaSndMotu { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndMotu @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndTscm { - pub parent_instance: HinawaSndUnit, -} - -impl ::std::fmt::Debug for HinawaSndTscm { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndTscm @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - -#[derive(Copy, Clone)] -#[repr(C)] -pub struct HinawaSndUnit { - pub parent_instance: gobject::GObject, -} - -impl ::std::fmt::Debug for HinawaSndUnit { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("HinawaSndUnit @ {:p}", self)) - .field("parent_instance", &self.parent_instance) - .finish() - } -} - #[link(name = "hinawa")] extern "C" { @@ -542,28 +274,6 @@ extern "C" { pub fn hinawa_fw_tcode_get_type() -> GType; //========================================================================= - // HinawaSndDiceError - //========================================================================= - pub fn hinawa_snd_dice_error_get_type() -> GType; - pub fn hinawa_snd_dice_error_quark() -> glib::GQuark; - - //========================================================================= - // HinawaSndEfwStatus - //========================================================================= - pub fn hinawa_snd_efw_status_get_type() -> GType; - - //========================================================================= - // HinawaSndUnitError - //========================================================================= - pub fn hinawa_snd_unit_error_get_type() -> GType; - pub fn hinawa_snd_unit_error_quark() -> glib::GQuark; - - //========================================================================= - // HinawaSndUnitType - //========================================================================= - pub fn hinawa_snd_unit_type_get_type() -> GType; - - //========================================================================= // HinawaCycleTime //========================================================================= pub fn hinawa_cycle_time_get_type() -> GType; @@ -584,73 +294,6 @@ extern "C" { pub fn hinawa_cycle_time_parse_tstamp(tstamp: c_uint, isoc_cycle: *mut [c_uint; 2]); //========================================================================= - // HinawaSndMotuRegisterDspParameter - //========================================================================= - pub fn hinawa_snd_motu_register_dsp_parameter_get_type() -> GType; - pub fn hinawa_snd_motu_register_dsp_parameter_new() -> *mut HinawaSndMotuRegisterDspParameter; - pub fn hinawa_snd_motu_register_dsp_parameter_get_headphone_output_paired_assignment( - self_: *const HinawaSndMotuRegisterDspParameter, - assignment: *mut u8, - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_headphone_output_paired_volume( - self_: *const HinawaSndMotuRegisterDspParameter, - volume: *mut u8, - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_input_flag( - self_: *const HinawaSndMotuRegisterDspParameter, - flag: *mut *const [u8; 10], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_input_gain_and_invert( - self_: *const HinawaSndMotuRegisterDspParameter, - gain_and_invert: *mut *const [u8; 10], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_line_input_boost_flag( - self_: *const HinawaSndMotuRegisterDspParameter, - boost_flag: *mut u8, - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_line_input_nominal_level_flag( - self_: *const HinawaSndMotuRegisterDspParameter, - nominal_level_flag: *mut u8, - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_main_output_paired_volume( - self_: *const HinawaSndMotuRegisterDspParameter, - volume: *mut u8, - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_output_paired_flag( - self_: *const HinawaSndMotuRegisterDspParameter, - flag: *mut *const [u8; 4], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_output_paired_volume( - self_: *const HinawaSndMotuRegisterDspParameter, - volume: *mut *const [u8; 4], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_source_flag( - self_: *const HinawaSndMotuRegisterDspParameter, - mixer: size_t, - flag: *mut *const [u8; 20], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_source_gain( - self_: *const HinawaSndMotuRegisterDspParameter, - mixer: size_t, - gain: *mut *const [u8; 20], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_source_paired_balance( - self_: *const HinawaSndMotuRegisterDspParameter, - mixer: size_t, - balance: *mut *const [u8; 20], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_source_paired_width( - self_: *const HinawaSndMotuRegisterDspParameter, - mixer: size_t, - width: *mut *const [u8; 20], - ); - pub fn hinawa_snd_motu_register_dsp_parameter_get_mixer_source_pan( - self_: *const HinawaSndMotuRegisterDspParameter, - mixer: size_t, - pan: *mut *const [u8; 20], - ); - - //========================================================================= // HinawaFwFcp //========================================================================= pub fn hinawa_fw_fcp_get_type() -> GType; @@ -659,11 +302,11 @@ extern "C" { self_: *mut HinawaFwFcp, cmd: *const u8, cmd_size: size_t, - resp: *const *mut u8, + resp: *mut *mut u8, resp_size: *mut size_t, timeout_ms: c_uint, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_fcp_avc_transaction_with_tstamp( self_: *mut HinawaFwFcp, cmd: *const u8, @@ -678,14 +321,14 @@ extern "C" { self_: *mut HinawaFwFcp, node: *mut HinawaFwNode, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_fcp_command( self_: *mut HinawaFwFcp, cmd: *const u8, cmd_size: size_t, timeout_ms: c_uint, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_fcp_command_with_tstamp( self_: *mut HinawaFwFcp, cmd: *const u8, @@ -694,14 +337,6 @@ extern "C" { timeout_ms: c_uint, error: *mut *mut glib::GError, ) -> gboolean; - pub fn hinawa_fw_fcp_transaction( - self_: *mut HinawaFwFcp, - req_frame: *const u8, - req_frame_size: size_t, - resp_frame: *const *mut u8, - resp_frame_size: *mut size_t, - error: *mut *mut glib::GError, - ); pub fn hinawa_fw_fcp_unbind(self_: *mut HinawaFwFcp); //========================================================================= @@ -713,22 +348,23 @@ extern "C" { self_: *mut HinawaFwNode, gsrc: *mut *mut glib::GSource, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_node_get_config_rom( self_: *mut HinawaFwNode, image: *mut *const u8, length: *mut size_t, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_node_open( self_: *mut HinawaFwNode, path: *const c_char, + open_flag: c_int, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_node_read_cycle_time( self_: *mut HinawaFwNode, clock_id: c_int, - cycle_time: *const *mut HinawaCycleTime, + cycle_time: *mut *mut HinawaCycleTime, error: *mut *mut glib::GError, ) -> gboolean; @@ -743,7 +379,7 @@ extern "C" { tcode: HinawaFwTcode, addr: u64, length: size_t, - frame: *const *mut u8, + frame: *mut *mut u8, frame_size: *mut size_t, error: *mut *mut glib::GError, ) -> gboolean; @@ -753,31 +389,11 @@ extern "C" { tcode: HinawaFwTcode, addr: u64, length: size_t, - frame: *const *mut u8, - frame_size: *mut size_t, - error: *mut *mut glib::GError, - ); - pub fn hinawa_fw_req_transaction_async( - self_: *mut HinawaFwReq, - node: *mut HinawaFwNode, - tcode: HinawaFwTcode, - addr: u64, - length: size_t, - frame: *const *mut u8, - frame_size: *mut size_t, - error: *mut *mut glib::GError, - ); - pub fn hinawa_fw_req_transaction_sync( - self_: *mut HinawaFwReq, - node: *mut HinawaFwNode, - tcode: HinawaFwTcode, - addr: u64, - length: size_t, - frame: *const *mut u8, + frame: *mut *mut u8, frame_size: *mut size_t, timeout_ms: c_uint, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_req_transaction_with_tstamp( self_: *mut HinawaFwReq, node: *mut HinawaFwNode, @@ -796,11 +412,6 @@ extern "C" { //========================================================================= pub fn hinawa_fw_resp_get_type() -> GType; pub fn hinawa_fw_resp_new() -> *mut HinawaFwResp; - pub fn hinawa_fw_resp_get_req_frame( - self_: *mut HinawaFwResp, - frame: *mut *const u8, - length: *mut size_t, - ); pub fn hinawa_fw_resp_release(self_: *mut HinawaFwResp); pub fn hinawa_fw_resp_reserve( self_: *mut HinawaFwResp, @@ -808,7 +419,7 @@ extern "C" { addr: u64, width: c_uint, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_resp_reserve_within_region( self_: *mut HinawaFwResp, node: *mut HinawaFwNode, @@ -816,139 +427,7 @@ extern "C" { region_end: u64, width: c_uint, error: *mut *mut glib::GError, - ); + ) -> gboolean; pub fn hinawa_fw_resp_set_resp_frame(self_: *mut HinawaFwResp, frame: *mut u8, length: size_t); - //========================================================================= - // HinawaSndDg00x - //========================================================================= - pub fn hinawa_snd_dg00x_get_type() -> GType; - pub fn hinawa_snd_dg00x_new() -> *mut HinawaSndDg00x; - pub fn hinawa_snd_dg00x_open( - self_: *mut HinawaSndDg00x, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - - //========================================================================= - // HinawaSndDice - //========================================================================= - pub fn hinawa_snd_dice_get_type() -> GType; - pub fn hinawa_snd_dice_new() -> *mut HinawaSndDice; - pub fn hinawa_snd_dice_open( - self_: *mut HinawaSndDice, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_dice_transaction( - self_: *mut HinawaSndDice, - addr: u64, - frame: *const u32, - frame_count: size_t, - bit_flag: u32, - error: *mut *mut glib::GError, - ); - - //========================================================================= - // HinawaSndEfw - //========================================================================= - pub fn hinawa_snd_efw_get_type() -> GType; - pub fn hinawa_snd_efw_new() -> *mut HinawaSndEfw; - pub fn hinawa_snd_efw_error_quark() -> glib::GQuark; - pub fn hinawa_snd_efw_open( - self_: *mut HinawaSndEfw, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_efw_transaction( - self_: *mut HinawaSndEfw, - category: c_uint, - command: c_uint, - args: *const u32, - arg_count: size_t, - params: *const *mut u32, - param_count: *mut size_t, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_efw_transaction_async( - self_: *mut HinawaSndEfw, - category: c_uint, - command: c_uint, - args: *const u32, - arg_count: size_t, - resp_seqnum: *mut u32, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_efw_transaction_sync( - self_: *mut HinawaSndEfw, - category: c_uint, - command: c_uint, - args: *const u32, - arg_count: size_t, - params: *const *mut u32, - param_count: *mut size_t, - timeout_ms: c_uint, - error: *mut *mut glib::GError, - ); - - //========================================================================= - // HinawaSndMotu - //========================================================================= - pub fn hinawa_snd_motu_get_type() -> GType; - pub fn hinawa_snd_motu_new() -> *mut HinawaSndMotu; - pub fn hinawa_snd_motu_open( - self_: *mut HinawaSndMotu, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_motu_read_command_dsp_meter( - self_: *mut HinawaSndMotu, - meter: *const *mut [c_float; 400], - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_motu_read_register_dsp_meter( - self_: *mut HinawaSndMotu, - meter: *const *mut [u8; 48], - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_motu_read_register_dsp_parameter( - self_: *mut HinawaSndMotu, - param: *const *mut HinawaSndMotuRegisterDspParameter, - error: *mut *mut glib::GError, - ); - - //========================================================================= - // HinawaSndTscm - //========================================================================= - pub fn hinawa_snd_tscm_get_type() -> GType; - pub fn hinawa_snd_tscm_new() -> *mut HinawaSndTscm; - pub fn hinawa_snd_tscm_get_state( - self_: *mut HinawaSndTscm, - error: *mut *mut glib::GError, - ) -> *const [u32; 64]; - pub fn hinawa_snd_tscm_open( - self_: *mut HinawaSndTscm, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - - //========================================================================= - // HinawaSndUnit - //========================================================================= - pub fn hinawa_snd_unit_get_type() -> GType; - pub fn hinawa_snd_unit_new() -> *mut HinawaSndUnit; - pub fn hinawa_snd_unit_create_source( - self_: *mut HinawaSndUnit, - gsrc: *mut *mut glib::GSource, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_unit_get_node(self_: *mut HinawaSndUnit, node: *mut *mut HinawaFwNode); - pub fn hinawa_snd_unit_lock(self_: *mut HinawaSndUnit, error: *mut *mut glib::GError); - pub fn hinawa_snd_unit_open( - self_: *mut HinawaSndUnit, - path: *mut c_char, - error: *mut *mut glib::GError, - ); - pub fn hinawa_snd_unit_unlock(self_: *mut HinawaSndUnit, error: *mut *mut glib::GError); - } diff --git a/hinawa/sys/tests/abi.rs b/hinawa/sys/tests/abi.rs index b784982..d2b12c7 100644 --- a/hinawa/sys/tests/abi.rs +++ b/hinawa/sys/tests/abi.rs @@ -311,128 +311,10 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ alignment: align_of::<HinawaFwTcode>(), }, ), - ( - "HinawaSndDg00x", - Layout { - size: size_of::<HinawaSndDg00x>(), - alignment: align_of::<HinawaSndDg00x>(), - }, - ), - ( - "HinawaSndDg00xClass", - Layout { - size: size_of::<HinawaSndDg00xClass>(), - alignment: align_of::<HinawaSndDg00xClass>(), - }, - ), - ( - "HinawaSndDice", - Layout { - size: size_of::<HinawaSndDice>(), - alignment: align_of::<HinawaSndDice>(), - }, - ), - ( - "HinawaSndDiceClass", - Layout { - size: size_of::<HinawaSndDiceClass>(), - alignment: align_of::<HinawaSndDiceClass>(), - }, - ), - ( - "HinawaSndDiceError", - Layout { - size: size_of::<HinawaSndDiceError>(), - alignment: align_of::<HinawaSndDiceError>(), - }, - ), - ( - "HinawaSndEfw", - Layout { - size: size_of::<HinawaSndEfw>(), - alignment: align_of::<HinawaSndEfw>(), - }, - ), - ( - "HinawaSndEfwClass", - Layout { - size: size_of::<HinawaSndEfwClass>(), - alignment: align_of::<HinawaSndEfwClass>(), - }, - ), - ( - "HinawaSndEfwStatus", - Layout { - size: size_of::<HinawaSndEfwStatus>(), - alignment: align_of::<HinawaSndEfwStatus>(), - }, - ), - ( - "HinawaSndMotu", - Layout { - size: size_of::<HinawaSndMotu>(), - alignment: align_of::<HinawaSndMotu>(), - }, - ), - ( - "HinawaSndMotuClass", - Layout { - size: size_of::<HinawaSndMotuClass>(), - alignment: align_of::<HinawaSndMotuClass>(), - }, - ), - ( - "HinawaSndMotuRegisterDspParameter", - Layout { - size: size_of::<HinawaSndMotuRegisterDspParameter>(), - alignment: align_of::<HinawaSndMotuRegisterDspParameter>(), - }, - ), - ( - "HinawaSndTscm", - Layout { - size: size_of::<HinawaSndTscm>(), - alignment: align_of::<HinawaSndTscm>(), - }, - ), - ( - "HinawaSndTscmClass", - Layout { - size: size_of::<HinawaSndTscmClass>(), - alignment: align_of::<HinawaSndTscmClass>(), - }, - ), - ( - "HinawaSndUnit", - Layout { - size: size_of::<HinawaSndUnit>(), - alignment: align_of::<HinawaSndUnit>(), - }, - ), - ( - "HinawaSndUnitClass", - Layout { - size: size_of::<HinawaSndUnitClass>(), - alignment: align_of::<HinawaSndUnitClass>(), - }, - ), - ( - "HinawaSndUnitError", - Layout { - size: size_of::<HinawaSndUnitError>(), - alignment: align_of::<HinawaSndUnitError>(), - }, - ), - ( - "HinawaSndUnitType", - Layout { - size: size_of::<HinawaSndUnitType>(), - alignment: align_of::<HinawaSndUnitType>(), - }, - ), ]; const RUST_CONSTANTS: &[(&str, &str)] = &[ + ("(gint) HINAWA_FW_FCP_ERROR_ABORTED", "2"), ("(gint) HINAWA_FW_FCP_ERROR_LARGE_RESP", "1"), ("(gint) HINAWA_FW_FCP_ERROR_TIMEOUT", "0"), ("(gint) HINAWA_FW_NODE_ERROR_DISCONNECTED", "0"), @@ -481,38 +363,4 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("(gint) HINAWA_FW_TCODE_WRITE_BLOCK_REQUEST", "1"), ("(gint) HINAWA_FW_TCODE_WRITE_QUADLET_REQUEST", "0"), ("(gint) HINAWA_FW_TCODE_WRITE_RESPONSE", "2"), - ("(gint) HINAWA_SND_DICE_ERROR_TIMEOUT", "0"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD", "1"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_CHANNEL", "10"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_CLOCK", "9"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_COMMAND", "2"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_LED", "14"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_MIRROR", "13"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_PAN", "11"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_PARAMETER", "15"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_QUAD_COUNT", "4"), - ("(gint) HINAWA_SND_EFW_STATUS_BAD_RATE", "8"), - ("(gint) HINAWA_SND_EFW_STATUS_COMM_ERR", "3"), - ("(gint) HINAWA_SND_EFW_STATUS_DSP_TIMEOUT", "7"), - ("(gint) HINAWA_SND_EFW_STATUS_FLASH_BUSY", "12"), - ("(gint) HINAWA_SND_EFW_STATUS_LARGE_RESP", "16"), - ("(gint) HINAWA_SND_EFW_STATUS_OK", "0"), - ("(gint) HINAWA_SND_EFW_STATUS_TIMEOUT", "6"), - ("(gint) HINAWA_SND_EFW_STATUS_UNSUPPORTED", "5"), - ("(gint) HINAWA_SND_UNIT_ERROR_DISCONNECTED", "0"), - ("(gint) HINAWA_SND_UNIT_ERROR_FAILED", "7"), - ("(gint) HINAWA_SND_UNIT_ERROR_LOCKED", "4"), - ("(gint) HINAWA_SND_UNIT_ERROR_NOT_OPENED", "3"), - ("(gint) HINAWA_SND_UNIT_ERROR_OPENED", "2"), - ("(gint) HINAWA_SND_UNIT_ERROR_UNLOCKED", "5"), - ("(gint) HINAWA_SND_UNIT_ERROR_USED", "1"), - ("(gint) HINAWA_SND_UNIT_ERROR_WRONG_CLASS", "6"), - ("(gint) HINAWA_SND_UNIT_TYPE_BEBOB", "3"), - ("(gint) HINAWA_SND_UNIT_TYPE_DICE", "1"), - ("(gint) HINAWA_SND_UNIT_TYPE_DIGI00X", "5"), - ("(gint) HINAWA_SND_UNIT_TYPE_FIREFACE", "8"), - ("(gint) HINAWA_SND_UNIT_TYPE_FIREWORKS", "2"), - ("(gint) HINAWA_SND_UNIT_TYPE_MOTU", "7"), - ("(gint) HINAWA_SND_UNIT_TYPE_OXFW", "4"), - ("(gint) HINAWA_SND_UNIT_TYPE_TASCAM", "6"), ]; diff --git a/hinawa/sys/tests/constant.c b/hinawa/sys/tests/constant.c index fa2b2b1..2fd6d28 100644 --- a/hinawa/sys/tests/constant.c +++ b/hinawa/sys/tests/constant.c @@ -29,6 +29,7 @@ printf("\n"); int main() { + PRINT_CONSTANT((gint) HINAWA_FW_FCP_ERROR_ABORTED); PRINT_CONSTANT((gint) HINAWA_FW_FCP_ERROR_LARGE_RESP); PRINT_CONSTANT((gint) HINAWA_FW_FCP_ERROR_TIMEOUT); PRINT_CONSTANT((gint) HINAWA_FW_NODE_ERROR_DISCONNECTED); @@ -77,39 +78,5 @@ int main() { PRINT_CONSTANT((gint) HINAWA_FW_TCODE_WRITE_BLOCK_REQUEST); PRINT_CONSTANT((gint) HINAWA_FW_TCODE_WRITE_QUADLET_REQUEST); PRINT_CONSTANT((gint) HINAWA_FW_TCODE_WRITE_RESPONSE); - PRINT_CONSTANT((gint) HINAWA_SND_DICE_ERROR_TIMEOUT); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_CHANNEL); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_CLOCK); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_COMMAND); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_LED); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_MIRROR); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_PAN); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_PARAMETER); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_QUAD_COUNT); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_BAD_RATE); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_COMM_ERR); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_DSP_TIMEOUT); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_FLASH_BUSY); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_LARGE_RESP); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_OK); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_TIMEOUT); - PRINT_CONSTANT((gint) HINAWA_SND_EFW_STATUS_UNSUPPORTED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_DISCONNECTED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_FAILED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_LOCKED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_NOT_OPENED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_OPENED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_UNLOCKED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_USED); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_ERROR_WRONG_CLASS); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_BEBOB); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_DICE); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_DIGI00X); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_FIREFACE); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_FIREWORKS); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_MOTU); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_OXFW); - PRINT_CONSTANT((gint) HINAWA_SND_UNIT_TYPE_TASCAM); return 0; } diff --git a/hinawa/sys/tests/layout.c b/hinawa/sys/tests/layout.c index 6dbc21a..b5508c1 100644 --- a/hinawa/sys/tests/layout.c +++ b/hinawa/sys/tests/layout.c @@ -22,22 +22,5 @@ int main() { printf("%s;%zu;%zu\n", "HinawaFwRespClass", sizeof(HinawaFwRespClass), alignof(HinawaFwRespClass)); printf("%s;%zu;%zu\n", "HinawaFwRespError", sizeof(HinawaFwRespError), alignof(HinawaFwRespError)); printf("%s;%zu;%zu\n", "HinawaFwTcode", sizeof(HinawaFwTcode), alignof(HinawaFwTcode)); - printf("%s;%zu;%zu\n", "HinawaSndDg00x", sizeof(HinawaSndDg00x), alignof(HinawaSndDg00x)); - printf("%s;%zu;%zu\n", "HinawaSndDg00xClass", sizeof(HinawaSndDg00xClass), alignof(HinawaSndDg00xClass)); - printf("%s;%zu;%zu\n", "HinawaSndDice", sizeof(HinawaSndDice), alignof(HinawaSndDice)); - printf("%s;%zu;%zu\n", "HinawaSndDiceClass", sizeof(HinawaSndDiceClass), alignof(HinawaSndDiceClass)); - printf("%s;%zu;%zu\n", "HinawaSndDiceError", sizeof(HinawaSndDiceError), alignof(HinawaSndDiceError)); - printf("%s;%zu;%zu\n", "HinawaSndEfw", sizeof(HinawaSndEfw), alignof(HinawaSndEfw)); - printf("%s;%zu;%zu\n", "HinawaSndEfwClass", sizeof(HinawaSndEfwClass), alignof(HinawaSndEfwClass)); - printf("%s;%zu;%zu\n", "HinawaSndEfwStatus", sizeof(HinawaSndEfwStatus), alignof(HinawaSndEfwStatus)); - printf("%s;%zu;%zu\n", "HinawaSndMotu", sizeof(HinawaSndMotu), alignof(HinawaSndMotu)); - printf("%s;%zu;%zu\n", "HinawaSndMotuClass", sizeof(HinawaSndMotuClass), alignof(HinawaSndMotuClass)); - printf("%s;%zu;%zu\n", "HinawaSndMotuRegisterDspParameter", sizeof(HinawaSndMotuRegisterDspParameter), alignof(HinawaSndMotuRegisterDspParameter)); - printf("%s;%zu;%zu\n", "HinawaSndTscm", sizeof(HinawaSndTscm), alignof(HinawaSndTscm)); - printf("%s;%zu;%zu\n", "HinawaSndTscmClass", sizeof(HinawaSndTscmClass), alignof(HinawaSndTscmClass)); - printf("%s;%zu;%zu\n", "HinawaSndUnit", sizeof(HinawaSndUnit), alignof(HinawaSndUnit)); - printf("%s;%zu;%zu\n", "HinawaSndUnitClass", sizeof(HinawaSndUnitClass), alignof(HinawaSndUnitClass)); - printf("%s;%zu;%zu\n", "HinawaSndUnitError", sizeof(HinawaSndUnitError), alignof(HinawaSndUnitError)); - printf("%s;%zu;%zu\n", "HinawaSndUnitType", sizeof(HinawaSndUnitType), alignof(HinawaSndUnitType)); return 0; } |