diff options
| author | Corey Richardson <corey@octayn.net> | 2015-07-05 23:46:33 -0400 |
|---|---|---|
| committer | Paul Osborne <Paul.Osborne@digi.com> | 2015-08-12 19:29:21 -0500 |
| commit | a9221b0fe735a52443fd4d41370d161ab7da2291 (patch) | |
| tree | 6742748865c27c5d3f42e4ce8e3d107e9a3b98a7 /src/sys | |
| parent | 3f3845896e2508611a3d9df5df4e64432cf7f68f (diff) | |
| download | nix-a9221b0fe735a52443fd4d41370d161ab7da2291.zip | |
Merge mips into powerpc; rename Union_Unnamed16 to ff_effect_data
Diffstat (limited to 'src/sys')
| -rw-r--r-- | src/sys/ioctl/platform/linux.rs | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/sys/ioctl/platform/linux.rs b/src/sys/ioctl/platform/linux.rs index 55d1755a..b0bbe294 100644 --- a/src/sys/ioctl/platform/linux.rs +++ b/src/sys/ioctl/platform/linux.rs @@ -3,20 +3,7 @@ pub const NRBITS: u32 = 8; #[doc(hidden)] pub const TYPEBITS: u32 = 8; -#[cfg(target_arch = "mips")] -mod consts { - #[doc(hidden)] - pub const NONE: u8 = 1; - #[doc(hidden)] - pub const READ: u8 = 2; - #[doc(hidden)] - pub const WRITE: u8 = 4; - #[doc(hidden)] - pub const SIZEBITS: u8 = 13; - #[doc(hidden)] - pub const DIRBITS: u8 = 3; -} -#[cfg(target_arch = "powerpc")] +#[cfg(any(target_arch = "mips", target_arch = "powerpc"))] mod consts { #[doc(hidden)] pub const NONE: u8 = 1; @@ -241,12 +228,12 @@ pub struct ff_effect { pub direction: u16, pub trigger: ff_trigger, pub replay: ff_replay, - pub u: Union_Unnamed16, + pub u: ff_effect_data, } #[repr(C)] #[derive(Copy, Clone)] -pub struct Union_Unnamed16 { +pub struct ff_effect_data { pub _bindgen_data_: [u64; 4usize], } impl Union_Unnamed16 { @@ -272,7 +259,7 @@ impl Union_Unnamed16 { ::std::mem::transmute(raw.offset(0)) } } -impl ::std::default::Default for Union_Unnamed16 { +impl ::std::default::Default for ff_effect_data { fn default() -> Self { unsafe { ::std::mem::zeroed() } } } |