Skip to content

Commit a9221b0

Browse files
emberianPaul Osborne
authored andcommitted
Merge mips into powerpc; rename Union_Unnamed16 to ff_effect_data
1 parent 3f38458 commit a9221b0

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

src/sys/ioctl/platform/linux.rs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,7 @@ pub const NRBITS: u32 = 8;
33
#[doc(hidden)]
44
pub const TYPEBITS: u32 = 8;
55

6-
#[cfg(target_arch = "mips")]
7-
mod consts {
8-
#[doc(hidden)]
9-
pub const NONE: u8 = 1;
10-
#[doc(hidden)]
11-
pub const READ: u8 = 2;
12-
#[doc(hidden)]
13-
pub const WRITE: u8 = 4;
14-
#[doc(hidden)]
15-
pub const SIZEBITS: u8 = 13;
16-
#[doc(hidden)]
17-
pub const DIRBITS: u8 = 3;
18-
}
19-
#[cfg(target_arch = "powerpc")]
6+
#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
207
mod consts {
218
#[doc(hidden)]
229
pub const NONE: u8 = 1;
@@ -241,12 +228,12 @@ pub struct ff_effect {
241228
pub direction: u16,
242229
pub trigger: ff_trigger,
243230
pub replay: ff_replay,
244-
pub u: Union_Unnamed16,
231+
pub u: ff_effect_data,
245232
}
246233

247234
#[repr(C)]
248235
#[derive(Copy, Clone)]
249-
pub struct Union_Unnamed16 {
236+
pub struct ff_effect_data {
250237
pub _bindgen_data_: [u64; 4usize],
251238
}
252239
impl Union_Unnamed16 {
@@ -272,7 +259,7 @@ impl Union_Unnamed16 {
272259
::std::mem::transmute(raw.offset(0))
273260
}
274261
}
275-
impl ::std::default::Default for Union_Unnamed16 {
262+
impl ::std::default::Default for ff_effect_data {
276263
fn default() -> Self { unsafe { ::std::mem::zeroed() } }
277264
}
278265

0 commit comments

Comments
 (0)