浏览代码

[efi] Provide a meaningful EFI SNP device name

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 11 年前
父节点
当前提交
f2c116ff7d
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1
    1
      src/include/ipxe/efi/efi_snp.h
  2. 2
    1
      src/interface/efi/efi_snp.c

+ 1
- 1
src/include/ipxe/efi/efi_snp.h 查看文件

65
 	/** Driver name */
65
 	/** Driver name */
66
 	wchar_t driver_name[16];
66
 	wchar_t driver_name[16];
67
 	/** Controller name */
67
 	/** Controller name */
68
-	wchar_t controller_name[32];
68
+	wchar_t controller_name[64];
69
 	/** The device path
69
 	/** The device path
70
 	 *
70
 	 *
71
 	 * This field is variable in size and must appear at the end
71
 	 * This field is variable in size and must appear at the end

+ 2
- 1
src/interface/efi/efi_snp.c 查看文件

992
 	efi_snprintf ( snpdev->controller_name,
992
 	efi_snprintf ( snpdev->controller_name,
993
 		       ( sizeof ( snpdev->controller_name ) /
993
 		       ( sizeof ( snpdev->controller_name ) /
994
 			 sizeof ( snpdev->controller_name[0] ) ),
994
 			 sizeof ( snpdev->controller_name[0] ) ),
995
-		       "%s %s (%s)", product_short_name, netdev->name,
995
+		       "%s %s (%s, %s)", product_short_name,
996
+		       netdev->dev->driver_name, netdev->dev->name,
996
 		       netdev_addr ( netdev ) );
997
 		       netdev_addr ( netdev ) );
997
 	snpdev->name2.GetDriverName = efi_snp_get_driver_name;
998
 	snpdev->name2.GetDriverName = efi_snp_get_driver_name;
998
 	snpdev->name2.GetControllerName = efi_snp_get_controller_name;
999
 	snpdev->name2.GetControllerName = efi_snp_get_controller_name;

正在加载...
取消
保存