diff options
| author | Michael Brown | 2020-10-16 16:11:16 +0200 |
|---|---|---|
| committer | Michael Brown | 2020-10-16 16:38:20 +0200 |
| commit | 1e8648f6113691366729bbffc3412bcf3a27ece2 (patch) | |
| tree | 38a470169c9325c890b7e01040c2cfdbc1ba2953 /src/drivers | |
| parent | [efi] Split efi_usb_path() out to a separate function (diff) | |
| download | ipxe-1e8648f6113691366729bbffc3412bcf3a27ece2.tar.gz ipxe-1e8648f6113691366729bbffc3412bcf3a27ece2.tar.xz ipxe-1e8648f6113691366729bbffc3412bcf3a27ece2.zip | |
[usbblk] Allow USB block device to be described using an EFI device path
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/usb/usbblk.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/drivers/usb/usbblk.c b/src/drivers/usb/usbblk.c index a68e3ced5..5a086d3f8 100644 --- a/src/drivers/usb/usbblk.c +++ b/src/drivers/usb/usbblk.c @@ -31,6 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <ipxe/xfer.h> #include <ipxe/uri.h> #include <ipxe/open.h> +#include <ipxe/efi/efi_path.h> #include "usbblk.h" /** @file @@ -702,11 +703,25 @@ static void usbblk_scsi_close ( struct usbblk_device *usbblk, int rc ) { usbblk->opened = 0; } +/** + * Describe as an EFI device path + * + * @v usbblk USB block device + * @ret path EFI device path, or NULL on error + */ +static EFI_DEVICE_PATH_PROTOCOL * +usbblk_efi_describe ( struct usbblk_device *usbblk ) { + + return efi_usb_path ( usbblk->func ); +} + /** SCSI command interface operations */ static struct interface_operation usbblk_scsi_operations[] = { INTF_OP ( scsi_command, struct usbblk_device *, usbblk_scsi_command ), INTF_OP ( xfer_window, struct usbblk_device *, usbblk_scsi_window ), INTF_OP ( intf_close, struct usbblk_device *, usbblk_scsi_close ), + EFI_INTF_OP ( efi_describe, struct usbblk_device *, + usbblk_efi_describe ), }; /** SCSI command interface descriptor */ |