Skip to content

Commit 8fba1ee

Browse files
Change DeviceSubType literals to the same numeric base as the spec
The UEFI Specification uses base 10 for almost all the sub types (the exception is base 16 for the two `END` node types). Change our enum to match, as that makes it much easier to see at a glance that the value is correct. There should be no change in the actual values from this commit, just makes the code easier to verify against the spec.
1 parent 93608b2 commit 8fba1ee

File tree

1 file changed

+50
-50
lines changed

1 file changed

+50
-50
lines changed

src/proto/device_path/mod.rs

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -446,109 +446,109 @@ pub struct DeviceSubType(pub u8);
446446

447447
impl DeviceSubType {
448448
/// PCI Device Path.
449-
pub const HARDWARE_PCI: DeviceSubType = DeviceSubType(0x01);
449+
pub const HARDWARE_PCI: DeviceSubType = DeviceSubType(1);
450450
/// PCCARD Device Path.
451-
pub const HARDWARE_PCCARD: DeviceSubType = DeviceSubType(0x02);
451+
pub const HARDWARE_PCCARD: DeviceSubType = DeviceSubType(2);
452452
/// Memory-mapped Device Path.
453-
pub const HARDWARE_MEMORY_MAPPED: DeviceSubType = DeviceSubType(0x03);
453+
pub const HARDWARE_MEMORY_MAPPED: DeviceSubType = DeviceSubType(3);
454454
/// Vendor-Defined Device Path.
455-
pub const HARDWARE_VENDOR: DeviceSubType = DeviceSubType(0x04);
455+
pub const HARDWARE_VENDOR: DeviceSubType = DeviceSubType(4);
456456
/// Controller Device Path.
457-
pub const HARDWARE_CONTROLLER: DeviceSubType = DeviceSubType(0x05);
457+
pub const HARDWARE_CONTROLLER: DeviceSubType = DeviceSubType(5);
458458
/// BMC Device Path.
459-
pub const HARDWARE_BMC: DeviceSubType = DeviceSubType(0x06);
459+
pub const HARDWARE_BMC: DeviceSubType = DeviceSubType(6);
460460

461461
/// ACPI Device Path.
462-
pub const ACPI: DeviceSubType = DeviceSubType(0x01);
462+
pub const ACPI: DeviceSubType = DeviceSubType(1);
463463
/// Expanded ACPI Device Path.
464-
pub const ACPI_EXPANDED: DeviceSubType = DeviceSubType(0x02);
464+
pub const ACPI_EXPANDED: DeviceSubType = DeviceSubType(2);
465465
/// ACPI _ADR Device Path.
466-
pub const ACPI_ADR: DeviceSubType = DeviceSubType(0x03);
466+
pub const ACPI_ADR: DeviceSubType = DeviceSubType(3);
467467
/// NVDIMM Device Path.
468-
pub const ACPI_NVDIMM: DeviceSubType = DeviceSubType(0x04);
468+
pub const ACPI_NVDIMM: DeviceSubType = DeviceSubType(4);
469469

470470
/// ATAPI Device Path.
471-
pub const MESSAGING_ATAPI: DeviceSubType = DeviceSubType(0x01);
471+
pub const MESSAGING_ATAPI: DeviceSubType = DeviceSubType(1);
472472
/// SCSI Device Path.
473-
pub const MESSAGING_SCSI: DeviceSubType = DeviceSubType(0x02);
473+
pub const MESSAGING_SCSI: DeviceSubType = DeviceSubType(2);
474474
/// Fibre Channel Device Path.
475-
pub const MESSAGING_FIBRE_CHANNEL: DeviceSubType = DeviceSubType(0x03);
475+
pub const MESSAGING_FIBRE_CHANNEL: DeviceSubType = DeviceSubType(3);
476476
/// 1394 Device Path.
477-
pub const MESSAGING_1394: DeviceSubType = DeviceSubType(0x04);
477+
pub const MESSAGING_1394: DeviceSubType = DeviceSubType(4);
478478
/// USB Device Path.
479-
pub const MESSAGING_USB: DeviceSubType = DeviceSubType(0x05);
479+
pub const MESSAGING_USB: DeviceSubType = DeviceSubType(5);
480480
/// I2O Device Path.
481-
pub const MESSAGING_I2O: DeviceSubType = DeviceSubType(0x06);
481+
pub const MESSAGING_I2O: DeviceSubType = DeviceSubType(6);
482482
/// Infiniband Device Path.
483-
pub const MESSAGING_INFINIBAND: DeviceSubType = DeviceSubType(0x09);
483+
pub const MESSAGING_INFINIBAND: DeviceSubType = DeviceSubType(9);
484484
/// Vendor-Defined Device Path.
485-
pub const MESSAGING_VENDOR: DeviceSubType = DeviceSubType(0x0a);
485+
pub const MESSAGING_VENDOR: DeviceSubType = DeviceSubType(10);
486486
/// MAC Address Device Path.
487-
pub const MESSAGING_MAC_ADDRESS: DeviceSubType = DeviceSubType(0x0b);
487+
pub const MESSAGING_MAC_ADDRESS: DeviceSubType = DeviceSubType(11);
488488
/// IPV4 Device Path.
489-
pub const MESSAGING_IPV4: DeviceSubType = DeviceSubType(0x0c);
489+
pub const MESSAGING_IPV4: DeviceSubType = DeviceSubType(12);
490490
/// IPV6 Device Path.
491-
pub const MESSAGING_IPV6: DeviceSubType = DeviceSubType(0x0d);
491+
pub const MESSAGING_IPV6: DeviceSubType = DeviceSubType(13);
492492
/// UART Device Path.
493-
pub const MESSAGING_UART: DeviceSubType = DeviceSubType(0x0e);
493+
pub const MESSAGING_UART: DeviceSubType = DeviceSubType(14);
494494
/// USB Class Device Path.
495-
pub const MESSAGING_USB_CLASS: DeviceSubType = DeviceSubType(0x0f);
495+
pub const MESSAGING_USB_CLASS: DeviceSubType = DeviceSubType(15);
496496
/// USB WWID Device Path.
497-
pub const MESSAGING_USB_WWID: DeviceSubType = DeviceSubType(0x10);
497+
pub const MESSAGING_USB_WWID: DeviceSubType = DeviceSubType(16);
498498
/// Device Logical Unit.
499-
pub const MESSAGING_DEVICE_LOGICAL_UNIT: DeviceSubType = DeviceSubType(0x11);
499+
pub const MESSAGING_DEVICE_LOGICAL_UNIT: DeviceSubType = DeviceSubType(17);
500500
/// SATA Device Path.
501-
pub const MESSAGING_SATA: DeviceSubType = DeviceSubType(0x12);
501+
pub const MESSAGING_SATA: DeviceSubType = DeviceSubType(18);
502502
/// iSCSI Device Path node (base information).
503-
pub const MESSAGING_ISCSI: DeviceSubType = DeviceSubType(0x13);
503+
pub const MESSAGING_ISCSI: DeviceSubType = DeviceSubType(19);
504504
/// VLAN Device Path node.
505-
pub const MESSAGING_VLAN: DeviceSubType = DeviceSubType(0x14);
505+
pub const MESSAGING_VLAN: DeviceSubType = DeviceSubType(20);
506506
/// Fibre Channel Ex Device Path.
507-
pub const MESSAGING_FIBRE_CHANNEL_EX: DeviceSubType = DeviceSubType(0x15);
507+
pub const MESSAGING_FIBRE_CHANNEL_EX: DeviceSubType = DeviceSubType(21);
508508
/// Serial Attached SCSI (SAS) Ex Device Path.
509-
pub const MESSAGING_SCSI_SAS_EX: DeviceSubType = DeviceSubType(0x16);
509+
pub const MESSAGING_SCSI_SAS_EX: DeviceSubType = DeviceSubType(22);
510510
/// NVM Express Namespace Device Path.
511-
pub const MESSAGING_NVME_NAMESPACE: DeviceSubType = DeviceSubType(0x17);
511+
pub const MESSAGING_NVME_NAMESPACE: DeviceSubType = DeviceSubType(23);
512512
/// Uniform Resource Identifiers (URI) Device Path.
513-
pub const MESSAGING_URI: DeviceSubType = DeviceSubType(0x18);
513+
pub const MESSAGING_URI: DeviceSubType = DeviceSubType(24);
514514
/// UFS Device Path.
515-
pub const MESSAGING_UFS: DeviceSubType = DeviceSubType(0x19);
515+
pub const MESSAGING_UFS: DeviceSubType = DeviceSubType(25);
516516
/// SD (Secure Digital) Device Path.
517-
pub const MESSAGING_SD: DeviceSubType = DeviceSubType(0x1a);
517+
pub const MESSAGING_SD: DeviceSubType = DeviceSubType(26);
518518
/// Bluetooth Device Path.
519-
pub const MESSAGING_BLUETOOTH: DeviceSubType = DeviceSubType(0x1b);
519+
pub const MESSAGING_BLUETOOTH: DeviceSubType = DeviceSubType(27);
520520
/// Wi-Fi Device Path.
521-
pub const MESSAGING_WIFI: DeviceSubType = DeviceSubType(0x1c);
521+
pub const MESSAGING_WIFI: DeviceSubType = DeviceSubType(28);
522522
/// eMMC (Embedded Multi-Media Card) Device Path.
523-
pub const MESSAGING_EMMC: DeviceSubType = DeviceSubType(0x1d);
523+
pub const MESSAGING_EMMC: DeviceSubType = DeviceSubType(29);
524524
/// BluetoothLE Device Path.
525-
pub const MESSAGING_BLUETOOTH_LE: DeviceSubType = DeviceSubType(0x1e);
525+
pub const MESSAGING_BLUETOOTH_LE: DeviceSubType = DeviceSubType(30);
526526
/// DNS Device Path.
527-
pub const MESSAGING_DNS: DeviceSubType = DeviceSubType(0x1f);
527+
pub const MESSAGING_DNS: DeviceSubType = DeviceSubType(31);
528528
/// NVDIMM Namespace Device Path.
529-
pub const MESSAGING_NVDIMM_NAMESPACE: DeviceSubType = DeviceSubType(0x20);
529+
pub const MESSAGING_NVDIMM_NAMESPACE: DeviceSubType = DeviceSubType(32);
530530

531531
/// Hard Drive Media Device Path.
532-
pub const MEDIA_HARD_DRIVE: DeviceSubType = DeviceSubType(0x01);
532+
pub const MEDIA_HARD_DRIVE: DeviceSubType = DeviceSubType(1);
533533
/// CD-ROM Media Device Path.
534-
pub const MEDIA_CD_ROM: DeviceSubType = DeviceSubType(0x02);
534+
pub const MEDIA_CD_ROM: DeviceSubType = DeviceSubType(2);
535535
/// Vendor-Defined Media Device Path.
536-
pub const MEDIA_VENDOR: DeviceSubType = DeviceSubType(0x03);
536+
pub const MEDIA_VENDOR: DeviceSubType = DeviceSubType(3);
537537
/// File Path Media Device Path.
538-
pub const MEDIA_FILE_PATH: DeviceSubType = DeviceSubType(0x04);
538+
pub const MEDIA_FILE_PATH: DeviceSubType = DeviceSubType(4);
539539
/// Media Protocol Device Path.
540-
pub const MEDIA_PROTOCOL: DeviceSubType = DeviceSubType(0x05);
540+
pub const MEDIA_PROTOCOL: DeviceSubType = DeviceSubType(5);
541541
/// PIWG Firmware File.
542-
pub const MEDIA_PIWG_FIRMWARE_FILE: DeviceSubType = DeviceSubType(0x06);
542+
pub const MEDIA_PIWG_FIRMWARE_FILE: DeviceSubType = DeviceSubType(6);
543543
/// PIWG Firmware Volume.
544-
pub const MEDIA_PIWG_FIRMWARE_VOLUME: DeviceSubType = DeviceSubType(0x07);
544+
pub const MEDIA_PIWG_FIRMWARE_VOLUME: DeviceSubType = DeviceSubType(7);
545545
/// Relative Offset Range.
546-
pub const MEDIA_RELATIVE_OFFSET_RANGE: DeviceSubType = DeviceSubType(0x08);
546+
pub const MEDIA_RELATIVE_OFFSET_RANGE: DeviceSubType = DeviceSubType(8);
547547
/// RAM Disk Device Path.
548-
pub const MEDIA_RAM_DISK: DeviceSubType = DeviceSubType(0x09);
548+
pub const MEDIA_RAM_DISK: DeviceSubType = DeviceSubType(9);
549549

550550
/// BIOS Boot Specification Device Path.
551-
pub const BIOS_BOOT_SPECIFICATION: DeviceSubType = DeviceSubType(0x01);
551+
pub const BIOS_BOOT_SPECIFICATION: DeviceSubType = DeviceSubType(1);
552552

553553
/// End this instance of a Device Path and start a new one.
554554
pub const END_INSTANCE: DeviceSubType = DeviceSubType(0x01);

0 commit comments

Comments
 (0)