authorgravatar for ybham6@gmail.comfifty-six <ybham6@gmail.com> 2022-01-13 05:21:42-05:00
committergravatar for ybham6@gmail.comfifty-six <ybham6@gmail.com> 2022-01-13 15:47:13-05:00
logea2df2601e81aa9e490459ad9c65b03de2be61d0
treebb433ae504d0229f92e02db61e23405798b6940c
parent9bf2bda68356212168a213141e0a21d9dab22655

std/os/uefi: Use `usingnamespace` to re-export symbols

`uefi/protocols.zig` and `uefi/tables.zig` just re-exported all the public symbols, which is basically the purpose of `usingnamespace` import-wise.

2 files changed, 48 insertions(+), 113 deletions(-)

lib/std/os/uefi/protocols.zig+43-99
......@@ -1,100 +1,44 @@
1pub const LoadedImageProtocol = @import("protocols/loaded_image_protocol.zig").LoadedImageProtocol;
2pub const loaded_image_device_path_protocol_guid = @import("protocols/loaded_image_protocol.zig").loaded_image_device_path_protocol_guid;
3
4pub const AcpiDevicePath = @import("protocols/device_path_protocol.zig").AcpiDevicePath;
5pub const BiosBootSpecificationDevicePath = @import("protocols/device_path_protocol.zig").BiosBootSpecificationDevicePath;
6pub const DevicePath = @import("protocols/device_path_protocol.zig").DevicePath;
7pub const DevicePathProtocol = @import("protocols/device_path_protocol.zig").DevicePathProtocol;
8pub const DevicePathType = @import("protocols/device_path_protocol.zig").DevicePathType;
9pub const EndDevicePath = @import("protocols/device_path_protocol.zig").EndDevicePath;
10pub const HardwareDevicePath = @import("protocols/device_path_protocol.zig").HardwareDevicePath;
11pub const MediaDevicePath = @import("protocols/device_path_protocol.zig").MediaDevicePath;
12pub const MessagingDevicePath = @import("protocols/device_path_protocol.zig").MessagingDevicePath;
13
14pub const SimpleFileSystemProtocol = @import("protocols/simple_file_system_protocol.zig").SimpleFileSystemProtocol;
15pub const FileProtocol = @import("protocols/file_protocol.zig").FileProtocol;
16pub const FileInfo = @import("protocols/file_protocol.zig").FileInfo;
17pub const FileSystemInfo = @import("protocols/file_protocol.zig").FileSystemInfo;
18
19pub const InputKey = @import("protocols/simple_text_input_ex_protocol.zig").InputKey;
20pub const KeyData = @import("protocols/simple_text_input_ex_protocol.zig").KeyData;
21pub const KeyState = @import("protocols/simple_text_input_ex_protocol.zig").KeyState;
22pub const SimpleTextInputProtocol = @import("protocols/simple_text_input_protocol.zig").SimpleTextInputProtocol;
23pub const SimpleTextInputExProtocol = @import("protocols/simple_text_input_ex_protocol.zig").SimpleTextInputExProtocol;
24
25pub const SimpleTextOutputMode = @import("protocols/simple_text_output_protocol.zig").SimpleTextOutputMode;
26pub const SimpleTextOutputProtocol = @import("protocols/simple_text_output_protocol.zig").SimpleTextOutputProtocol;
27
28pub const SimplePointerMode = @import("protocols/simple_pointer_protocol.zig").SimplePointerMode;
29pub const SimplePointerProtocol = @import("protocols/simple_pointer_protocol.zig").SimplePointerProtocol;
30pub const SimplePointerState = @import("protocols/simple_pointer_protocol.zig").SimplePointerState;
31
32pub const AbsolutePointerMode = @import("protocols/absolute_pointer_protocol.zig").AbsolutePointerMode;
33pub const AbsolutePointerProtocol = @import("protocols/absolute_pointer_protocol.zig").AbsolutePointerProtocol;
34pub const AbsolutePointerState = @import("protocols/absolute_pointer_protocol.zig").AbsolutePointerState;
35
36pub const GraphicsOutputBltPixel = @import("protocols/graphics_output_protocol.zig").GraphicsOutputBltPixel;
37pub const GraphicsOutputBltOperation = @import("protocols/graphics_output_protocol.zig").GraphicsOutputBltOperation;
38pub const GraphicsOutputModeInformation = @import("protocols/graphics_output_protocol.zig").GraphicsOutputModeInformation;
39pub const GraphicsOutputProtocol = @import("protocols/graphics_output_protocol.zig").GraphicsOutputProtocol;
40pub const GraphicsOutputProtocolMode = @import("protocols/graphics_output_protocol.zig").GraphicsOutputProtocolMode;
41pub const GraphicsPixelFormat = @import("protocols/graphics_output_protocol.zig").GraphicsPixelFormat;
42pub const PixelBitmask = @import("protocols/graphics_output_protocol.zig").PixelBitmask;
43
44pub const EdidDiscoveredProtocol = @import("protocols/edid_discovered_protocol.zig").EdidDiscoveredProtocol;
45
46pub const EdidActiveProtocol = @import("protocols/edid_active_protocol.zig").EdidActiveProtocol;
47
48pub const EdidOverrideProtocol = @import("protocols/edid_override_protocol.zig").EdidOverrideProtocol;
49pub const EdidOverrideProtocolAttributes = @import("protocols/edid_override_protocol.zig").EdidOverrideProtocolAttributes;
50
51pub const SimpleNetworkProtocol = @import("protocols/simple_network_protocol.zig").SimpleNetworkProtocol;
52pub const MacAddress = @import("protocols/simple_network_protocol.zig").MacAddress;
53pub const SimpleNetworkMode = @import("protocols/simple_network_protocol.zig").SimpleNetworkMode;
54pub const SimpleNetworkReceiveFilter = @import("protocols/simple_network_protocol.zig").SimpleNetworkReceiveFilter;
55pub const SimpleNetworkState = @import("protocols/simple_network_protocol.zig").SimpleNetworkState;
56pub const NetworkStatistics = @import("protocols/simple_network_protocol.zig").NetworkStatistics;
57pub const SimpleNetworkInterruptStatus = @import("protocols/simple_network_protocol.zig").SimpleNetworkInterruptStatus;
58
59pub const ManagedNetworkServiceBindingProtocol = @import("protocols/managed_network_service_binding_protocol.zig").ManagedNetworkServiceBindingProtocol;
60pub const ManagedNetworkProtocol = @import("protocols/managed_network_protocol.zig").ManagedNetworkProtocol;
61pub const ManagedNetworkConfigData = @import("protocols/managed_network_protocol.zig").ManagedNetworkConfigData;
62pub const ManagedNetworkCompletionToken = @import("protocols/managed_network_protocol.zig").ManagedNetworkCompletionToken;
63pub const ManagedNetworkReceiveData = @import("protocols/managed_network_protocol.zig").ManagedNetworkReceiveData;
64pub const ManagedNetworkTransmitData = @import("protocols/managed_network_protocol.zig").ManagedNetworkTransmitData;
65pub const ManagedNetworkFragmentData = @import("protocols/managed_network_protocol.zig").ManagedNetworkFragmentData;
66
67pub const Ip6ServiceBindingProtocol = @import("protocols/ip6_service_binding_protocol.zig").Ip6ServiceBindingProtocol;
68pub const Ip6Protocol = @import("protocols/ip6_protocol.zig").Ip6Protocol;
69pub const Ip6ModeData = @import("protocols/ip6_protocol.zig").Ip6ModeData;
70pub const Ip6ConfigData = @import("protocols/ip6_protocol.zig").Ip6ConfigData;
71pub const Ip6Address = @import("protocols/ip6_protocol.zig").Ip6Address;
72pub const Ip6AddressInfo = @import("protocols/ip6_protocol.zig").Ip6AddressInfo;
73pub const Ip6RouteTable = @import("protocols/ip6_protocol.zig").Ip6RouteTable;
74pub const Ip6NeighborState = @import("protocols/ip6_protocol.zig").Ip6NeighborState;
75pub const Ip6NeighborCache = @import("protocols/ip6_protocol.zig").Ip6NeighborCache;
76pub const Ip6IcmpType = @import("protocols/ip6_protocol.zig").Ip6IcmpType;
77pub const Ip6CompletionToken = @import("protocols/ip6_protocol.zig").Ip6CompletionToken;
78
79pub const Ip6ConfigProtocol = @import("protocols/ip6_config_protocol.zig").Ip6ConfigProtocol;
80pub const Ip6ConfigDataType = @import("protocols/ip6_config_protocol.zig").Ip6ConfigDataType;
81
82pub const Udp6ServiceBindingProtocol = @import("protocols/udp6_service_binding_protocol.zig").Udp6ServiceBindingProtocol;
83pub const Udp6Protocol = @import("protocols/udp6_protocol.zig").Udp6Protocol;
84pub const Udp6ConfigData = @import("protocols/udp6_protocol.zig").Udp6ConfigData;
85pub const Udp6CompletionToken = @import("protocols/udp6_protocol.zig").Udp6CompletionToken;
86pub const Udp6ReceiveData = @import("protocols/udp6_protocol.zig").Udp6ReceiveData;
87pub const Udp6TransmitData = @import("protocols/udp6_protocol.zig").Udp6TransmitData;
88pub const Udp6SessionData = @import("protocols/udp6_protocol.zig").Udp6SessionData;
89pub const Udp6FragmentData = @import("protocols/udp6_protocol.zig").Udp6FragmentData;
90
1// Misc
2pub usingnamespace @import("protocols/loaded_image_protocol.zig");
3pub usingnamespace @import("protocols/device_path_protocol.zig");
4pub usingnamespace @import("protocols/rng_protocol.zig");
5pub usingnamespace @import("protocols/shell_parameters_protocol.zig");
6
7// Files
8pub usingnamespace @import("protocols/simple_file_system_protocol.zig");
9pub usingnamespace @import("protocols/file_protocol.zig");
10
11// Text
12pub usingnamespace @import("protocols/simple_text_input_protocol.zig");
13pub usingnamespace @import("protocols/simple_text_input_ex_protocol.zig");
14pub usingnamespace @import("protocols/simple_text_output_protocol.zig");
15
16// Pointer
17pub usingnamespace @import("protocols/simple_pointer_protocol.zig");
18pub usingnamespace @import("protocols/absolute_pointer_protocol.zig");
19
20pub usingnamespace @import("protocols/graphics_output_protocol.zig");
21
22// edid
23pub usingnamespace @import("protocols/edid_discovered_protocol.zig");
24pub usingnamespace @import("protocols/edid_active_protocol.zig");
25pub usingnamespace @import("protocols/edid_override_protocol.zig");
26
27// Network
28pub usingnamespace @import("protocols/simple_network_protocol.zig");
29pub usingnamespace @import("protocols/managed_network_service_binding_protocol.zig");
30pub usingnamespace @import("protocols/managed_network_protocol.zig");
31
32// ip6
33pub usingnamespace @import("protocols/ip6_service_binding_protocol.zig");
34pub usingnamespace @import("protocols/ip6_protocol.zig");
35pub usingnamespace @import("protocols/ip6_config_protocol.zig");
36
37// udp6
38pub usingnamespace @import("protocols/udp6_service_binding_protocol.zig");
39pub usingnamespace @import("protocols/udp6_protocol.zig");
40
41// hii
9142pub const hii = @import("protocols/hii.zig");
92pub const HIIDatabaseProtocol = @import("protocols/hii_database_protocol.zig").HIIDatabaseProtocol;
93pub const HIIPopupProtocol = @import("protocols/hii_popup_protocol.zig").HIIPopupProtocol;
94pub const HIIPopupStyle = @import("protocols/hii_popup_protocol.zig").HIIPopupStyle;
95pub const HIIPopupType = @import("protocols/hii_popup_protocol.zig").HIIPopupType;
96pub const HIIPopupSelection = @import("protocols/hii_popup_protocol.zig").HIIPopupSelection;
97
98pub const RNGProtocol = @import("protocols/rng_protocol.zig").RNGProtocol;
99
100pub const ShellParametersProtocol = @import("protocols/shell_parameters_protocol.zig").ShellParametersProtocol;
43pub usingnamespace @import("protocols/hii_database_protocol.zig");
44pub usingnamespace @import("protocols/hii_popup_protocol.zig");
lib/std/os/uefi/tables.zig+5-14
......@@ -1,14 +1,5 @@
1pub const AllocateType = @import("tables/boot_services.zig").AllocateType;
2pub const BootServices = @import("tables/boot_services.zig").BootServices;
3pub const ConfigurationTable = @import("tables/configuration_table.zig").ConfigurationTable;
4pub const global_variable align(8) = @import("tables/runtime_services.zig").global_variable;
5pub const LocateSearchType = @import("tables/boot_services.zig").LocateSearchType;
6pub const MemoryDescriptor = @import("tables/boot_services.zig").MemoryDescriptor;
7pub const MemoryType = @import("tables/boot_services.zig").MemoryType;
8pub const OpenProtocolAttributes = @import("tables/boot_services.zig").OpenProtocolAttributes;
9pub const ProtocolInformationEntry = @import("tables/boot_services.zig").ProtocolInformationEntry;
10pub const ResetType = @import("tables/runtime_services.zig").ResetType;
11pub const RuntimeServices = @import("tables/runtime_services.zig").RuntimeServices;
12pub const SystemTable = @import("tables/system_table.zig").SystemTable;
13pub const TableHeader = @import("tables/table_header.zig").TableHeader;
14pub const TimerDelay = @import("tables/boot_services.zig").TimerDelay;
1pub usingnamespace @import("tables/boot_services.zig");
2pub usingnamespace @import("tables/runtime_services.zig");
3pub usingnamespace @import("tables/configuration_table.zig");
4pub usingnamespace @import("tables/system_table.zig");
5pub usingnamespace @import("tables/table_header.zig");