diff options
| author | Michael Brown | 2011-04-08 00:01:05 +0200 |
|---|---|---|
| committer | Michael Brown | 2011-04-08 00:15:06 +0200 |
| commit | 870524a3b26de3b22bef680a783c2356c88f6433 (patch) | |
| tree | a3345565b250160d55d5856bb04115041e63fd5d /src/interface/efi/efi_snp.c | |
| parent | [device] Make driver name a generic device property (diff) | |
| download | ipxe-870524a3b26de3b22bef680a783c2356c88f6433.tar.gz ipxe-870524a3b26de3b22bef680a783c2356c88f6433.tar.xz ipxe-870524a3b26de3b22bef680a783c2356c88f6433.zip | |
[efi] Add EFI string formatting functions
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/interface/efi/efi_snp.c')
| -rw-r--r-- | src/interface/efi/efi_snp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index cc09d7dbc..608aaf50b 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -30,6 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/efi/efi.h> #include <ipxe/efi/efi_pci.h> #include <ipxe/efi/efi_driver.h> +#include <ipxe/efi/efi_strings.h> #include <ipxe/efi/Protocol/SimpleNetwork.h> #include <ipxe/efi/Protocol/NetworkInterfaceIdentifier.h> #include <ipxe/efi/Protocol/DevicePath.h> @@ -772,7 +773,6 @@ static int efi_snp_probe ( struct net_device *netdev ) { EFI_DEVICE_PATH_PROTOCOL *path_end; MAC_ADDR_DEVICE_PATH *macpath; size_t path_prefix_len = 0; - unsigned int i; EFI_STATUS efirc; int rc; @@ -831,12 +831,9 @@ static int efi_snp_probe ( struct net_device *netdev ) { sizeof ( snpdev->nii.StringId ) ); /* Populate the device name */ - for ( i = 0 ; i < sizeof ( netdev->name ) ; i++ ) { - /* Damn Unicode names */ - assert ( i < ( sizeof ( snpdev->name ) / - sizeof ( snpdev->name[0] ) ) ); - snpdev->name[i] = netdev->name[i]; - } + efi_snprintf ( snpdev->name, ( sizeof ( snpdev->name ) / + sizeof ( snpdev->name[0] ) ), + "%s", netdev->name ); /* Populate the device path */ memcpy ( &snpdev->path, efipci->path, path_prefix_len ); |