Commit 420b219

authored

Merge pull request #822 from nicholasbishop/bishop-fix-tuple

uefi: Fix use of tuples in pointer structs

2 parents d9cca99 + fe9576a commit 420b219Copy full SHA for 420b219

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	- Renamed `FileSystemIOErrorContext` to `IoErrorContext`.
`8`	`8`	- `ResetType` is now a newtype-enum instead of a Rust enum. Its members now have
`9`	`9`	`upper-case names.`
	`10`	+- `PointerMode` and `PointerState` now contain arrays rather than tuples, as
	`11`	`+ tuples are not FFI safe.`
`10`	`12`
`11`	`13`	`## uefi-macros - [Unreleased]`
`12`	`14`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ impl Pointer {`
`64`	`64`	`pub struct PointerMode {`
`65`	`65`	`/// The pointer device's resolution on the X/Y/Z axis in counts/mm.`
`66`	`66`	`/// If a value is 0, then the device does _not_ support that axis.`
`67`		`- pub resolution: (u64,u64,u64),`
	`67`	`+ pub resolution: [u64;3],`
`68`	`68`	`/// Whether the devices has a left button / right button.`
`69`		`- pub has_button: (bool,bool),`
	`69`	`+ pub has_button: [bool;2],`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/// The relative change in the pointer's state.`
`@@ -76,9 +76,9 @@ pub struct PointerState {`
`76`	`76`	`/// The relative movement on the X/Y/Z axis.`
`77`	`77`	`///`
`78`	`78`	/// If `PointerMode` indicates an axis is not supported, it must be ignored.
`79`		`- pub relative_movement: (i32,i32,i32),`
	`79`	`+ pub relative_movement: [i32;3],`
`80`	`80`	`/// Whether the left / right mouse button is currently pressed.`
`81`	`81`	`///`
`82`	`82`	/// If `PointerMode` indicates a button is not supported, it must be ignored.
`83`		`- pub button: (bool,bool),`
	`83`	`+ pub button: [bool;2],`
`84`	`84`	`}`

Comments

(0)