Add DevicePath functions/utilities #10
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bgilbert
suggested changes
Jun 27, 2017
src/util/device_path.rs
Outdated
|
|
||
| for i in 0..filename_len as isize{ | ||
| unsafe { | ||
| *file_name_ptr.offset(i) = *filename.as_ptr().offset(i) as u16; |
There was a problem hiding this comment.
Should be setting file_name_ptr from filename_ptr, not filename.as_ptr().
Also maybe some better names?
src/protocol/device_path.rs
Outdated
| impl DevicePathFromTextProtocol { | ||
| pub fn text_to_device_path_node(&self, path: &str) -> Result<&DevicePathProtocol, Status> { | ||
| str_to_utf16_ptr(path) | ||
| .map(|utf16_str| unsafe { &*((self.text_to_device_path_node)(utf16_str)) }) |
src/protocol/device_path.rs
Outdated
|
|
||
| pub fn text_to_device_path(&self, path: &str) -> Result<&DevicePathProtocol, Status> { | ||
| str_to_utf16_ptr(path) | ||
| .map(|utf16_str| unsafe { &*((self.text_to_device_path)(utf16_str)) }) |
src/util/device_path.rs
Outdated
| .boot_services() | ||
| .locate_protocol::<DevicePathUtilitiesProtocol>(0 as *const CVoid) | ||
| .and_then(|utilities| { | ||
| utilities.create_device_node(4, 4, node_size_bytes as u16) |
There was a problem hiding this comment.
Yes, probably. Realistically the best thing to do is to flesh out all the DevicePath types and subtypes from the spec, I was just a little hesitant to do that since we're not using many of them.
|
Updated with requested changes. |
bgilbert
reviewed
Jun 27, 2017
src/util/device_path.rs
Outdated
|
|
||
| for i in 0..filename_len as isize{ | ||
| unsafe { | ||
| *node_filename_ptr.offset(i) = *filename_ptr.offset(i) as u16; |
|
|
||
| #[allow(non_camel_case_types)] | ||
| #[repr(u8)] | ||
| pub enum MessagingSubTypes { |
There was a problem hiding this comment.
Please either sort, or leave a comment explaining the sort order.
There was a problem hiding this comment.
Sorted by value, since the spec order doesn't seem to have any rhyme or reason.
bgilbert
reviewed
Jun 27, 2017
src/protocol/device_path.rs
Outdated
| IPv6 = 0xD, | ||
| UART = 0xE, | ||
| USBClass = 0xF, | ||
| // The EFI specification calls this type "1394", but that won't work as an enum variant for |
Add enums for all device path types as laid out in the UEFI spec. Also, add implementations of Into<u8> for each.
Instead of using *const u16s and Console.write_raw() in DevicePathToTextProtocol, use &str and write() instead.
Add a function to allocate and create a DevicePathProtocol struct containing a filename.
CVoid is needed for passing to some functions.
bgilbert
approved these changes
Jun 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Primary changes:
DevicePathUtilitiesfor manipulatingDevicePathProtocolstructsDevicePathFromTextfor parsing strings intoDevicePathProtocolstructscreate_file_device_nodefor creatingDevicePathProtocolstructs for files