diff options
| author | Michael Brown | 2020-10-16 16:07:14 +0200 |
|---|---|---|
| committer | Michael Brown | 2020-10-16 16:38:18 +0200 |
| commit | 87e39a9c9345e177c46f74dc1e3d6d94136315be (patch) | |
| tree | 79fc7328f739355631237fe0647d076ce7602135 /src/include/ipxe/efi | |
| parent | [efi] Define an interface operation to describe using an EFI device path (diff) | |
| download | ipxe-87e39a9c9345e177c46f74dc1e3d6d94136315be.tar.gz ipxe-87e39a9c9345e177c46f74dc1e3d6d94136315be.tar.xz ipxe-87e39a9c9345e177c46f74dc1e3d6d94136315be.zip | |
[efi] Split efi_usb_path() out to a separate function
Provide efi_usb_path() as a standalone function, to allow for reuse by
the USB mass storage driver.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe/efi')
| -rw-r--r-- | src/include/ipxe/efi/efi_path.h | 3 | ||||
| -rw-r--r-- | src/include/ipxe/efi/efi_usb.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/include/ipxe/efi/efi_path.h b/src/include/ipxe/efi/efi_path.h index 0d5b902e5..c1d53e764 100644 --- a/src/include/ipxe/efi/efi_path.h +++ b/src/include/ipxe/efi/efi_path.h @@ -13,9 +13,12 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/efi/efi.h> #include <ipxe/efi/Protocol/DevicePath.h> +struct usb_function; + extern EFI_DEVICE_PATH_PROTOCOL * efi_path_end ( EFI_DEVICE_PATH_PROTOCOL *path ); extern size_t efi_path_len ( EFI_DEVICE_PATH_PROTOCOL *path ); +extern EFI_DEVICE_PATH_PROTOCOL * efi_usb_path ( struct usb_function *func ); extern EFI_DEVICE_PATH_PROTOCOL * efi_describe ( struct interface *interface ); #define efi_describe_TYPE( object_type ) \ diff --git a/src/include/ipxe/efi/efi_usb.h b/src/include/ipxe/efi/efi_usb.h index 41d9cc665..06baff529 100644 --- a/src/include/ipxe/efi/efi_usb.h +++ b/src/include/ipxe/efi/efi_usb.h @@ -17,10 +17,8 @@ struct efi_usb_device { /** Name */ const char *name; - /** The underlying USB device */ - struct usb_device *usb; - /** The underlying EFI device */ - struct efi_device *efidev; + /** The underlying USB function */ + struct usb_function *func; /** Configuration descriptor */ struct usb_configuration_descriptor *config; /** Supported languages */ |