From fe613fa9a39825172ccdd423a447eb4a0af0a0e5 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 31 May 2024 17:24:20 +0200 Subject: [PATCH] Rename src/drivers to src/driver Issue genodelabs/genode#4420 --- repos/base-linux/recipes/api/base-linux/hash | 2 +- repos/base-linux/recipes/src/base-linux/hash | 2 +- repos/base-nova/recipes/src/base-nova/hash | 2 +- repos/dde_bsd/recipes/src/bsd_audio/content.mk | 2 +- repos/dde_bsd/run/audio_in.run | 4 ++-- repos/dde_bsd/run/audio_out.run | 4 ++-- .../src/{drivers => driver}/audio/main.cc | 0 .../src/{drivers => driver}/audio/pci/target.mk | 2 +- .../dde_ipxe/src/{drivers => driver}/nic/main.cc | 0 .../src/{drivers => driver}/nic/target.mk | 0 repos/dde_linux/README | 8 ++++---- repos/dde_linux/recipes/src/usb_hid/content.mk | 2 +- repos/dde_linux/recipes/src/usb_hid/hash | 2 +- repos/dde_linux/recipes/src/usb_net/content.mk | 2 +- repos/dde_linux/recipes/src/vfs_lxip/hash | 2 +- .../src/{drivers => driver}/usb_hid/README | 0 .../src/{drivers => driver}/usb_hid/dep.list | 0 .../src/{drivers => driver}/usb_hid/dummies.c | 0 .../src/{drivers => driver}/usb_hid/led_state.h | 0 .../src/{drivers => driver}/usb_hid/lx_emul.c | 0 .../src/{drivers => driver}/usb_hid/lx_emul.h | 0 .../src/{drivers => driver}/usb_hid/lx_user.c | 0 .../src/{drivers => driver}/usb_hid/main.cc | 0 .../usb_hid/spec/arm_v6/generated_dummies.c | 0 .../usb_hid/spec/arm_v6/source.list | 0 .../usb_hid/spec/arm_v6/target.mk | 0 .../usb_hid/spec/arm_v7/generated_dummies.c | 0 .../usb_hid/spec/arm_v7/source.list | 0 .../usb_hid/spec/arm_v7/target.mk | 0 .../usb_hid/spec/arm_v8/generated_dummies.c | 0 .../usb_hid/spec/arm_v8/source.list | 0 .../usb_hid/spec/arm_v8/target.mk | 0 .../usb_hid/spec/x86_32/generated_dummies.c | 0 .../usb_hid/spec/x86_32/source.list | 0 .../usb_hid/spec/x86_32/target.mk | 0 .../usb_hid/spec/x86_64/generated_dummies.c | 0 .../usb_hid/spec/x86_64/source.list | 0 .../usb_hid/spec/x86_64/target.mk | 0 .../src/{drivers => driver}/usb_hid/target.inc | 0 .../src/{drivers => driver}/usb_hid/usb_hid.h | 0 .../src/{drivers => driver}/usb_net/README | 0 .../src/{drivers => driver}/usb_net/dep.list | 0 .../src/{drivers => driver}/usb_net/dummies.c | 0 .../src/{drivers => driver}/usb_net/lx_emul.c | 0 .../src/{drivers => driver}/usb_net/lx_emul.h | 0 .../src/{drivers => driver}/usb_net/lx_user.c | 0 .../src/{drivers => driver}/usb_net/main.cc | 0 .../usb_net/spec/arm_v6/generated_dummies.c | 0 .../usb_net/spec/arm_v6/source.list | 0 .../usb_net/spec/arm_v6/target.mk | 0 .../usb_net/spec/arm_v7/generated_dummies.c | 0 .../usb_net/spec/arm_v7/source.list | 0 .../usb_net/spec/arm_v7/target.mk | 0 .../usb_net/spec/arm_v8/generated_dummies.c | 0 .../usb_net/spec/arm_v8/source.list | 0 .../usb_net/spec/arm_v8/target.mk | 0 .../usb_net/spec/x86_32/generated_dummies.c | 0 .../usb_net/spec/x86_32/source.list | 0 .../usb_net/spec/x86_32/target.mk | 0 .../usb_net/spec/x86_64/generated_dummies.c | 0 .../usb_net/spec/x86_64/source.list | 0 .../usb_net/spec/x86_64/target.mk | 0 .../src/{drivers => driver}/usb_net/target.inc | 0 .../src/{drivers => driver}/usb_net/usb_net.h | 0 .../{drivers => driver}/usb_net/wdm_terminal.cc | 0 .../src/{drivers => driver}/wifi/README | 2 +- .../{drivers => driver}/wifi/access_firmware.cc | 0 .../{drivers => driver}/wifi/access_firmware.h | 0 .../src/{drivers => driver}/wifi/frontend.h | 0 .../src/{drivers => driver}/wifi/main.cc | 0 .../src/{drivers => driver}/wifi/target.mk | 0 .../src/{drivers => driver}/wifi/util.h | 0 .../src/{drivers => driver}/wifi/wpa.cc | 0 .../dde_linux/src/{drivers => driver}/wifi/wpa.h | 0 repos/gems/recipes/pkg/backdrop/hash | 2 +- repos/gems/recipes/pkg/drivers_nic-pc/hash | 2 +- repos/gems/recipes/pkg/fonts_fs/hash | 2 +- repos/gems/recipes/pkg/sculpt/README | 2 +- repos/gems/recipes/raw/drivers_nic-pc/hash | 2 +- repos/gems/recipes/src/backdrop/hash | 2 +- repos/gems/recipes/src/vfs_pipe/hash | 2 +- repos/gems/recipes/src/vfs_ttf/hash | 2 +- repos/gems/run/tcp_terminal.run | 2 +- repos/libports/recipes/pkg/system_rtc-linux/hash | 2 +- repos/libports/recipes/pkg/system_rtc-pc/hash | 2 +- repos/libports/recipes/raw/system_rtc-linux/hash | 2 +- repos/libports/recipes/raw/system_rtc-pc/hash | 2 +- repos/libports/recipes/src/libc/hash | 2 +- repos/libports/recipes/src/system_rtc/hash | 2 +- repos/libports/recipes/src/vesa_fb/content.mk | 2 +- repos/libports/recipes/src/vesa_fb/hash | 2 +- .../libports/recipes/src/vfs_jitterentropy/hash | 2 +- repos/libports/recipes/src/vfs_lwip/hash | 2 +- repos/libports/run/acpi_suspend.run | 16 ++++++++-------- repos/libports/run/acpica.run | 4 ++-- repos/libports/run/lwip.run | 2 +- repos/libports/run/lwip_lx.run | 2 +- repos/libports/run/oss.run | 2 +- .../{drivers => driver}/framebuffer/vesa/README | 0 .../framebuffer/vesa/framebuffer.cc | 0 .../framebuffer/vesa/hw_emul.cc | 0 .../framebuffer/vesa/ifx86emu.cc | 0 .../framebuffer/vesa/include/framebuffer.h | 0 .../framebuffer/vesa/include/genode_env.h | 0 .../framebuffer/vesa/include/hw_emul.h | 0 .../framebuffer/vesa/include/ifx86emu.h | 0 .../framebuffer/vesa/include/vbe.h | 0 .../framebuffer/vesa/include/vesa.h | 0 .../{drivers => driver}/framebuffer/vesa/main.cc | 0 .../framebuffer/vesa/target.mk | 0 repos/os/lib/import/import-nic_driver.mk | 2 +- repos/os/recipes/api/gui_session/hash | 2 +- repos/os/recipes/api/nic_driver/content.mk | 2 +- repos/os/recipes/api/os/hash | 2 +- repos/os/recipes/pkg/drivers_interactive-pc/hash | 2 +- repos/os/recipes/pkg/drivers_nic-linux/hash | 2 +- repos/os/recipes/raw/drivers_interactive-pc/hash | 2 +- repos/os/recipes/raw/drivers_nic-linux/hash | 2 +- repos/os/recipes/src/acpi/content.mk | 2 +- repos/os/recipes/src/acpi/hash | 2 +- repos/os/recipes/src/ahci/content.mk | 2 +- repos/os/recipes/src/boot_fb/content.mk | 2 +- repos/os/recipes/src/dummy_rtc/content.mk | 6 +++--- repos/os/recipes/src/event_filter/hash | 2 +- repos/os/recipes/src/fb_sdl/content.mk | 2 +- repos/os/recipes/src/init/hash | 2 +- repos/os/recipes/src/intel_gpu/content.mk | 2 +- repos/os/recipes/src/lan9118_nic/content.mk | 2 +- repos/os/recipes/src/linux_nic/content.mk | 2 +- repos/os/recipes/src/linux_nic/hash | 2 +- repos/os/recipes/src/linux_rtc/content.mk | 6 +++--- repos/os/recipes/src/linux_rtc/hash | 2 +- repos/os/recipes/src/nic_router/hash | 2 +- repos/os/recipes/src/nit_focus/hash | 2 +- repos/os/recipes/src/nitpicker/hash | 2 +- repos/os/recipes/src/nvme/content.mk | 2 +- repos/os/recipes/src/pbxa9_drivers/content.mk | 6 +++--- repos/os/recipes/src/pc_rtc/content.mk | 2 +- repos/os/recipes/src/pc_rtc/hash | 2 +- repos/os/recipes/src/pci_decode/hash | 2 +- repos/os/recipes/src/platform/content.inc | 4 ++-- repos/os/recipes/src/platform/content.mk | 2 +- repos/os/recipes/src/platform/hash | 2 +- repos/os/recipes/src/ps2/content.mk | 2 +- repos/os/recipes/src/ps2/hash | 2 +- repos/os/recipes/src/report_rom/hash | 2 +- repos/os/recipes/src/rom_filter/hash | 2 +- repos/os/recipes/src/usb_block/content.mk | 2 +- repos/os/recipes/src/vfs/hash | 2 +- .../os/recipes/src/virt_qemu_drivers/content.mk | 2 +- repos/os/recipes/src/virtdev_rom/content.mk | 2 +- repos/os/recipes/src/virtio_fb/content.mk | 2 +- repos/os/recipes/src/virtio_input/content.mk | 2 +- repos/os/recipes/src/virtio_nic/content.mk | 2 +- repos/os/run/ahci_block.run | 6 +++--- repos/os/run/i2c_mcp9808.run | 2 +- repos/os/run/mixer.run | 6 +++--- repos/os/run/monitor_gdb.inc | 2 +- repos/os/run/nvme.run | 6 +++--- repos/os/run/pointer.run | 2 +- repos/os/run/sd_card.run | 2 +- repos/os/run/sd_card_bench.run | 2 +- repos/os/run/smbios_decoder.run | 2 +- repos/os/run/timeout.run | 2 +- repos/os/run/uart.run | 2 +- repos/os/src/{drivers => driver}/acpi/README | 0 repos/os/src/{drivers => driver}/acpi/acpi.cc | 0 repos/os/src/{drivers => driver}/acpi/acpi.h | 0 .../{drivers => driver}/acpi/efi_system_table.h | 0 .../{drivers => driver}/acpi/intel_opregion.cc | 0 .../{drivers => driver}/acpi/intel_opregion.h | 0 repos/os/src/{drivers => driver}/acpi/main.cc | 0 repos/os/src/{drivers => driver}/acpi/memory.h | 0 .../acpi/smbios_table_reporter.cc | 0 .../acpi/smbios_table_reporter.h | 0 .../{drivers => driver}/acpi/spec/x86/target.mk | 0 repos/os/src/{drivers => driver}/ahci/README | 0 repos/os/src/{drivers => driver}/ahci/ahci.h | 0 .../src/{drivers => driver}/ahci/ata_protocol.h | 0 .../{drivers => driver}/ahci/atapi_protocol.h | 0 repos/os/src/{drivers => driver}/ahci/main.cc | 0 repos/os/src/{drivers => driver}/ahci/target.mk | 0 repos/os/src/{drivers => driver}/ahci/util.h | 0 .../{drivers => driver}/audio/spec/linux/alsa.c | 0 .../{drivers => driver}/audio/spec/linux/alsa.h | 0 .../{drivers => driver}/audio/spec/linux/main.cc | 0 .../audio/spec/linux/target.mk | 0 .../{drivers => driver}/framebuffer/boot/README | 0 .../{drivers => driver}/framebuffer/boot/main.cc | 0 .../framebuffer/boot/target.mk | 0 .../framebuffer/pl11x/main.cc | 0 .../framebuffer/pl11x/target.mk | 0 .../{drivers => driver}/framebuffer/ram/README | 0 .../{drivers => driver}/framebuffer/ram/main.cc | 0 .../framebuffer/ram/target.mk | 0 .../framebuffer/sdl/convert_keycode.h | 0 .../{drivers => driver}/framebuffer/sdl/main.cc | 0 .../framebuffer/sdl/target.mk | 0 .../framebuffer/virtio/component.h | 0 .../framebuffer/virtio/mmio_device.cc | 0 .../driver/framebuffer/virtio/spec/arm/target.mk | 3 +++ .../framebuffer/virtio/spec/arm_64/target.mk | 3 +++ .../framebuffer/virtio/spec/riscv/target.mk | 3 +++ .../driver/framebuffer/virtio/target_mmio.inc | 6 ++++++ .../os/src/{drivers => driver}/gpio/rpi/driver.h | 0 .../os/src/{drivers => driver}/gpio/rpi/empty.cc | 0 repos/os/src/{drivers => driver}/gpio/rpi/gpio.h | 0 .../os/src/{drivers => driver}/gpio/rpi/main.cc | 0 .../src/{drivers => driver}/gpio/rpi/target.mk | 0 .../src/{drivers => driver}/gpu/intel/commands.h | 0 .../src/{drivers => driver}/gpu/intel/context.h | 0 .../gpu/intel/context_descriptor.h | 0 .../os/src/{drivers => driver}/gpu/intel/ggtt.h | 0 .../os/src/{drivers => driver}/gpu/intel/main.cc | 0 .../os/src/{drivers => driver}/gpu/intel/mmio.h | 0 .../{drivers => driver}/gpu/intel/mmio_dump.cc | 0 .../gpu/intel/platform_session.h | 0 .../os/src/{drivers => driver}/gpu/intel/ppgtt.h | 0 .../gpu/intel/ppgtt_allocator.h | 0 .../os/src/{drivers => driver}/gpu/intel/reset.h | 0 .../{drivers => driver}/gpu/intel/ring_buffer.h | 0 .../src/{drivers => driver}/gpu/intel/target.mk | 0 .../os/src/{drivers => driver}/gpu/intel/types.h | 0 .../os/src/{drivers => driver}/gpu/intel/utils.h | 0 .../{drivers => driver}/gpu/intel/workarounds.h | 0 repos/os/src/{drivers => driver}/i2c/README | 2 +- repos/os/src/{drivers => driver}/i2c/component.h | 0 .../src/{drivers => driver}/i2c/i2c_interface.h | 0 .../{drivers => driver}/i2c/imx8q_evk/driver.cc | 0 .../{drivers => driver}/i2c/imx8q_evk/driver.h | 0 .../src/{drivers => driver}/i2c/imx8q_evk/mmio.h | 0 repos/os/src/driver/i2c/imx8q_evk/target.mk | 9 +++++++++ repos/os/src/{drivers => driver}/i2c/main.cc | 0 repos/os/src/{drivers => driver}/i2c/target.inc | 4 ++-- .../src/{drivers => driver}/input/virtio/README | 0 .../{drivers => driver}/input/virtio/component.h | 0 .../input/virtio/mmio_device.cc | 0 .../src/driver/input/virtio/spec/arm/target.mk | 3 +++ .../driver/input/virtio/spec/arm_64/target.mk | 3 +++ .../src/driver/input/virtio/spec/riscv/target.mk | 3 +++ repos/os/src/driver/input/virtio/target_mmio.inc | 6 ++++++ .../nic/include/drivers/nic/uplink_client_base.h | 0 .../{drivers => driver}/nic/lan9118/lan9118.h | 0 .../src/{drivers => driver}/nic/lan9118/main.cc | 0 .../{drivers => driver}/nic/lan9118/target.mk | 0 .../{drivers => driver}/nic/spec/linux/README | 0 .../{drivers => driver}/nic/spec/linux/main.cc | 0 .../{drivers => driver}/nic/spec/linux/target.mk | 0 .../os/src/{drivers => driver}/nic/virtio/README | 0 .../{drivers => driver}/nic/virtio/component.h | 0 .../{drivers => driver}/nic/virtio/config.xsd | 0 .../nic/virtio/mmio_device.cc | 0 .../{drivers => driver}/nic/virtio/pci_device.cc | 0 .../os/src/driver/nic/virtio/spec/arm/target.mk | 3 +++ .../src/driver/nic/virtio/spec/arm_64/target.mk | 3 +++ .../src/driver/nic/virtio/spec/riscv/target.mk | 3 +++ .../nic/virtio/spec/x86/target.mk | 4 ++-- .../nic/virtio/target_mmio.inc | 4 ++-- repos/os/src/{drivers => driver}/nvme/README | 0 .../os/src/{drivers => driver}/nvme/dma_buffer.h | 0 repos/os/src/{drivers => driver}/nvme/main.cc | 0 .../nvme/spec/arm_64/dma_buffer.cc | 0 .../nvme/spec/arm_64/target.mk | 0 .../nvme/spec/x86/dma_buffer.cc | 0 .../{drivers => driver}/nvme/spec/x86/target.mk | 0 repos/os/src/{drivers => driver}/nvme/target.inc | 0 repos/os/src/{drivers => driver}/nvme/util.h | 0 repos/os/src/{drivers => driver}/platform/README | 0 .../os/src/{drivers => driver}/platform/clock.h | 0 .../os/src/{drivers => driver}/platform/common.h | 0 .../src/{drivers => driver}/platform/device.cc | 0 .../os/src/{drivers => driver}/platform/device.h | 0 .../platform/device_component.cc | 0 .../platform/device_component.h | 0 .../{drivers => driver}/platform/device_owner.h | 0 .../{drivers => driver}/platform/device_pd.cc | 0 .../src/{drivers => driver}/platform/device_pd.h | 0 .../platform/dma_allocator.cc | 0 .../{drivers => driver}/platform/dma_allocator.h | 0 .../os/src/{drivers => driver}/platform/io_mmu.h | 0 .../platform/io_mmu_domain_registry.h | 0 .../os/src/{drivers => driver}/platform/main.cc | 0 .../platform/named_registry.h | 0 repos/os/src/{drivers => driver}/platform/pci.cc | 0 repos/os/src/{drivers => driver}/platform/pci.h | 0 .../src/{drivers => driver}/platform/pci_ehci.h | 0 .../{drivers => driver}/platform/pci_hd_audio.h | 0 .../platform/pci_intel_graphics.h | 0 .../src/{drivers => driver}/platform/pci_uhci.h | 0 .../{drivers => driver}/platform/pci_virtio.h | 0 .../os/src/{drivers => driver}/platform/policy.h | 0 .../os/src/{drivers => driver}/platform/power.h | 0 .../os/src/{drivers => driver}/platform/reset.h | 0 .../os/src/{drivers => driver}/platform/root.cc | 0 repos/os/src/{drivers => driver}/platform/root.h | 0 .../platform/session_component.cc | 0 .../platform/session_component.h | 0 .../{drivers => driver}/platform/shared_irq.cc | 0 .../{drivers => driver}/platform/shared_irq.h | 0 .../src/{drivers => driver}/platform/target.inc | 2 +- .../src/{drivers => driver}/platform/target.mk | 0 .../os/src/{drivers => driver}/platform/types.h | 0 repos/os/src/{drivers => driver}/ps2/README | 0 .../src/{drivers => driver}/ps2/input_driver.h | 0 .../os/src/{drivers => driver}/ps2/irq_handler.h | 0 repos/os/src/{drivers => driver}/ps2/led_state.h | 0 .../os/src/{drivers => driver}/ps2/pl050/main.cc | 0 .../os/src/{drivers => driver}/ps2/pl050/pl050.h | 0 .../src/{drivers => driver}/ps2/pl050/target.mk | 0 .../src/{drivers => driver}/ps2/ps2_keyboard.h | 0 repos/os/src/{drivers => driver}/ps2/ps2_mouse.h | 0 .../{drivers => driver}/ps2/scan_code_set_1.h | 0 .../{drivers => driver}/ps2/scan_code_set_2.h | 0 .../{drivers => driver}/ps2/serial_interface.h | 0 repos/os/src/{drivers => driver}/ps2/verbose.h | 0 repos/os/src/{drivers => driver}/ps2/x86/i8042.h | 0 repos/os/src/{drivers => driver}/ps2/x86/main.cc | 0 .../os/src/{drivers => driver}/ps2/x86/target.mk | 0 repos/os/src/{drivers => driver}/rtc/README | 0 .../os/src/{drivers => driver}/rtc/dummy/rtc.cc | 0 repos/os/src/driver/rtc/dummy/target.mk | 4 ++++ repos/os/src/{drivers => driver}/rtc/main.cc | 0 repos/os/src/{drivers => driver}/rtc/rtc.h | 0 .../{drivers => driver}/rtc/spec/linux/rtc.cc | 0 .../{drivers => driver}/rtc/spec/linux/target.mk | 2 +- .../src/{drivers => driver}/rtc/spec/x86/rtc.cc | 0 .../{drivers => driver}/rtc/spec/x86/target.mk | 2 +- repos/os/src/driver/rtc/target.inc | 5 +++++ .../os/src/{drivers => driver}/sd_card/adma2.cc | 0 repos/os/src/{drivers => driver}/sd_card/adma2.h | 0 .../src/{drivers => driver}/sd_card/benchmark.h | 0 .../{drivers => driver}/sd_card/driver_base.h | 0 .../{drivers => driver}/sd_card/imx/driver.cc | 0 .../src/{drivers => driver}/sd_card/imx/driver.h | 0 .../{drivers => driver}/sd_card/imx53/driver.cc | 0 repos/os/src/driver/sd_card/imx53/target.mk | 6 ++++++ .../{drivers => driver}/sd_card/imx6/driver.cc | 0 repos/os/src/driver/sd_card/imx6/target.mk | 6 ++++++ repos/os/src/{drivers => driver}/sd_card/main.cc | 0 .../{drivers => driver}/sd_card/pl180/driver.cc | 0 .../{drivers => driver}/sd_card/pl180/driver.h | 0 repos/os/src/driver/sd_card/pl180/target.mk | 4 ++++ .../os/src/{drivers => driver}/sd_card/sd_card.h | 0 repos/os/src/driver/sd_card/target.inc | 6 ++++++ .../touch/synaptics_dsx/i2c.h | 0 .../touch/synaptics_dsx/irq_handler.h | 0 .../touch/synaptics_dsx/main.cc | 0 .../touch/synaptics_dsx/target.mk | 0 repos/os/src/{drivers => driver}/uart/README | 0 repos/os/src/{drivers => driver}/uart/main.cc | 0 repos/os/src/driver/uart/spec/pbxa9/target.mk | 4 ++++ .../uart/spec/pbxa9/uart_driver.h | 0 repos/os/src/driver/uart/spec/x86/target.mk | 4 ++++ .../uart/spec/x86/uart_driver.h | 0 repos/os/src/{drivers => driver}/uart/target.inc | 2 +- .../{drivers => driver}/uart/uart_component.h | 0 .../{drivers => driver}/uart/uart_driver_base.h | 0 .../os/src/{drivers => driver}/usb_block/README | 0 .../src/{drivers => driver}/usb_block/cbw_csw.h | 0 .../os/src/{drivers => driver}/usb_block/main.cc | 0 .../os/src/{drivers => driver}/usb_block/mmio.h | 0 .../os/src/{drivers => driver}/usb_block/scsi.h | 0 .../src/{drivers => driver}/usb_block/target.mk | 0 .../src/{drivers => driver}/virtdev_rom/README | 0 .../src/{drivers => driver}/virtdev_rom/main.cc | 0 .../virtdev_rom/spec/arm/platform_config.h | 0 .../os/src/driver/virtdev_rom/spec/arm/target.mk | 5 +++++ .../src/driver/virtdev_rom/spec/arm_64/target.mk | 5 +++++ .../virtdev_rom/spec/riscv/platform_config.h | 0 .../src/driver/virtdev_rom/spec/riscv/target.mk | 5 +++++ .../{drivers => driver}/virtdev_rom/target.inc | 2 +- .../framebuffer/virtio/spec/arm/target.mk | 3 --- .../framebuffer/virtio/spec/arm_64/target.mk | 3 --- .../framebuffer/virtio/spec/riscv/target.mk | 3 --- .../drivers/framebuffer/virtio/target_mmio.inc | 6 ------ repos/os/src/drivers/i2c/imx8q_evk/target.mk | 9 --------- .../src/drivers/input/virtio/spec/arm/target.mk | 3 --- .../drivers/input/virtio/spec/arm_64/target.mk | 3 --- .../drivers/input/virtio/spec/riscv/target.mk | 3 --- .../os/src/drivers/input/virtio/target_mmio.inc | 6 ------ .../os/src/drivers/nic/virtio/spec/arm/target.mk | 3 --- .../src/drivers/nic/virtio/spec/arm_64/target.mk | 3 --- .../src/drivers/nic/virtio/spec/riscv/target.mk | 3 --- repos/os/src/drivers/rtc/dummy/target.mk | 4 ---- repos/os/src/drivers/rtc/target.inc | 5 ----- repos/os/src/drivers/sd_card/imx53/target.mk | 6 ------ repos/os/src/drivers/sd_card/imx6/target.mk | 6 ------ repos/os/src/drivers/sd_card/pl180/target.mk | 4 ---- repos/os/src/drivers/sd_card/target.inc | 6 ------ repos/os/src/drivers/uart/spec/pbxa9/target.mk | 4 ---- repos/os/src/drivers/uart/spec/x86/target.mk | 4 ---- .../src/drivers/virtdev_rom/spec/arm/target.mk | 5 ----- .../drivers/virtdev_rom/spec/arm_64/target.mk | 5 ----- .../src/drivers/virtdev_rom/spec/riscv/target.mk | 5 ----- repos/pc/recipes/src/pc_intel_fb/content.mk | 2 +- repos/pc/recipes/src/pc_nic/content.mk | 2 +- repos/pc/recipes/src/pc_nic/hash | 2 +- repos/pc/recipes/src/pc_platform/content.mk | 2 +- repos/pc/recipes/src/pc_usb_host/content.mk | 2 +- repos/pc/recipes/src/pc_usb_host/hash | 2 +- repos/pc/recipes/src/pc_wifi/content.mk | 2 +- repos/pc/run/intel_fb.run | 8 ++++---- repos/pc/run/pc_nic.run | 6 +----- repos/pc/run/pc_wifi.run | 8 ++++---- .../framebuffer/intel/pc/README | 0 .../framebuffer/intel/pc/dep.list | 0 .../framebuffer/intel/pc/dummies.c | 0 .../framebuffer/intel/pc/emul.cc | 0 .../framebuffer/intel/pc/fb.c | 0 .../framebuffer/intel/pc/gem.c | 0 .../framebuffer/intel/pc/generated_dummies.c | 0 .../framebuffer/intel/pc/lx_emul.c | 0 .../framebuffer/intel/pc/lx_emul.h | 0 .../framebuffer/intel/pc/lx_emul/fb.h | 0 .../framebuffer/intel/pc/lx_i915.h | 0 .../framebuffer/intel/pc/lx_user.c | 0 .../framebuffer/intel/pc/main.cc | 0 .../framebuffer/intel/pc/opregion_io_mem.cc | 0 .../framebuffer/intel/pc/pci.c | 0 .../framebuffer/intel/pc/spec/x86_32/dep.list | 0 .../framebuffer/intel/pc/spec/x86_32/source.list | 0 .../framebuffer/intel/pc/spec/x86_32/target.mk | 2 +- .../framebuffer/intel/pc/spec/x86_64/dep.list | 0 .../framebuffer/intel/pc/spec/x86_64/source.list | 0 .../framebuffer/intel/pc/spec/x86_64/target.mk | 3 +++ .../framebuffer/intel/pc/target.inc | 0 repos/pc/src/{drivers => driver}/nic/pc/dep.list | 0 .../pc/src/{drivers => driver}/nic/pc/dummies.c | 0 .../pc/src/{drivers => driver}/nic/pc/lx_emul.c | 0 .../pc/src/{drivers => driver}/nic/pc/lx_emul.h | 0 .../pc/src/{drivers => driver}/nic/pc/lx_user.c | 0 repos/pc/src/{drivers => driver}/nic/pc/main.cc | 0 .../src/{drivers => driver}/nic/pc/rtnetlink.c | 0 .../nic/pc/spec/x86_32/generated_dummies.c | 0 .../nic/pc/spec/x86_32/source.list | 0 .../nic/pc/spec/x86_32/target.mk | 0 .../nic/pc/spec/x86_64/generated_dummies.c | 0 .../nic/pc/spec/x86_64/source.list | 0 .../nic/pc/spec/x86_64/target.mk | 0 .../pc/src/{drivers => driver}/nic/pc/target.inc | 0 .../platform/pc/expanding_page_table_allocator.h | 0 .../platform/pc/intel/context_table.cc | 0 .../platform/pc/intel/context_table.h | 0 .../platform/pc/intel/default_mappings.cc | 0 .../platform/pc/intel/default_mappings.h | 0 .../platform/pc/intel/domain_allocator.h | 0 .../platform/pc/intel/io_mmu.cc | 0 .../platform/pc/intel/io_mmu.h | 0 .../platform/pc/intel/managed_root_table.cc | 0 .../platform/pc/intel/managed_root_table.h | 0 .../platform/pc/intel/page_table.cc | 0 .../platform/pc/intel/page_table.h | 0 .../platform/pc/intel/report_helper.h | 0 .../platform/pc/intel/root_table.cc | 0 .../platform/pc/intel/root_table.h | 0 .../platform/pc/spec/x86_32/main.cc | 0 .../src/driver/platform/pc/spec/x86_32/target.mk | 4 ++++ .../platform/pc/spec/x86_64/main.cc | 0 .../platform/pc/spec/x86_64/target.mk | 2 +- .../src/{drivers => driver}/usb_host/pc/README | 0 .../src/{drivers => driver}/usb_host/pc/dep.list | 0 .../{drivers => driver}/usb_host/pc/dummies.c | 0 .../usb_host/pc/generated_dummies.c | 0 .../{drivers => driver}/usb_host/pc/lx_emul.c | 0 .../{drivers => driver}/usb_host/pc/lx_emul.h | 0 .../src/{drivers => driver}/usb_host/pc/main.cc | 0 .../usb_host/pc/spec/x86_32/dep.list | 0 .../usb_host/pc/spec/x86_32/source.list | 0 .../usb_host/pc/spec/x86_32/target.mk | 2 +- .../usb_host/pc/spec/x86_64/dep.list | 0 .../usb_host/pc/spec/x86_64/source.list | 0 .../src/driver/usb_host/pc/spec/x86_64/target.mk | 3 +++ .../{drivers => driver}/usb_host/pc/target.inc | 0 .../framebuffer/intel/pc/spec/x86_64/target.mk | 3 --- .../drivers/platform/pc/spec/x86_32/target.mk | 4 ---- .../drivers/usb_host/pc/spec/x86_64/target.mk | 3 --- .../src/lib/pc/lx_emul/shadow/drivers/acpi/bus.c | 2 +- .../lx_emul/shadow/drivers/acpi/device_sysfs.c | 2 +- .../lib/pc/lx_emul/shadow/drivers/acpi/glue.c | 2 +- .../pc/lx_emul/shadow/drivers/acpi/property.c | 2 +- .../lib/pc/lx_emul/shadow/drivers/acpi/scan.c | 2 +- .../lib/pc/lx_emul/shadow/drivers/acpi/utils.c | 2 +- repos/ports/lib/mk/virtualbox5-main.mk | 2 +- repos/ports/recipes/src/vbox5-nova/content.mk | 2 +- repos/ports/recipes/src/vbox6/content.mk | 2 +- repos/ports/run/gdb.inc | 2 +- repos/ports/run/socat.run | 2 +- repos/ports/run/vbox_share.inc | 2 +- repos/ports/run/vbox_win.inc | 4 ++-- repos/ports/run/virtualbox.run | 6 +++--- repos/ports/run/virtualbox6.run | 4 ++-- repos/ports/run/virtualbox_auto.inc | 8 ++++---- repos/ports/src/virtualbox5/frontend/console.h | 2 +- repos/ports/src/virtualbox5/target.inc | 2 +- repos/ports/src/virtualbox6/scan_code.h | 2 +- repos/ports/src/virtualbox6/target.mk | 2 +- 496 files changed, 288 insertions(+), 292 deletions(-) rename repos/dde_bsd/src/{drivers => driver}/audio/main.cc (100%) rename repos/dde_bsd/src/{drivers => driver}/audio/pci/target.mk (78%) rename repos/dde_ipxe/src/{drivers => driver}/nic/main.cc (100%) rename repos/dde_ipxe/src/{drivers => driver}/nic/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/README (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/dep.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/led_state.h (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/lx_emul.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/lx_emul.h (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/lx_user.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/main.cc (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v6/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v6/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v6/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v7/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v7/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v7/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v8/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v8/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/arm_v8/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_32/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_32/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_32/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_64/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_64/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/spec/x86_64/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/target.inc (100%) rename repos/dde_linux/src/{drivers => driver}/usb_hid/usb_hid.h (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/README (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/dep.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/lx_emul.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/lx_emul.h (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/lx_user.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/main.cc (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v6/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v6/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v6/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v7/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v7/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v7/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v8/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v8/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/arm_v8/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_32/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_32/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_32/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_64/generated_dummies.c (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_64/source.list (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/spec/x86_64/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/target.inc (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/usb_net.h (100%) rename repos/dde_linux/src/{drivers => driver}/usb_net/wdm_terminal.cc (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/README (99%) rename repos/dde_linux/src/{drivers => driver}/wifi/access_firmware.cc (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/access_firmware.h (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/frontend.h (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/main.cc (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/target.mk (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/util.h (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/wpa.cc (100%) rename repos/dde_linux/src/{drivers => driver}/wifi/wpa.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/README (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/framebuffer.cc (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/hw_emul.cc (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/ifx86emu.cc (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/framebuffer.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/genode_env.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/hw_emul.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/ifx86emu.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/vbe.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/include/vesa.h (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/main.cc (100%) rename repos/libports/src/{drivers => driver}/framebuffer/vesa/target.mk (100%) rename repos/os/src/{drivers => driver}/acpi/README (100%) rename repos/os/src/{drivers => driver}/acpi/acpi.cc (100%) rename repos/os/src/{drivers => driver}/acpi/acpi.h (100%) rename repos/os/src/{drivers => driver}/acpi/efi_system_table.h (100%) rename repos/os/src/{drivers => driver}/acpi/intel_opregion.cc (100%) rename repos/os/src/{drivers => driver}/acpi/intel_opregion.h (100%) rename repos/os/src/{drivers => driver}/acpi/main.cc (100%) rename repos/os/src/{drivers => driver}/acpi/memory.h (100%) rename repos/os/src/{drivers => driver}/acpi/smbios_table_reporter.cc (100%) rename repos/os/src/{drivers => driver}/acpi/smbios_table_reporter.h (100%) rename repos/os/src/{drivers => driver}/acpi/spec/x86/target.mk (100%) rename repos/os/src/{drivers => driver}/ahci/README (100%) rename repos/os/src/{drivers => driver}/ahci/ahci.h (100%) rename repos/os/src/{drivers => driver}/ahci/ata_protocol.h (100%) rename repos/os/src/{drivers => driver}/ahci/atapi_protocol.h (100%) rename repos/os/src/{drivers => driver}/ahci/main.cc (100%) rename repos/os/src/{drivers => driver}/ahci/target.mk (100%) rename repos/os/src/{drivers => driver}/ahci/util.h (100%) rename repos/os/src/{drivers => driver}/audio/spec/linux/alsa.c (100%) rename repos/os/src/{drivers => driver}/audio/spec/linux/alsa.h (100%) rename repos/os/src/{drivers => driver}/audio/spec/linux/main.cc (100%) rename repos/os/src/{drivers => driver}/audio/spec/linux/target.mk (100%) rename repos/os/src/{drivers => driver}/framebuffer/boot/README (100%) rename repos/os/src/{drivers => driver}/framebuffer/boot/main.cc (100%) rename repos/os/src/{drivers => driver}/framebuffer/boot/target.mk (100%) rename repos/os/src/{drivers => driver}/framebuffer/pl11x/main.cc (100%) rename repos/os/src/{drivers => driver}/framebuffer/pl11x/target.mk (100%) rename repos/os/src/{drivers => driver}/framebuffer/ram/README (100%) rename repos/os/src/{drivers => driver}/framebuffer/ram/main.cc (100%) rename repos/os/src/{drivers => driver}/framebuffer/ram/target.mk (100%) rename repos/os/src/{drivers => driver}/framebuffer/sdl/convert_keycode.h (100%) rename repos/os/src/{drivers => driver}/framebuffer/sdl/main.cc (100%) rename repos/os/src/{drivers => driver}/framebuffer/sdl/target.mk (100%) rename repos/os/src/{drivers => driver}/framebuffer/virtio/component.h (100%) rename repos/os/src/{drivers => driver}/framebuffer/virtio/mmio_device.cc (100%) create mode 100644 repos/os/src/driver/framebuffer/virtio/spec/arm/target.mk create mode 100644 repos/os/src/driver/framebuffer/virtio/spec/arm_64/target.mk create mode 100644 repos/os/src/driver/framebuffer/virtio/spec/riscv/target.mk create mode 100644 repos/os/src/driver/framebuffer/virtio/target_mmio.inc rename repos/os/src/{drivers => driver}/gpio/rpi/driver.h (100%) rename repos/os/src/{drivers => driver}/gpio/rpi/empty.cc (100%) rename repos/os/src/{drivers => driver}/gpio/rpi/gpio.h (100%) rename repos/os/src/{drivers => driver}/gpio/rpi/main.cc (100%) rename repos/os/src/{drivers => driver}/gpio/rpi/target.mk (100%) rename repos/os/src/{drivers => driver}/gpu/intel/commands.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/context.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/context_descriptor.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/ggtt.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/main.cc (100%) rename repos/os/src/{drivers => driver}/gpu/intel/mmio.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/mmio_dump.cc (100%) rename repos/os/src/{drivers => driver}/gpu/intel/platform_session.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/ppgtt.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/ppgtt_allocator.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/reset.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/ring_buffer.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/target.mk (100%) rename repos/os/src/{drivers => driver}/gpu/intel/types.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/utils.h (100%) rename repos/os/src/{drivers => driver}/gpu/intel/workarounds.h (100%) rename repos/os/src/{drivers => driver}/i2c/README (98%) rename repos/os/src/{drivers => driver}/i2c/component.h (100%) rename repos/os/src/{drivers => driver}/i2c/i2c_interface.h (100%) rename repos/os/src/{drivers => driver}/i2c/imx8q_evk/driver.cc (100%) rename repos/os/src/{drivers => driver}/i2c/imx8q_evk/driver.h (100%) rename repos/os/src/{drivers => driver}/i2c/imx8q_evk/mmio.h (100%) create mode 100644 repos/os/src/driver/i2c/imx8q_evk/target.mk rename repos/os/src/{drivers => driver}/i2c/main.cc (100%) rename repos/os/src/{drivers => driver}/i2c/target.inc (51%) rename repos/os/src/{drivers => driver}/input/virtio/README (100%) rename repos/os/src/{drivers => driver}/input/virtio/component.h (100%) rename repos/os/src/{drivers => driver}/input/virtio/mmio_device.cc (100%) create mode 100644 repos/os/src/driver/input/virtio/spec/arm/target.mk create mode 100644 repos/os/src/driver/input/virtio/spec/arm_64/target.mk create mode 100644 repos/os/src/driver/input/virtio/spec/riscv/target.mk create mode 100644 repos/os/src/driver/input/virtio/target_mmio.inc rename repos/os/src/{drivers => driver}/nic/include/drivers/nic/uplink_client_base.h (100%) rename repos/os/src/{drivers => driver}/nic/lan9118/lan9118.h (100%) rename repos/os/src/{drivers => driver}/nic/lan9118/main.cc (100%) rename repos/os/src/{drivers => driver}/nic/lan9118/target.mk (100%) rename repos/os/src/{drivers => driver}/nic/spec/linux/README (100%) rename repos/os/src/{drivers => driver}/nic/spec/linux/main.cc (100%) rename repos/os/src/{drivers => driver}/nic/spec/linux/target.mk (100%) rename repos/os/src/{drivers => driver}/nic/virtio/README (100%) rename repos/os/src/{drivers => driver}/nic/virtio/component.h (100%) rename repos/os/src/{drivers => driver}/nic/virtio/config.xsd (100%) rename repos/os/src/{drivers => driver}/nic/virtio/mmio_device.cc (100%) rename repos/os/src/{drivers => driver}/nic/virtio/pci_device.cc (100%) create mode 100644 repos/os/src/driver/nic/virtio/spec/arm/target.mk create mode 100644 repos/os/src/driver/nic/virtio/spec/arm_64/target.mk create mode 100644 repos/os/src/driver/nic/virtio/spec/riscv/target.mk rename repos/os/src/{drivers => driver}/nic/virtio/spec/x86/target.mk (59%) rename repos/os/src/{drivers => driver}/nic/virtio/target_mmio.inc (56%) rename repos/os/src/{drivers => driver}/nvme/README (100%) rename repos/os/src/{drivers => driver}/nvme/dma_buffer.h (100%) rename repos/os/src/{drivers => driver}/nvme/main.cc (100%) rename repos/os/src/{drivers => driver}/nvme/spec/arm_64/dma_buffer.cc (100%) rename repos/os/src/{drivers => driver}/nvme/spec/arm_64/target.mk (100%) rename repos/os/src/{drivers => driver}/nvme/spec/x86/dma_buffer.cc (100%) rename repos/os/src/{drivers => driver}/nvme/spec/x86/target.mk (100%) rename repos/os/src/{drivers => driver}/nvme/target.inc (100%) rename repos/os/src/{drivers => driver}/nvme/util.h (100%) rename repos/os/src/{drivers => driver}/platform/README (100%) rename repos/os/src/{drivers => driver}/platform/clock.h (100%) rename repos/os/src/{drivers => driver}/platform/common.h (100%) rename repos/os/src/{drivers => driver}/platform/device.cc (100%) rename repos/os/src/{drivers => driver}/platform/device.h (100%) rename repos/os/src/{drivers => driver}/platform/device_component.cc (100%) rename repos/os/src/{drivers => driver}/platform/device_component.h (100%) rename repos/os/src/{drivers => driver}/platform/device_owner.h (100%) rename repos/os/src/{drivers => driver}/platform/device_pd.cc (100%) rename repos/os/src/{drivers => driver}/platform/device_pd.h (100%) rename repos/os/src/{drivers => driver}/platform/dma_allocator.cc (100%) rename repos/os/src/{drivers => driver}/platform/dma_allocator.h (100%) rename repos/os/src/{drivers => driver}/platform/io_mmu.h (100%) rename repos/os/src/{drivers => driver}/platform/io_mmu_domain_registry.h (100%) rename repos/os/src/{drivers => driver}/platform/main.cc (100%) rename repos/os/src/{drivers => driver}/platform/named_registry.h (100%) rename repos/os/src/{drivers => driver}/platform/pci.cc (100%) rename repos/os/src/{drivers => driver}/platform/pci.h (100%) rename repos/os/src/{drivers => driver}/platform/pci_ehci.h (100%) rename repos/os/src/{drivers => driver}/platform/pci_hd_audio.h (100%) rename repos/os/src/{drivers => driver}/platform/pci_intel_graphics.h (100%) rename repos/os/src/{drivers => driver}/platform/pci_uhci.h (100%) rename repos/os/src/{drivers => driver}/platform/pci_virtio.h (100%) rename repos/os/src/{drivers => driver}/platform/policy.h (100%) rename repos/os/src/{drivers => driver}/platform/power.h (100%) rename repos/os/src/{drivers => driver}/platform/reset.h (100%) rename repos/os/src/{drivers => driver}/platform/root.cc (100%) rename repos/os/src/{drivers => driver}/platform/root.h (100%) rename repos/os/src/{drivers => driver}/platform/session_component.cc (100%) rename repos/os/src/{drivers => driver}/platform/session_component.h (100%) rename repos/os/src/{drivers => driver}/platform/shared_irq.cc (100%) rename repos/os/src/{drivers => driver}/platform/shared_irq.h (100%) rename repos/os/src/{drivers => driver}/platform/target.inc (78%) rename repos/os/src/{drivers => driver}/platform/target.mk (100%) rename repos/os/src/{drivers => driver}/platform/types.h (100%) rename repos/os/src/{drivers => driver}/ps2/README (100%) rename repos/os/src/{drivers => driver}/ps2/input_driver.h (100%) rename repos/os/src/{drivers => driver}/ps2/irq_handler.h (100%) rename repos/os/src/{drivers => driver}/ps2/led_state.h (100%) rename repos/os/src/{drivers => driver}/ps2/pl050/main.cc (100%) rename repos/os/src/{drivers => driver}/ps2/pl050/pl050.h (100%) rename repos/os/src/{drivers => driver}/ps2/pl050/target.mk (100%) rename repos/os/src/{drivers => driver}/ps2/ps2_keyboard.h (100%) rename repos/os/src/{drivers => driver}/ps2/ps2_mouse.h (100%) rename repos/os/src/{drivers => driver}/ps2/scan_code_set_1.h (100%) rename repos/os/src/{drivers => driver}/ps2/scan_code_set_2.h (100%) rename repos/os/src/{drivers => driver}/ps2/serial_interface.h (100%) rename repos/os/src/{drivers => driver}/ps2/verbose.h (100%) rename repos/os/src/{drivers => driver}/ps2/x86/i8042.h (100%) rename repos/os/src/{drivers => driver}/ps2/x86/main.cc (100%) rename repos/os/src/{drivers => driver}/ps2/x86/target.mk (100%) rename repos/os/src/{drivers => driver}/rtc/README (100%) rename repos/os/src/{drivers => driver}/rtc/dummy/rtc.cc (100%) create mode 100644 repos/os/src/driver/rtc/dummy/target.mk rename repos/os/src/{drivers => driver}/rtc/main.cc (100%) rename repos/os/src/{drivers => driver}/rtc/rtc.h (100%) rename repos/os/src/{drivers => driver}/rtc/spec/linux/rtc.cc (100%) rename repos/os/src/{drivers => driver}/rtc/spec/linux/target.mk (57%) rename repos/os/src/{drivers => driver}/rtc/spec/x86/rtc.cc (100%) rename repos/os/src/{drivers => driver}/rtc/spec/x86/target.mk (53%) create mode 100644 repos/os/src/driver/rtc/target.inc rename repos/os/src/{drivers => driver}/sd_card/adma2.cc (100%) rename repos/os/src/{drivers => driver}/sd_card/adma2.h (100%) rename repos/os/src/{drivers => driver}/sd_card/benchmark.h (100%) rename repos/os/src/{drivers => driver}/sd_card/driver_base.h (100%) rename repos/os/src/{drivers => driver}/sd_card/imx/driver.cc (100%) rename repos/os/src/{drivers => driver}/sd_card/imx/driver.h (100%) rename repos/os/src/{drivers => driver}/sd_card/imx53/driver.cc (100%) create mode 100644 repos/os/src/driver/sd_card/imx53/target.mk rename repos/os/src/{drivers => driver}/sd_card/imx6/driver.cc (100%) create mode 100644 repos/os/src/driver/sd_card/imx6/target.mk rename repos/os/src/{drivers => driver}/sd_card/main.cc (100%) rename repos/os/src/{drivers => driver}/sd_card/pl180/driver.cc (100%) rename repos/os/src/{drivers => driver}/sd_card/pl180/driver.h (100%) create mode 100644 repos/os/src/driver/sd_card/pl180/target.mk rename repos/os/src/{drivers => driver}/sd_card/sd_card.h (100%) create mode 100644 repos/os/src/driver/sd_card/target.inc rename repos/os/src/{drivers => driver}/touch/synaptics_dsx/i2c.h (100%) rename repos/os/src/{drivers => driver}/touch/synaptics_dsx/irq_handler.h (100%) rename repos/os/src/{drivers => driver}/touch/synaptics_dsx/main.cc (100%) rename repos/os/src/{drivers => driver}/touch/synaptics_dsx/target.mk (100%) rename repos/os/src/{drivers => driver}/uart/README (100%) rename repos/os/src/{drivers => driver}/uart/main.cc (100%) create mode 100644 repos/os/src/driver/uart/spec/pbxa9/target.mk rename repos/os/src/{drivers => driver}/uart/spec/pbxa9/uart_driver.h (100%) create mode 100644 repos/os/src/driver/uart/spec/x86/target.mk rename repos/os/src/{drivers => driver}/uart/spec/x86/uart_driver.h (100%) rename repos/os/src/{drivers => driver}/uart/target.inc (88%) rename repos/os/src/{drivers => driver}/uart/uart_component.h (100%) rename repos/os/src/{drivers => driver}/uart/uart_driver_base.h (100%) rename repos/os/src/{drivers => driver}/usb_block/README (100%) rename repos/os/src/{drivers => driver}/usb_block/cbw_csw.h (100%) rename repos/os/src/{drivers => driver}/usb_block/main.cc (100%) rename repos/os/src/{drivers => driver}/usb_block/mmio.h (100%) rename repos/os/src/{drivers => driver}/usb_block/scsi.h (100%) rename repos/os/src/{drivers => driver}/usb_block/target.mk (100%) rename repos/os/src/{drivers => driver}/virtdev_rom/README (100%) rename repos/os/src/{drivers => driver}/virtdev_rom/main.cc (100%) rename repos/os/src/{drivers => driver}/virtdev_rom/spec/arm/platform_config.h (100%) create mode 100644 repos/os/src/driver/virtdev_rom/spec/arm/target.mk create mode 100644 repos/os/src/driver/virtdev_rom/spec/arm_64/target.mk rename repos/os/src/{drivers => driver}/virtdev_rom/spec/riscv/platform_config.h (100%) create mode 100644 repos/os/src/driver/virtdev_rom/spec/riscv/target.mk rename repos/os/src/{drivers => driver}/virtdev_rom/target.inc (54%) delete mode 100644 repos/os/src/drivers/framebuffer/virtio/spec/arm/target.mk delete mode 100644 repos/os/src/drivers/framebuffer/virtio/spec/arm_64/target.mk delete mode 100644 repos/os/src/drivers/framebuffer/virtio/spec/riscv/target.mk delete mode 100644 repos/os/src/drivers/framebuffer/virtio/target_mmio.inc delete mode 100644 repos/os/src/drivers/i2c/imx8q_evk/target.mk delete mode 100644 repos/os/src/drivers/input/virtio/spec/arm/target.mk delete mode 100644 repos/os/src/drivers/input/virtio/spec/arm_64/target.mk delete mode 100644 repos/os/src/drivers/input/virtio/spec/riscv/target.mk delete mode 100644 repos/os/src/drivers/input/virtio/target_mmio.inc delete mode 100644 repos/os/src/drivers/nic/virtio/spec/arm/target.mk delete mode 100644 repos/os/src/drivers/nic/virtio/spec/arm_64/target.mk delete mode 100644 repos/os/src/drivers/nic/virtio/spec/riscv/target.mk delete mode 100644 repos/os/src/drivers/rtc/dummy/target.mk delete mode 100644 repos/os/src/drivers/rtc/target.inc delete mode 100644 repos/os/src/drivers/sd_card/imx53/target.mk delete mode 100644 repos/os/src/drivers/sd_card/imx6/target.mk delete mode 100644 repos/os/src/drivers/sd_card/pl180/target.mk delete mode 100644 repos/os/src/drivers/sd_card/target.inc delete mode 100644 repos/os/src/drivers/uart/spec/pbxa9/target.mk delete mode 100644 repos/os/src/drivers/uart/spec/x86/target.mk delete mode 100644 repos/os/src/drivers/virtdev_rom/spec/arm/target.mk delete mode 100644 repos/os/src/drivers/virtdev_rom/spec/arm_64/target.mk delete mode 100644 repos/os/src/drivers/virtdev_rom/spec/riscv/target.mk rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/README (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/dep.list (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/dummies.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/emul.cc (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/fb.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/gem.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/generated_dummies.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/lx_emul.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/lx_emul.h (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/lx_emul/fb.h (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/lx_i915.h (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/lx_user.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/main.cc (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/opregion_io_mem.cc (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/pci.c (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/spec/x86_32/dep.list (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/spec/x86_32/source.list (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/spec/x86_32/target.mk (65%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/spec/x86_64/dep.list (100%) rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/spec/x86_64/source.list (100%) create mode 100644 repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/target.mk rename repos/pc/src/{drivers => driver}/framebuffer/intel/pc/target.inc (100%) rename repos/pc/src/{drivers => driver}/nic/pc/dep.list (100%) rename repos/pc/src/{drivers => driver}/nic/pc/dummies.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/lx_emul.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/lx_emul.h (100%) rename repos/pc/src/{drivers => driver}/nic/pc/lx_user.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/main.cc (100%) rename repos/pc/src/{drivers => driver}/nic/pc/rtnetlink.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_32/generated_dummies.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_32/source.list (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_32/target.mk (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_64/generated_dummies.c (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_64/source.list (100%) rename repos/pc/src/{drivers => driver}/nic/pc/spec/x86_64/target.mk (100%) rename repos/pc/src/{drivers => driver}/nic/pc/target.inc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/expanding_page_table_allocator.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/context_table.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/context_table.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/default_mappings.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/default_mappings.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/domain_allocator.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/io_mmu.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/io_mmu.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/managed_root_table.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/managed_root_table.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/page_table.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/page_table.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/report_helper.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/root_table.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/intel/root_table.h (100%) rename repos/pc/src/{drivers => driver}/platform/pc/spec/x86_32/main.cc (100%) create mode 100644 repos/pc/src/driver/platform/pc/spec/x86_32/target.mk rename repos/pc/src/{drivers => driver}/platform/pc/spec/x86_64/main.cc (100%) rename repos/pc/src/{drivers => driver}/platform/pc/spec/x86_64/target.mk (80%) rename repos/pc/src/{drivers => driver}/usb_host/pc/README (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/dep.list (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/dummies.c (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/generated_dummies.c (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/lx_emul.c (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/lx_emul.h (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/main.cc (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/spec/x86_32/dep.list (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/spec/x86_32/source.list (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/spec/x86_32/target.mk (68%) rename repos/pc/src/{drivers => driver}/usb_host/pc/spec/x86_64/dep.list (100%) rename repos/pc/src/{drivers => driver}/usb_host/pc/spec/x86_64/source.list (100%) create mode 100644 repos/pc/src/driver/usb_host/pc/spec/x86_64/target.mk rename repos/pc/src/{drivers => driver}/usb_host/pc/target.inc (100%) delete mode 100644 repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/target.mk delete mode 100644 repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk delete mode 100644 repos/pc/src/drivers/usb_host/pc/spec/x86_64/target.mk diff --git a/repos/base-linux/recipes/api/base-linux/hash b/repos/base-linux/recipes/api/base-linux/hash index 6155c1f49e..085c3a8bbc 100644 --- a/repos/base-linux/recipes/api/base-linux/hash +++ b/repos/base-linux/recipes/api/base-linux/hash @@ -1 +1 @@ -2024-04-11 de761b9137a60d1600105948b61ce1869bfa8f31 +2024-05-31 fc8b948a957bfb7185b220e6f884556ff91f8919 diff --git a/repos/base-linux/recipes/src/base-linux/hash b/repos/base-linux/recipes/src/base-linux/hash index 13e874e00a..0ac77166df 100644 --- a/repos/base-linux/recipes/src/base-linux/hash +++ b/repos/base-linux/recipes/src/base-linux/hash @@ -1 +1 @@ -2024-05-28 a8371cbfabb53798f394f13f933abb6c4ca2a47c +2024-05-31 793ae3b62ff6d79b63e651ad5b88dc22e32bacff diff --git a/repos/base-nova/recipes/src/base-nova/hash b/repos/base-nova/recipes/src/base-nova/hash index 2d8772705d..b78b33c144 100644 --- a/repos/base-nova/recipes/src/base-nova/hash +++ b/repos/base-nova/recipes/src/base-nova/hash @@ -1 +1 @@ -2024-05-28 ae8d7433aca128d44632a1d11bb9bc6604ca9a4a +2024-05-31 9cb9cc4bf2875f32b2a509c332c25fc131e208a8 diff --git a/repos/dde_bsd/recipes/src/bsd_audio/content.mk b/repos/dde_bsd/recipes/src/bsd_audio/content.mk index 01764c9ed0..ae9f6cf89c 100644 --- a/repos/dde_bsd/recipes/src/bsd_audio/content.mk +++ b/repos/dde_bsd/recipes/src/bsd_audio/content.mk @@ -6,7 +6,7 @@ LIB_MK := $(addprefix lib/mk/, $(MK_FILES)) \ $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/dde_bsd_audio.mk) \ lib/import/import-dde_bsd_audio_include.mk -MIRROR_FROM_REP_DIR := $(LIB_MK) src/lib src/drivers patches include +MIRROR_FROM_REP_DIR := $(LIB_MK) src/lib src/driver patches include MIRROR_FROM_PORT_DIR := $(addprefix src/lib/audio/, \ dev/pci/azalia_codec.c \ diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run index 83260f4316..a7c34f392f 100644 --- a/repos/dde_bsd/run/audio_in.run +++ b/repos/dde_bsd/run/audio_in.run @@ -17,8 +17,8 @@ proc build_targets { } { set targets { core init timer - drivers/acpi drivers/platform app/pci_decode server/report_rom - drivers/audio + driver/acpi driver/platform app/pci_decode server/report_rom + driver/audio } if {[use_record_play_sessions]} { diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 0ba009f3c5..50bbb6539d 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -19,8 +19,8 @@ proc build_targets { } { set targets { core init timer - drivers/acpi drivers/platform app/pci_decode server/report_rom - drivers/audio + driver/acpi driver/platform app/pci_decode server/report_rom + driver/audio } if {[use_record_play_sessions]} { diff --git a/repos/dde_bsd/src/drivers/audio/main.cc b/repos/dde_bsd/src/driver/audio/main.cc similarity index 100% rename from repos/dde_bsd/src/drivers/audio/main.cc rename to repos/dde_bsd/src/driver/audio/main.cc diff --git a/repos/dde_bsd/src/drivers/audio/pci/target.mk b/repos/dde_bsd/src/driver/audio/pci/target.mk similarity index 78% rename from repos/dde_bsd/src/drivers/audio/pci/target.mk rename to repos/dde_bsd/src/driver/audio/pci/target.mk index cf679be27c..114af12585 100644 --- a/repos/dde_bsd/src/drivers/audio/pci/target.mk +++ b/repos/dde_bsd/src/driver/audio/pci/target.mk @@ -4,6 +4,6 @@ SRC_CC = main.cc LIBS = dde_bsd_audio base format INC_DIR += $(REP_DIR)/include -vpath %.cc $(REP_DIR)/src/drivers/audio +vpath %.cc $(REP_DIR)/src/driver/audio CC_CXX_WARN_STRICT = diff --git a/repos/dde_ipxe/src/drivers/nic/main.cc b/repos/dde_ipxe/src/driver/nic/main.cc similarity index 100% rename from repos/dde_ipxe/src/drivers/nic/main.cc rename to repos/dde_ipxe/src/driver/nic/main.cc diff --git a/repos/dde_ipxe/src/drivers/nic/target.mk b/repos/dde_ipxe/src/driver/nic/target.mk similarity index 100% rename from repos/dde_ipxe/src/drivers/nic/target.mk rename to repos/dde_ipxe/src/driver/nic/target.mk diff --git a/repos/dde_linux/README b/repos/dde_linux/README index 992576bcf3..4f475e9357 100644 --- a/repos/dde_linux/README +++ b/repos/dde_linux/README @@ -8,22 +8,22 @@ Host controller The driver will start all USB controller types a platform offers. -Please consult repos/dde_linux/drivers/usb_host/README for a description. +Please consult repos/dde_linux/driver/usb_host/README for a description. HID ~~~ -Please consult repos/dde_linux/drivers/usb_hid/README for a description. +Please consult repos/dde_linux/driver/usb_hid/README for a description. Storage ~~~~~~~ -Please consult repos/os/src/drivers/usb_block/README for a description. +Please consult repos/os/src/driver/usb_block/README for a description. Network (Nic) ~~~~~~~~~~~~~ -Please consolut repos/dde_linux/src/drivers/usb_net/README for a description. +Please consolut repos/dde_linux/src/driver/usb_net/README for a description. LXIP #### diff --git a/repos/dde_linux/recipes/src/usb_hid/content.mk b/repos/dde_linux/recipes/src/usb_hid/content.mk index f7e4013edb..ad75312935 100644 --- a/repos/dde_linux/recipes/src/usb_hid/content.mk +++ b/repos/dde_linux/recipes/src/usb_hid/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/drivers/usb_hid +MIRROR_FROM_REP_DIR := src/driver/usb_hid content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): diff --git a/repos/dde_linux/recipes/src/usb_hid/hash b/repos/dde_linux/recipes/src/usb_hid/hash index 50e7c6e7a9..99d8449642 100644 --- a/repos/dde_linux/recipes/src/usb_hid/hash +++ b/repos/dde_linux/recipes/src/usb_hid/hash @@ -1 +1 @@ -2024-05-28 f8de8cf490c48c6bd9de20dbdb7d18fd78706ac1 +2024-05-31 9b8546dcb41efb2eaddc8f6ad09ce050086f59ea diff --git a/repos/dde_linux/recipes/src/usb_net/content.mk b/repos/dde_linux/recipes/src/usb_net/content.mk index 61ca75a5c1..21135806b1 100644 --- a/repos/dde_linux/recipes/src/usb_net/content.mk +++ b/repos/dde_linux/recipes/src/usb_net/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/drivers/usb_net +MIRROR_FROM_REP_DIR := src/driver/usb_net content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_REP_DIR): diff --git a/repos/dde_linux/recipes/src/vfs_lxip/hash b/repos/dde_linux/recipes/src/vfs_lxip/hash index 991c020d92..3f86fa03b0 100644 --- a/repos/dde_linux/recipes/src/vfs_lxip/hash +++ b/repos/dde_linux/recipes/src/vfs_lxip/hash @@ -1 +1 @@ -2024-05-28 f8cd4e9e35162d425293fc2648be49a7b72601e7 +2024-05-31 ba66c884fc5e93846e901afbdeca88b251129525 diff --git a/repos/dde_linux/src/drivers/usb_hid/README b/repos/dde_linux/src/driver/usb_hid/README similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/README rename to repos/dde_linux/src/driver/usb_hid/README diff --git a/repos/dde_linux/src/drivers/usb_hid/dep.list b/repos/dde_linux/src/driver/usb_hid/dep.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/dep.list rename to repos/dde_linux/src/driver/usb_hid/dep.list diff --git a/repos/dde_linux/src/drivers/usb_hid/dummies.c b/repos/dde_linux/src/driver/usb_hid/dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/dummies.c rename to repos/dde_linux/src/driver/usb_hid/dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/led_state.h b/repos/dde_linux/src/driver/usb_hid/led_state.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/led_state.h rename to repos/dde_linux/src/driver/usb_hid/led_state.h diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.c b/repos/dde_linux/src/driver/usb_hid/lx_emul.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/lx_emul.c rename to repos/dde_linux/src/driver/usb_hid/lx_emul.c diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h b/repos/dde_linux/src/driver/usb_hid/lx_emul.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/lx_emul.h rename to repos/dde_linux/src/driver/usb_hid/lx_emul.h diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_user.c b/repos/dde_linux/src/driver/usb_hid/lx_user.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/lx_user.c rename to repos/dde_linux/src/driver/usb_hid/lx_user.c diff --git a/repos/dde_linux/src/drivers/usb_hid/main.cc b/repos/dde_linux/src/driver/usb_hid/main.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/main.cc rename to repos/dde_linux/src/driver/usb_hid/main.cc diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/generated_dummies.c b/repos/dde_linux/src/driver/usb_hid/spec/arm_v6/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/generated_dummies.c rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v6/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/source.list b/repos/dde_linux/src/driver/usb_hid/spec/arm_v6/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/source.list rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v6/source.list diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/target.mk b/repos/dde_linux/src/driver/usb_hid/spec/arm_v6/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v6/target.mk rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v6/target.mk diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/generated_dummies.c b/repos/dde_linux/src/driver/usb_hid/spec/arm_v7/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/generated_dummies.c rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v7/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/source.list b/repos/dde_linux/src/driver/usb_hid/spec/arm_v7/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/source.list rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v7/source.list diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/target.mk b/repos/dde_linux/src/driver/usb_hid/spec/arm_v7/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v7/target.mk rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v7/target.mk diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/generated_dummies.c b/repos/dde_linux/src/driver/usb_hid/spec/arm_v8/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/generated_dummies.c rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v8/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/source.list b/repos/dde_linux/src/driver/usb_hid/spec/arm_v8/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/source.list rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v8/source.list diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/target.mk b/repos/dde_linux/src/driver/usb_hid/spec/arm_v8/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/arm_v8/target.mk rename to repos/dde_linux/src/driver/usb_hid/spec/arm_v8/target.mk diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_32/generated_dummies.c b/repos/dde_linux/src/driver/usb_hid/spec/x86_32/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_32/generated_dummies.c rename to repos/dde_linux/src/driver/usb_hid/spec/x86_32/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_32/source.list b/repos/dde_linux/src/driver/usb_hid/spec/x86_32/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_32/source.list rename to repos/dde_linux/src/driver/usb_hid/spec/x86_32/source.list diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_32/target.mk b/repos/dde_linux/src/driver/usb_hid/spec/x86_32/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_32/target.mk rename to repos/dde_linux/src/driver/usb_hid/spec/x86_32/target.mk diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_64/generated_dummies.c b/repos/dde_linux/src/driver/usb_hid/spec/x86_64/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_64/generated_dummies.c rename to repos/dde_linux/src/driver/usb_hid/spec/x86_64/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_64/source.list b/repos/dde_linux/src/driver/usb_hid/spec/x86_64/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_64/source.list rename to repos/dde_linux/src/driver/usb_hid/spec/x86_64/source.list diff --git a/repos/dde_linux/src/drivers/usb_hid/spec/x86_64/target.mk b/repos/dde_linux/src/driver/usb_hid/spec/x86_64/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/spec/x86_64/target.mk rename to repos/dde_linux/src/driver/usb_hid/spec/x86_64/target.mk diff --git a/repos/dde_linux/src/drivers/usb_hid/target.inc b/repos/dde_linux/src/driver/usb_hid/target.inc similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/target.inc rename to repos/dde_linux/src/driver/usb_hid/target.inc diff --git a/repos/dde_linux/src/drivers/usb_hid/usb_hid.h b/repos/dde_linux/src/driver/usb_hid/usb_hid.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/usb_hid.h rename to repos/dde_linux/src/driver/usb_hid/usb_hid.h diff --git a/repos/dde_linux/src/drivers/usb_net/README b/repos/dde_linux/src/driver/usb_net/README similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/README rename to repos/dde_linux/src/driver/usb_net/README diff --git a/repos/dde_linux/src/drivers/usb_net/dep.list b/repos/dde_linux/src/driver/usb_net/dep.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/dep.list rename to repos/dde_linux/src/driver/usb_net/dep.list diff --git a/repos/dde_linux/src/drivers/usb_net/dummies.c b/repos/dde_linux/src/driver/usb_net/dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/dummies.c rename to repos/dde_linux/src/driver/usb_net/dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/lx_emul.c b/repos/dde_linux/src/driver/usb_net/lx_emul.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/lx_emul.c rename to repos/dde_linux/src/driver/usb_net/lx_emul.c diff --git a/repos/dde_linux/src/drivers/usb_net/lx_emul.h b/repos/dde_linux/src/driver/usb_net/lx_emul.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/lx_emul.h rename to repos/dde_linux/src/driver/usb_net/lx_emul.h diff --git a/repos/dde_linux/src/drivers/usb_net/lx_user.c b/repos/dde_linux/src/driver/usb_net/lx_user.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/lx_user.c rename to repos/dde_linux/src/driver/usb_net/lx_user.c diff --git a/repos/dde_linux/src/drivers/usb_net/main.cc b/repos/dde_linux/src/driver/usb_net/main.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/main.cc rename to repos/dde_linux/src/driver/usb_net/main.cc diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c b/repos/dde_linux/src/driver/usb_net/spec/arm_v6/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c rename to repos/dde_linux/src/driver/usb_net/spec/arm_v6/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/source.list b/repos/dde_linux/src/driver/usb_net/spec/arm_v6/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v6/source.list rename to repos/dde_linux/src/driver/usb_net/spec/arm_v6/source.list diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/target.mk b/repos/dde_linux/src/driver/usb_net/spec/arm_v6/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v6/target.mk rename to repos/dde_linux/src/driver/usb_net/spec/arm_v6/target.mk diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c b/repos/dde_linux/src/driver/usb_net/spec/arm_v7/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c rename to repos/dde_linux/src/driver/usb_net/spec/arm_v7/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/source.list b/repos/dde_linux/src/driver/usb_net/spec/arm_v7/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v7/source.list rename to repos/dde_linux/src/driver/usb_net/spec/arm_v7/source.list diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/target.mk b/repos/dde_linux/src/driver/usb_net/spec/arm_v7/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v7/target.mk rename to repos/dde_linux/src/driver/usb_net/spec/arm_v7/target.mk diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c b/repos/dde_linux/src/driver/usb_net/spec/arm_v8/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c rename to repos/dde_linux/src/driver/usb_net/spec/arm_v8/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/source.list b/repos/dde_linux/src/driver/usb_net/spec/arm_v8/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v8/source.list rename to repos/dde_linux/src/driver/usb_net/spec/arm_v8/source.list diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/target.mk b/repos/dde_linux/src/driver/usb_net/spec/arm_v8/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/arm_v8/target.mk rename to repos/dde_linux/src/driver/usb_net/spec/arm_v8/target.mk diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c b/repos/dde_linux/src/driver/usb_net/spec/x86_32/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c rename to repos/dde_linux/src/driver/usb_net/spec/x86_32/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_32/source.list b/repos/dde_linux/src/driver/usb_net/spec/x86_32/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_32/source.list rename to repos/dde_linux/src/driver/usb_net/spec/x86_32/source.list diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_32/target.mk b/repos/dde_linux/src/driver/usb_net/spec/x86_32/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_32/target.mk rename to repos/dde_linux/src/driver/usb_net/spec/x86_32/target.mk diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c b/repos/dde_linux/src/driver/usb_net/spec/x86_64/generated_dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c rename to repos/dde_linux/src/driver/usb_net/spec/x86_64/generated_dummies.c diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_64/source.list b/repos/dde_linux/src/driver/usb_net/spec/x86_64/source.list similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_64/source.list rename to repos/dde_linux/src/driver/usb_net/spec/x86_64/source.list diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_64/target.mk b/repos/dde_linux/src/driver/usb_net/spec/x86_64/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/spec/x86_64/target.mk rename to repos/dde_linux/src/driver/usb_net/spec/x86_64/target.mk diff --git a/repos/dde_linux/src/drivers/usb_net/target.inc b/repos/dde_linux/src/driver/usb_net/target.inc similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/target.inc rename to repos/dde_linux/src/driver/usb_net/target.inc diff --git a/repos/dde_linux/src/drivers/usb_net/usb_net.h b/repos/dde_linux/src/driver/usb_net/usb_net.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/usb_net.h rename to repos/dde_linux/src/driver/usb_net/usb_net.h diff --git a/repos/dde_linux/src/drivers/usb_net/wdm_terminal.cc b/repos/dde_linux/src/driver/usb_net/wdm_terminal.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_net/wdm_terminal.cc rename to repos/dde_linux/src/driver/usb_net/wdm_terminal.cc diff --git a/repos/dde_linux/src/drivers/wifi/README b/repos/dde_linux/src/driver/wifi/README similarity index 99% rename from repos/dde_linux/src/drivers/wifi/README rename to repos/dde_linux/src/driver/wifi/README index bcac549053..27fc8ce7a4 100644 --- a/repos/dde_linux/src/drivers/wifi/README +++ b/repos/dde_linux/src/driver/wifi/README @@ -195,6 +195,6 @@ used: !LIBS := base pc_wifi -Afterwards the driver library is built by the 'drivers/wifi' target and +Afterwards the driver library is built by the 'driver/wifi' target and since it is now a direct dependency 'tool/dde_linux/create_dummies' can by used to created the 'generated_dummies.c' file. diff --git a/repos/dde_linux/src/drivers/wifi/access_firmware.cc b/repos/dde_linux/src/driver/wifi/access_firmware.cc similarity index 100% rename from repos/dde_linux/src/drivers/wifi/access_firmware.cc rename to repos/dde_linux/src/driver/wifi/access_firmware.cc diff --git a/repos/dde_linux/src/drivers/wifi/access_firmware.h b/repos/dde_linux/src/driver/wifi/access_firmware.h similarity index 100% rename from repos/dde_linux/src/drivers/wifi/access_firmware.h rename to repos/dde_linux/src/driver/wifi/access_firmware.h diff --git a/repos/dde_linux/src/drivers/wifi/frontend.h b/repos/dde_linux/src/driver/wifi/frontend.h similarity index 100% rename from repos/dde_linux/src/drivers/wifi/frontend.h rename to repos/dde_linux/src/driver/wifi/frontend.h diff --git a/repos/dde_linux/src/drivers/wifi/main.cc b/repos/dde_linux/src/driver/wifi/main.cc similarity index 100% rename from repos/dde_linux/src/drivers/wifi/main.cc rename to repos/dde_linux/src/driver/wifi/main.cc diff --git a/repos/dde_linux/src/drivers/wifi/target.mk b/repos/dde_linux/src/driver/wifi/target.mk similarity index 100% rename from repos/dde_linux/src/drivers/wifi/target.mk rename to repos/dde_linux/src/driver/wifi/target.mk diff --git a/repos/dde_linux/src/drivers/wifi/util.h b/repos/dde_linux/src/driver/wifi/util.h similarity index 100% rename from repos/dde_linux/src/drivers/wifi/util.h rename to repos/dde_linux/src/driver/wifi/util.h diff --git a/repos/dde_linux/src/drivers/wifi/wpa.cc b/repos/dde_linux/src/driver/wifi/wpa.cc similarity index 100% rename from repos/dde_linux/src/drivers/wifi/wpa.cc rename to repos/dde_linux/src/driver/wifi/wpa.cc diff --git a/repos/dde_linux/src/drivers/wifi/wpa.h b/repos/dde_linux/src/driver/wifi/wpa.h similarity index 100% rename from repos/dde_linux/src/drivers/wifi/wpa.h rename to repos/dde_linux/src/driver/wifi/wpa.h diff --git a/repos/gems/recipes/pkg/backdrop/hash b/repos/gems/recipes/pkg/backdrop/hash index b66c4464ff..9c5c18fce5 100644 --- a/repos/gems/recipes/pkg/backdrop/hash +++ b/repos/gems/recipes/pkg/backdrop/hash @@ -1 +1 @@ -2024-05-28 4b784674f584121e8579233ddd3707f908a0d76b +2024-05-31 59af8218f8de3a28a40f38e46660d27514deeaf7 diff --git a/repos/gems/recipes/pkg/drivers_nic-pc/hash b/repos/gems/recipes/pkg/drivers_nic-pc/hash index bfd36675f2..518426b160 100644 --- a/repos/gems/recipes/pkg/drivers_nic-pc/hash +++ b/repos/gems/recipes/pkg/drivers_nic-pc/hash @@ -1 +1 @@ -2024-05-28 4a5c8bd7c90db766dda3c463fade021004e1e6e9 +2024-05-31 f26da21e131956f6958798c147926aca4adf790f diff --git a/repos/gems/recipes/pkg/fonts_fs/hash b/repos/gems/recipes/pkg/fonts_fs/hash index 12651684f0..b2edcb7023 100644 --- a/repos/gems/recipes/pkg/fonts_fs/hash +++ b/repos/gems/recipes/pkg/fonts_fs/hash @@ -1 +1 @@ -2024-05-28 8c758da5da46631da765f7181e035528da1c7a22 +2024-05-31 71ef4fe17850c32ede66b6e6e75db38697f4ffc2 diff --git a/repos/gems/recipes/pkg/sculpt/README b/repos/gems/recipes/pkg/sculpt/README index dbca0190bb..555d27342b 100644 --- a/repos/gems/recipes/pkg/sculpt/README +++ b/repos/gems/recipes/pkg/sculpt/README @@ -996,7 +996,7 @@ Block device A block-device resource allows for the block-level storage and retrieval of data whereas a block-device can be read-only or read-writeable. The base system's built-in block service hands out the devices listed at -_/report/drivers/block_devices_ according to the label of the client's session. +_/report/driver/block_devices_ according to the label of the client's session. The label must correspond to the name of the block device. Typically, the built-in block service is used via manually created launchers by using a route like this: diff --git a/repos/gems/recipes/raw/drivers_nic-pc/hash b/repos/gems/recipes/raw/drivers_nic-pc/hash index 56bd03961d..ed6aa4275b 100644 --- a/repos/gems/recipes/raw/drivers_nic-pc/hash +++ b/repos/gems/recipes/raw/drivers_nic-pc/hash @@ -1 +1 @@ -2023-11-30 7ccc0f1f63a8e332d27734bf9c63cfe4bf91bc59 +2024-05-31 5a7c5c6f5230cae8144d8ffcf8c21475425eed9b diff --git a/repos/gems/recipes/src/backdrop/hash b/repos/gems/recipes/src/backdrop/hash index 40a3fd29eb..7258796e39 100644 --- a/repos/gems/recipes/src/backdrop/hash +++ b/repos/gems/recipes/src/backdrop/hash @@ -1 +1 @@ -2024-05-28 14ec51c346687ec870ef10d3a4feab0e8235d987 +2024-05-31 5ee555b9d20a96a3621a6037f20e661e74f1e303 diff --git a/repos/gems/recipes/src/vfs_pipe/hash b/repos/gems/recipes/src/vfs_pipe/hash index adff8cbb50..24da8bffbc 100644 --- a/repos/gems/recipes/src/vfs_pipe/hash +++ b/repos/gems/recipes/src/vfs_pipe/hash @@ -1 +1 @@ -2024-05-28 260c0e5f8f72d5e5ed76217314152cc0b749bced +2024-05-31 0cea537d1bce4590804667dbee37324d8062676e diff --git a/repos/gems/recipes/src/vfs_ttf/hash b/repos/gems/recipes/src/vfs_ttf/hash index 69155c939d..febb501b3a 100644 --- a/repos/gems/recipes/src/vfs_ttf/hash +++ b/repos/gems/recipes/src/vfs_ttf/hash @@ -1 +1 @@ -2024-05-28 2018c9e7ca59407da3040a103595601a875263d6 +2024-05-31 14e926289d846db83ccb448f4b24053430bb0cb2 diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index ea611fc24f..8fcdaf5b4b 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -6,7 +6,7 @@ # # TODO: Add support for Linux via user-level networking (using the -# tun/tap proxy driver at os/src/drivers/nic/linux) +# tun/tap proxy driver at os/src/driver/nic/linux) # if {[have_spec linux]} { puts "Run script does not support Linux."; exit 0 } diff --git a/repos/libports/recipes/pkg/system_rtc-linux/hash b/repos/libports/recipes/pkg/system_rtc-linux/hash index 37d97257b2..765ce6de3a 100644 --- a/repos/libports/recipes/pkg/system_rtc-linux/hash +++ b/repos/libports/recipes/pkg/system_rtc-linux/hash @@ -1 +1 @@ -2024-05-28 6529912f49838710f7f2d47484c9f07feeb29d2a +2024-05-31 af78aef5f957b8eb50540e4bc68a1d2fe410402f diff --git a/repos/libports/recipes/pkg/system_rtc-pc/hash b/repos/libports/recipes/pkg/system_rtc-pc/hash index 15127f4414..b2653b1185 100644 --- a/repos/libports/recipes/pkg/system_rtc-pc/hash +++ b/repos/libports/recipes/pkg/system_rtc-pc/hash @@ -1 +1 @@ -2024-05-28 ccc38f87fbb58f622b4bf10bc410d80fd906c106 +2024-05-31 ec6ccef42b9df774b7ab911df980af198fd94a7a diff --git a/repos/libports/recipes/raw/system_rtc-linux/hash b/repos/libports/recipes/raw/system_rtc-linux/hash index 6a864e47eb..4ca4db5d66 100644 --- a/repos/libports/recipes/raw/system_rtc-linux/hash +++ b/repos/libports/recipes/raw/system_rtc-linux/hash @@ -1 +1 @@ -2020-03-04 33377547149acb36d446fd3c80cd5a9113cc8f8a +2024-05-31 2f2445e97bc5e1534c5b6cd91a972353e1d0e79d diff --git a/repos/libports/recipes/raw/system_rtc-pc/hash b/repos/libports/recipes/raw/system_rtc-pc/hash index 1b50fff0f2..2da7306212 100644 --- a/repos/libports/recipes/raw/system_rtc-pc/hash +++ b/repos/libports/recipes/raw/system_rtc-pc/hash @@ -1 +1 @@ -2020-03-04 f565dd1fb07048f70bf180b847dd57ba25aad3af +2024-05-31 024625e41de1b596828649524fd15968c8bd1915 diff --git a/repos/libports/recipes/src/libc/hash b/repos/libports/recipes/src/libc/hash index 2f49a27744..062ce04fa0 100644 --- a/repos/libports/recipes/src/libc/hash +++ b/repos/libports/recipes/src/libc/hash @@ -1 +1 @@ -2024-05-28 5ff5141d2751699f6f1c36c3853b492e84590d51 +2024-05-31 3258b1216a6e6745d41b9c344faf83d3d48cddec diff --git a/repos/libports/recipes/src/system_rtc/hash b/repos/libports/recipes/src/system_rtc/hash index c13a99f431..7dd22d4ab5 100644 --- a/repos/libports/recipes/src/system_rtc/hash +++ b/repos/libports/recipes/src/system_rtc/hash @@ -1 +1 @@ -2024-05-28 c1ceaa7af00fbaf8bb6b7848cc845dce59b2eae6 +2024-05-31 09ebb337f94d9e5287b92f0211a5e0c2363be2f2 diff --git a/repos/libports/recipes/src/vesa_fb/content.mk b/repos/libports/recipes/src/vesa_fb/content.mk index 48ce464b8c..dad902c5f8 100644 --- a/repos/libports/recipes/src/vesa_fb/content.mk +++ b/repos/libports/recipes/src/vesa_fb/content.mk @@ -1,4 +1,4 @@ -SRC_DIR := src/drivers/framebuffer/vesa +SRC_DIR := src/driver/framebuffer/vesa include $(GENODE_DIR)/repos/base/recipes/src/content.inc content: src/lib/x86emu include/x86emu lib/mk/x86emu.mk diff --git a/repos/libports/recipes/src/vesa_fb/hash b/repos/libports/recipes/src/vesa_fb/hash index 73c57695aa..0e9f50f245 100644 --- a/repos/libports/recipes/src/vesa_fb/hash +++ b/repos/libports/recipes/src/vesa_fb/hash @@ -1 +1 @@ -2024-05-28 b57f8af53c1818e200e722d8773d782d57998bca +2024-05-31 f54f0a83a597ed1969b356ad22c34ae392dfb1cf diff --git a/repos/libports/recipes/src/vfs_jitterentropy/hash b/repos/libports/recipes/src/vfs_jitterentropy/hash index a8a6e7e950..4f62be8787 100644 --- a/repos/libports/recipes/src/vfs_jitterentropy/hash +++ b/repos/libports/recipes/src/vfs_jitterentropy/hash @@ -1 +1 @@ -2024-05-28 8e89734a12d97daacb117d121b5bb14ac78192db +2024-05-31 ad91be7bfaf766e1f6b24cd6b66204b9aab74613 diff --git a/repos/libports/recipes/src/vfs_lwip/hash b/repos/libports/recipes/src/vfs_lwip/hash index 2309d5c9a1..f3737e6fe9 100644 --- a/repos/libports/recipes/src/vfs_lwip/hash +++ b/repos/libports/recipes/src/vfs_lwip/hash @@ -1 +1 @@ -2024-05-28 9f6aa2659896f96ae56c5f2ba63f797f875a952c +2024-05-31 a99386902506c6094897353793acab2ecd0e97a2 diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run index f262c31bfc..dcd8ce1585 100644 --- a/repos/libports/run/acpi_suspend.run +++ b/repos/libports/run/acpi_suspend.run @@ -507,14 +507,14 @@ build { server/report_rom server/dynamic_rom server/rom_filter - drivers/acpi - drivers/platform - drivers/framebuffer/intel/pc - drivers/framebuffer/vesa - drivers/framebuffer/boot - drivers/gpu/intel - drivers/ahci - drivers/nvme + driver/acpi + driver/platform + driver/framebuffer/intel/pc + driver/framebuffer/vesa + driver/framebuffer/boot + driver/gpu/intel + driver/ahci + driver/nvme app/acpica app/pci_decode app/block_tester diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index aae53acaad..336353ece0 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -9,8 +9,8 @@ if { set build_components { core init timer - drivers/platform - drivers/acpi + driver/platform + driver/acpi server/event_dump app/pci_decode app/acpica diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 5b0ceea553..327315ebef 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -14,7 +14,7 @@ # # TODO: Add support for Linux via user-level networking (using the -# tun/tap proxy driver at os/src/drivers/nic/linux) +# tun/tap proxy driver at os/src/driver/nic/linux) # if {[have_board linux] || diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index ebb71aa53d..1bb9d7d371 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -24,7 +24,7 @@ assert_spec linux build { core init timer lib/ld lib/libc lib/vfs lib/vfs_lwip - drivers/nic test/lwip/http_srv server/nic_router server/report_rom + driver/nic test/lwip/http_srv server/nic_router server/report_rom } create_boot_directory diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index 93849e4224..e1fb6160af 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -12,7 +12,7 @@ if {[have_include "power_on/qemu"]} { build { core init timer lib/ld lib/libc lib/vfs lib/posix lib/vfs_legacy_oss - drivers/acpi drivers/audio drivers/platform app/pci_decode + driver/acpi driver/audio driver/platform app/pci_decode server/report_rom test/oss } diff --git a/repos/libports/src/drivers/framebuffer/vesa/README b/repos/libports/src/driver/framebuffer/vesa/README similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/README rename to repos/libports/src/driver/framebuffer/vesa/README diff --git a/repos/libports/src/drivers/framebuffer/vesa/framebuffer.cc b/repos/libports/src/driver/framebuffer/vesa/framebuffer.cc similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/framebuffer.cc rename to repos/libports/src/driver/framebuffer/vesa/framebuffer.cc diff --git a/repos/libports/src/drivers/framebuffer/vesa/hw_emul.cc b/repos/libports/src/driver/framebuffer/vesa/hw_emul.cc similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/hw_emul.cc rename to repos/libports/src/driver/framebuffer/vesa/hw_emul.cc diff --git a/repos/libports/src/drivers/framebuffer/vesa/ifx86emu.cc b/repos/libports/src/driver/framebuffer/vesa/ifx86emu.cc similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/ifx86emu.cc rename to repos/libports/src/driver/framebuffer/vesa/ifx86emu.cc diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/framebuffer.h b/repos/libports/src/driver/framebuffer/vesa/include/framebuffer.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/framebuffer.h rename to repos/libports/src/driver/framebuffer/vesa/include/framebuffer.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/genode_env.h b/repos/libports/src/driver/framebuffer/vesa/include/genode_env.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/genode_env.h rename to repos/libports/src/driver/framebuffer/vesa/include/genode_env.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/hw_emul.h b/repos/libports/src/driver/framebuffer/vesa/include/hw_emul.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/hw_emul.h rename to repos/libports/src/driver/framebuffer/vesa/include/hw_emul.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/ifx86emu.h b/repos/libports/src/driver/framebuffer/vesa/include/ifx86emu.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/ifx86emu.h rename to repos/libports/src/driver/framebuffer/vesa/include/ifx86emu.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/vbe.h b/repos/libports/src/driver/framebuffer/vesa/include/vbe.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/vbe.h rename to repos/libports/src/driver/framebuffer/vesa/include/vbe.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/include/vesa.h b/repos/libports/src/driver/framebuffer/vesa/include/vesa.h similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/include/vesa.h rename to repos/libports/src/driver/framebuffer/vesa/include/vesa.h diff --git a/repos/libports/src/drivers/framebuffer/vesa/main.cc b/repos/libports/src/driver/framebuffer/vesa/main.cc similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/main.cc rename to repos/libports/src/driver/framebuffer/vesa/main.cc diff --git a/repos/libports/src/drivers/framebuffer/vesa/target.mk b/repos/libports/src/driver/framebuffer/vesa/target.mk similarity index 100% rename from repos/libports/src/drivers/framebuffer/vesa/target.mk rename to repos/libports/src/driver/framebuffer/vesa/target.mk diff --git a/repos/os/lib/import/import-nic_driver.mk b/repos/os/lib/import/import-nic_driver.mk index e9d49b5c35..f7a1eb59f5 100644 --- a/repos/os/lib/import/import-nic_driver.mk +++ b/repos/os/lib/import/import-nic_driver.mk @@ -1 +1 @@ -REP_INC_DIR += src/drivers/nic/include +REP_INC_DIR += src/driver/nic/include diff --git a/repos/os/recipes/api/gui_session/hash b/repos/os/recipes/api/gui_session/hash index 9fdcd0c891..ea5a9e6e58 100644 --- a/repos/os/recipes/api/gui_session/hash +++ b/repos/os/recipes/api/gui_session/hash @@ -1 +1 @@ -2024-05-28 3ceb85823453c5df372c642edad75f52fd49107f +2024-05-31 bbef606fc5bcebe14fc532a1c9c9977430401d35 diff --git a/repos/os/recipes/api/nic_driver/content.mk b/repos/os/recipes/api/nic_driver/content.mk index 6b395e271a..a7a41f8a97 100644 --- a/repos/os/recipes/api/nic_driver/content.mk +++ b/repos/os/recipes/api/nic_driver/content.mk @@ -1,5 +1,5 @@ MIRROR_FROM_REP_DIR := \ - src/drivers/nic/include \ + src/driver/nic/include \ lib/mk/nic_driver.mk \ lib/import/import-nic_driver.mk diff --git a/repos/os/recipes/api/os/hash b/repos/os/recipes/api/os/hash index 9d296f3d61..331344011b 100644 --- a/repos/os/recipes/api/os/hash +++ b/repos/os/recipes/api/os/hash @@ -1 +1 @@ -2024-05-28 fef10dd5a3269022095745efa0f7e7c994ea5aff +2024-05-31 50cdf9dbda207767effe3f7c2616683f9a7927c8 diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/hash b/repos/os/recipes/pkg/drivers_interactive-pc/hash index d4c263ef85..af9b02a3a4 100644 --- a/repos/os/recipes/pkg/drivers_interactive-pc/hash +++ b/repos/os/recipes/pkg/drivers_interactive-pc/hash @@ -1 +1 @@ -2024-05-28 db956eedb4683a2349e3a1cbbc748a5de6992a71 +2024-05-31 0e6099d23dc6f6a480f3c142799babf66f70a22b diff --git a/repos/os/recipes/pkg/drivers_nic-linux/hash b/repos/os/recipes/pkg/drivers_nic-linux/hash index 903d77a460..62f92112ea 100644 --- a/repos/os/recipes/pkg/drivers_nic-linux/hash +++ b/repos/os/recipes/pkg/drivers_nic-linux/hash @@ -1 +1 @@ -2024-05-28 96b0cbc810a614327d8a1acf9a937f16a35b2a03 +2024-05-31 9c580958855f2b2f6710f380c03efe6a384ca1b8 diff --git a/repos/os/recipes/raw/drivers_interactive-pc/hash b/repos/os/recipes/raw/drivers_interactive-pc/hash index 2e8b565936..18fbcbd738 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/hash +++ b/repos/os/recipes/raw/drivers_interactive-pc/hash @@ -1 +1 @@ -2024-05-28 f5d1cbdf6b370cce0bbfed6906eabdaf201a44cf +2024-05-31 3b812ff0ef1a32aee51a7427375e067d3f08c6db diff --git a/repos/os/recipes/raw/drivers_nic-linux/hash b/repos/os/recipes/raw/drivers_nic-linux/hash index 8968f4f065..069e05970a 100644 --- a/repos/os/recipes/raw/drivers_nic-linux/hash +++ b/repos/os/recipes/raw/drivers_nic-linux/hash @@ -1 +1 @@ -2021-05-27 a6d8d6108a5f196d9c0de0e2213a60a3ceca2a02 +2024-05-31 30ea0f2da452ac9190959d32f7637162331682a1 diff --git a/repos/os/recipes/src/acpi/content.mk b/repos/os/recipes/src/acpi/content.mk index f162d436d6..7a9fe52e49 100644 --- a/repos/os/recipes/src/acpi/content.mk +++ b/repos/os/recipes/src/acpi/content.mk @@ -1,4 +1,4 @@ -SRC_DIR = src/drivers/acpi +SRC_DIR = src/driver/acpi include $(GENODE_DIR)/repos/base/recipes/src/content.inc content: $(GENODE_DIR)/repos/os/include/smbios diff --git a/repos/os/recipes/src/acpi/hash b/repos/os/recipes/src/acpi/hash index 123d6f253a..3176a25d35 100644 --- a/repos/os/recipes/src/acpi/hash +++ b/repos/os/recipes/src/acpi/hash @@ -1 +1 @@ -2024-05-28 696e96adb49cf768c221b778c82468aaef1fa298 +2024-05-31 4778e93d68302cf68c05419f4793ad3432956dfe diff --git a/repos/os/recipes/src/ahci/content.mk b/repos/os/recipes/src/ahci/content.mk index 4ef6184230..fabdfa37c9 100644 --- a/repos/os/recipes/src/ahci/content.mk +++ b/repos/os/recipes/src/ahci/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/ahci +SRC_DIR = src/driver/ahci include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/boot_fb/content.mk b/repos/os/recipes/src/boot_fb/content.mk index 4da74587c8..2434812958 100644 --- a/repos/os/recipes/src/boot_fb/content.mk +++ b/repos/os/recipes/src/boot_fb/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/framebuffer/boot +SRC_DIR = src/driver/framebuffer/boot include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/dummy_rtc/content.mk b/repos/os/recipes/src/dummy_rtc/content.mk index bb9eff50b5..e398bfd982 100644 --- a/repos/os/recipes/src/dummy_rtc/content.mk +++ b/repos/os/recipes/src/dummy_rtc/content.mk @@ -1,8 +1,8 @@ -SRC_DIR = src/drivers/rtc/dummy +SRC_DIR = src/driver/rtc/dummy include $(GENODE_DIR)/repos/base/recipes/src/content.inc -CONTENT = src/drivers/rtc/README src/drivers/rtc/rtc.h src/drivers/rtc/main.cc \ - src/drivers/rtc/target.inc +CONTENT = src/driver/rtc/README src/driver/rtc/rtc.h src/driver/rtc/main.cc \ + src/driver/rtc/target.inc content: $(CONTENT) diff --git a/repos/os/recipes/src/event_filter/hash b/repos/os/recipes/src/event_filter/hash index 3f939c3d41..4689424142 100644 --- a/repos/os/recipes/src/event_filter/hash +++ b/repos/os/recipes/src/event_filter/hash @@ -1 +1 @@ -2024-05-28 10e77f2a993606efea601e7ee2ef98a2e18057ce +2024-05-31 ee19a86a075bc1aeb9271c76ceacfcdb1320531f diff --git a/repos/os/recipes/src/fb_sdl/content.mk b/repos/os/recipes/src/fb_sdl/content.mk index efd634af7a..dfd1c2596e 100644 --- a/repos/os/recipes/src/fb_sdl/content.mk +++ b/repos/os/recipes/src/fb_sdl/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/framebuffer/sdl +SRC_DIR = src/driver/framebuffer/sdl include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/init/hash b/repos/os/recipes/src/init/hash index f2afc237e5..f5d8fb033e 100644 --- a/repos/os/recipes/src/init/hash +++ b/repos/os/recipes/src/init/hash @@ -1 +1 @@ -2024-05-28 2836c3332336285f245dce7223588f2f49ea3dfb +2024-05-31 9aafd603f570e47c40a6af347bd22d04e7b5b24b diff --git a/repos/os/recipes/src/intel_gpu/content.mk b/repos/os/recipes/src/intel_gpu/content.mk index 6254f27d6d..dea618d7ba 100644 --- a/repos/os/recipes/src/intel_gpu/content.mk +++ b/repos/os/recipes/src/intel_gpu/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/gpu/intel +SRC_DIR = src/driver/gpu/intel include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/lan9118_nic/content.mk b/repos/os/recipes/src/lan9118_nic/content.mk index a42e860b24..08136d7a0a 100644 --- a/repos/os/recipes/src/lan9118_nic/content.mk +++ b/repos/os/recipes/src/lan9118_nic/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/nic/lan9118 +SRC_DIR = src/driver/nic/lan9118 include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/linux_nic/content.mk b/repos/os/recipes/src/linux_nic/content.mk index bd2c99afd8..661be9cc87 100644 --- a/repos/os/recipes/src/linux_nic/content.mk +++ b/repos/os/recipes/src/linux_nic/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/nic/spec/linux +SRC_DIR = src/driver/nic/spec/linux include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/linux_nic/hash b/repos/os/recipes/src/linux_nic/hash index 39b9984362..b6c45fa7cc 100644 --- a/repos/os/recipes/src/linux_nic/hash +++ b/repos/os/recipes/src/linux_nic/hash @@ -1 +1 @@ -2024-05-28 70db6e40823d1a52f16428ede53e5e9ee8088217 +2024-05-31 92acc606128af666685f4aaaf971d1eda0d26cba diff --git a/repos/os/recipes/src/linux_rtc/content.mk b/repos/os/recipes/src/linux_rtc/content.mk index d2ecc213fc..e6e6aaf088 100644 --- a/repos/os/recipes/src/linux_rtc/content.mk +++ b/repos/os/recipes/src/linux_rtc/content.mk @@ -1,8 +1,8 @@ -SRC_DIR = src/drivers/rtc/spec/linux +SRC_DIR = src/driver/rtc/spec/linux include $(GENODE_DIR)/repos/base/recipes/src/content.inc -CONTENT = src/drivers/rtc/README src/drivers/rtc/rtc.h src/drivers/rtc/main.cc \ - src/drivers/rtc/target.inc +CONTENT = src/driver/rtc/README src/driver/rtc/rtc.h src/driver/rtc/main.cc \ + src/driver/rtc/target.inc content: $(CONTENT) diff --git a/repos/os/recipes/src/linux_rtc/hash b/repos/os/recipes/src/linux_rtc/hash index 09d68ccffd..9feb46aa9c 100644 --- a/repos/os/recipes/src/linux_rtc/hash +++ b/repos/os/recipes/src/linux_rtc/hash @@ -1 +1 @@ -2024-05-28 e817ded2b90b9ef8ab60b06d1a8d2210d5032957 +2024-05-31 926e6f607fcdb0fd53921ff40c1db6129d6a4ec7 diff --git a/repos/os/recipes/src/nic_router/hash b/repos/os/recipes/src/nic_router/hash index 2d1ed2a8c2..6e489a50d7 100644 --- a/repos/os/recipes/src/nic_router/hash +++ b/repos/os/recipes/src/nic_router/hash @@ -1 +1 @@ -2024-05-28 880be7cf4f78d1289fcbdd2d5f42d18034b24579 +2024-05-31 42e1be1eb407888d566c3388501da149dcb81382 diff --git a/repos/os/recipes/src/nit_focus/hash b/repos/os/recipes/src/nit_focus/hash index 83be10e991..891a3f4f0a 100644 --- a/repos/os/recipes/src/nit_focus/hash +++ b/repos/os/recipes/src/nit_focus/hash @@ -1 +1 @@ -2024-05-28 ab6bbc40e1c1f4c3d2dbd20e9a5dcfbba526b901 +2024-05-31 0eba8152620cef8eb023114e4f412ded307c9a95 diff --git a/repos/os/recipes/src/nitpicker/hash b/repos/os/recipes/src/nitpicker/hash index fcacc0f96d..cb715787f5 100644 --- a/repos/os/recipes/src/nitpicker/hash +++ b/repos/os/recipes/src/nitpicker/hash @@ -1 +1 @@ -2024-05-28 3572db55313b90cdd3011fe53bcbd0efc389e0bd +2024-05-31 130c2c9dafaf2fb97856cea7554524c7cd55f618 diff --git a/repos/os/recipes/src/nvme/content.mk b/repos/os/recipes/src/nvme/content.mk index 05b9d866e4..6810df1eed 100644 --- a/repos/os/recipes/src/nvme/content.mk +++ b/repos/os/recipes/src/nvme/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/nvme +SRC_DIR = src/driver/nvme include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/pbxa9_drivers/content.mk b/repos/os/recipes/src/pbxa9_drivers/content.mk index bbf6ffb774..91f38a56ca 100644 --- a/repos/os/recipes/src/pbxa9_drivers/content.mk +++ b/repos/os/recipes/src/pbxa9_drivers/content.mk @@ -4,6 +4,6 @@ content: src/drivers src/drivers: mkdir -p $@/framebuffer $@/ps2 - cp -r $(REP_DIR)/src/drivers/framebuffer/pl11x/* $@/framebuffer - cp $(REP_DIR)/src/drivers/ps2/*.h $@/ps2/ - cp -r $(REP_DIR)/src/drivers/ps2/pl050 $@/ps2/ + cp -r $(REP_DIR)/src/driver/framebuffer/pl11x/* $@/framebuffer + cp $(REP_DIR)/src/driver/ps2/*.h $@/ps2/ + cp -r $(REP_DIR)/src/driver/ps2/pl050 $@/ps2/ diff --git a/repos/os/recipes/src/pc_rtc/content.mk b/repos/os/recipes/src/pc_rtc/content.mk index 6b94827cfb..195fcb58d0 100644 --- a/repos/os/recipes/src/pc_rtc/content.mk +++ b/repos/os/recipes/src/pc_rtc/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/rtc +SRC_DIR = src/driver/rtc include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/pc_rtc/hash b/repos/os/recipes/src/pc_rtc/hash index f3c02bd073..51f9025116 100644 --- a/repos/os/recipes/src/pc_rtc/hash +++ b/repos/os/recipes/src/pc_rtc/hash @@ -1 +1 @@ -2024-05-28 5b68f803e8118b5d87431263a5d4cdf77809a8ca +2024-05-31 4b64b16b100781b7d5f6ee535406a68fe1e5ea48 diff --git a/repos/os/recipes/src/pci_decode/hash b/repos/os/recipes/src/pci_decode/hash index 91ea754997..18de5eedcb 100644 --- a/repos/os/recipes/src/pci_decode/hash +++ b/repos/os/recipes/src/pci_decode/hash @@ -1 +1 @@ -2024-05-28 f41e01b16d8c6ac4aa85df7ce96d20e891c8ecc3 +2024-05-31 273db9e1c6e5d726760578781f065f8e9ed7045d diff --git a/repos/os/recipes/src/platform/content.inc b/repos/os/recipes/src/platform/content.inc index 23684efa08..3528ba0f3d 100644 --- a/repos/os/recipes/src/platform/content.inc +++ b/repos/os/recipes/src/platform/content.inc @@ -1,10 +1,10 @@ include $(GENODE_DIR)/repos/base/recipes/src/content.inc -GENERIC_SRC_DIR := $(GENODE_DIR)/repos/os/src/drivers/platform +GENERIC_SRC_DIR := $(GENODE_DIR)/repos/os/src/driver/platform GENERIC_SRC_FILES := $(filter-out target.mk,$(filter-out main.cc,$(notdir $(wildcard $(GENERIC_SRC_DIR)/*.*)))) -MIRROR_FROM_OS_DIR := $(addprefix src/drivers/platform/,$(GENERIC_SRC_FILES)) +MIRROR_FROM_OS_DIR := $(addprefix src/driver/platform/,$(GENERIC_SRC_FILES)) content: $(MIRROR_FROM_OS_DIR) diff --git a/repos/os/recipes/src/platform/content.mk b/repos/os/recipes/src/platform/content.mk index 79c59d53c1..b0a2c88dc1 100644 --- a/repos/os/recipes/src/platform/content.mk +++ b/repos/os/recipes/src/platform/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/platform +SRC_DIR = src/driver/platform include $(GENODE_DIR)/repos/os/recipes/src/platform/content.inc diff --git a/repos/os/recipes/src/platform/hash b/repos/os/recipes/src/platform/hash index 21b675f5f4..61f628bc9a 100644 --- a/repos/os/recipes/src/platform/hash +++ b/repos/os/recipes/src/platform/hash @@ -1 +1 @@ -2024-05-28 1c534a871646b5d3adc303b21928bd37d2eab3da +2024-05-31 bd0f6a87290df481be245c04de093fc740901bf1 diff --git a/repos/os/recipes/src/ps2/content.mk b/repos/os/recipes/src/ps2/content.mk index b6dc8f6673..c6b029be7f 100644 --- a/repos/os/recipes/src/ps2/content.mk +++ b/repos/os/recipes/src/ps2/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/ps2 +SRC_DIR = src/driver/ps2 include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/ps2/hash b/repos/os/recipes/src/ps2/hash index cba913e0e0..dbdcb1b0a9 100644 --- a/repos/os/recipes/src/ps2/hash +++ b/repos/os/recipes/src/ps2/hash @@ -1 +1 @@ -2024-05-28 c6d566ebac89846eaafbf655ee46750244437a66 +2024-05-31 80a2c0924c7dce40f0dc8a6653a2e8c6d5a77616 diff --git a/repos/os/recipes/src/report_rom/hash b/repos/os/recipes/src/report_rom/hash index dc11b58c77..32792339e1 100644 --- a/repos/os/recipes/src/report_rom/hash +++ b/repos/os/recipes/src/report_rom/hash @@ -1 +1 @@ -2024-05-28 647cf340e0bb7a5920e8817544fc2facf5b0e47c +2024-05-31 7058586c7c8c262087878e010d1de44bd2642a56 diff --git a/repos/os/recipes/src/rom_filter/hash b/repos/os/recipes/src/rom_filter/hash index 3ce3817c16..bdd634b11f 100644 --- a/repos/os/recipes/src/rom_filter/hash +++ b/repos/os/recipes/src/rom_filter/hash @@ -1 +1 @@ -2024-05-28 310586fb8223b6d0fd3f756fd01ef671cb6fb913 +2024-05-31 0fb5bbe889dd845af090df6a3b0c7fa42c609cf7 diff --git a/repos/os/recipes/src/usb_block/content.mk b/repos/os/recipes/src/usb_block/content.mk index ebc3717201..3273b5d664 100644 --- a/repos/os/recipes/src/usb_block/content.mk +++ b/repos/os/recipes/src/usb_block/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/usb_block +SRC_DIR = src/driver/usb_block include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/vfs/hash b/repos/os/recipes/src/vfs/hash index 4a4749cdb4..6b6080e014 100644 --- a/repos/os/recipes/src/vfs/hash +++ b/repos/os/recipes/src/vfs/hash @@ -1 +1 @@ -2024-05-28 cf0524586af7991ca338408ad5bc6280896d3613 +2024-05-31 ac82a7f352ff79418f94f43b88856322b77adbe6 diff --git a/repos/os/recipes/src/virt_qemu_drivers/content.mk b/repos/os/recipes/src/virt_qemu_drivers/content.mk index bce2ccada9..780a92fd48 100644 --- a/repos/os/recipes/src/virt_qemu_drivers/content.mk +++ b/repos/os/recipes/src/virt_qemu_drivers/content.mk @@ -4,4 +4,4 @@ content: src/drivers src/drivers: mkdir -p $@/framebuffer - cp -r $(REP_DIR)/src/drivers/framebuffer/ram/* $@/framebuffer + cp -r $(REP_DIR)/src/driver/framebuffer/ram/* $@/framebuffer diff --git a/repos/os/recipes/src/virtdev_rom/content.mk b/repos/os/recipes/src/virtdev_rom/content.mk index 9307f711ae..a6b9c48e18 100644 --- a/repos/os/recipes/src/virtdev_rom/content.mk +++ b/repos/os/recipes/src/virtdev_rom/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/virtdev_rom +SRC_DIR = src/driver/virtdev_rom include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/virtio_fb/content.mk b/repos/os/recipes/src/virtio_fb/content.mk index 44917f3a41..6a571d0fbd 100644 --- a/repos/os/recipes/src/virtio_fb/content.mk +++ b/repos/os/recipes/src/virtio_fb/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/framebuffer/virtio +SRC_DIR = src/driver/framebuffer/virtio include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/virtio_input/content.mk b/repos/os/recipes/src/virtio_input/content.mk index af681f7e1f..d31fee2960 100644 --- a/repos/os/recipes/src/virtio_input/content.mk +++ b/repos/os/recipes/src/virtio_input/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/input/virtio +SRC_DIR = src/driver/input/virtio include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/virtio_nic/content.mk b/repos/os/recipes/src/virtio_nic/content.mk index e61c9b01d1..1d76fdddb3 100644 --- a/repos/os/recipes/src/virtio_nic/content.mk +++ b/repos/os/recipes/src/virtio_nic/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/nic/virtio +SRC_DIR = src/driver/nic/virtio include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/run/ahci_block.run b/repos/os/run/ahci_block.run index 71917767c0..be331b6525 100644 --- a/repos/os/run/ahci_block.run +++ b/repos/os/run/ahci_block.run @@ -3,9 +3,9 @@ assert_spec x86 create_boot_directory build { core init timer lib/ld - drivers/platform - drivers/acpi - drivers/ahci + driver/platform + driver/acpi + driver/ahci app/pci_decode server/report_rom app/block_tester diff --git a/repos/os/run/i2c_mcp9808.run b/repos/os/run/i2c_mcp9808.run index 495c841bae..e21a3a4160 100644 --- a/repos/os/run/i2c_mcp9808.run +++ b/repos/os/run/i2c_mcp9808.run @@ -9,7 +9,7 @@ import_from_depot [depot_user]/src/platform build { core timer - drivers/i2c + driver/i2c test/i2c_mcp9808 } diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index ac5388f8f0..00c5a1dd2c 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -5,9 +5,9 @@ if {[have_include "power_on/qemu"]} { build { core init timer lib/ld - drivers/audio - drivers/platform - drivers/acpi + driver/audio + driver/platform + driver/acpi server/mixer server/dynamic_rom server/report_rom diff --git a/repos/os/run/monitor_gdb.inc b/repos/os/run/monitor_gdb.inc index 58eb170a89..94c7b75331 100644 --- a/repos/os/run/monitor_gdb.inc +++ b/repos/os/run/monitor_gdb.inc @@ -25,7 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ set build_components { lib/ld test/monitor_gdb test/log } if {[have_include power_on/qemu]} { - append build_components { drivers/uart } + append build_components { driver/uart } } else { import_from_depot [depot_user]/pkg/[drivers_nic_pkg] \ [depot_user]/src/nic_router \ diff --git a/repos/os/run/nvme.run b/repos/os/run/nvme.run index cf39c1474e..64920c510f 100644 --- a/repos/os/run/nvme.run +++ b/repos/os/run/nvme.run @@ -50,9 +50,9 @@ set build_components { core init timer lib/ld server/report_rom app/pci_decode - drivers/acpi - drivers/platform - drivers/nvme + driver/acpi + driver/platform + driver/nvme app/block_tester } diff --git a/repos/os/run/pointer.run b/repos/os/run/pointer.run index e4e31c9ff6..d796d5f3ff 100644 --- a/repos/os/run/pointer.run +++ b/repos/os/run/pointer.run @@ -2,7 +2,7 @@ assert_spec linux build { core init timer lib/ld - drivers/framebuffer + driver/framebuffer server/report_rom server/dynamic_rom server/nitpicker diff --git a/repos/os/run/sd_card.run b/repos/os/run/sd_card.run index 6a69c20f59..5926adf44d 100644 --- a/repos/os/run/sd_card.run +++ b/repos/os/run/sd_card.run @@ -9,7 +9,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/platform \ [depot_user]/raw/pbxa9-devices -build { drivers/sd_card app/block_tester } +build { driver/sd_card app/block_tester } install_config { diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run index f182fa2234..5ecc175979 100644 --- a/repos/os/run/sd_card_bench.run +++ b/repos/os/run/sd_card_bench.run @@ -79,7 +79,7 @@ install_config { file copy [select_from_repositories board/[board]/devices] [run_dir]/genode/devices -build { drivers/sd_card } +build { driver/sd_card } build_boot_image [build_artifacts] diff --git a/repos/os/run/smbios_decoder.run b/repos/os/run/smbios_decoder.run index f341f25a73..1305ef2895 100644 --- a/repos/os/run/smbios_decoder.run +++ b/repos/os/run/smbios_decoder.run @@ -5,7 +5,7 @@ if {![have_board pc] || [expr ![have_spec nova] && ![have_spec hw]] } { exit 0 } -build { core init timer lib/ld drivers/acpi server/report_rom app/smbios_decoder } +build { core init timer lib/ld driver/acpi server/report_rom app/smbios_decoder } create_boot_directory diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 188117de2f..1a65f852d1 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -78,7 +78,7 @@ proc precise_ref_time { } { return true } -build { core init lib/ld drivers/platform timer test/timeout } +build { core init lib/ld driver/platform timer test/timeout } # # Boot image diff --git a/repos/os/run/uart.run b/repos/os/run/uart.run index aa84fc57f2..34ca6ad89f 100644 --- a/repos/os/run/uart.run +++ b/repos/os/run/uart.run @@ -3,7 +3,7 @@ if { ![have_board pbxa9] } { exit 0 } -build { core init timer lib/ld drivers/uart test/uart } +build { core init timer lib/ld driver/uart test/uart } create_boot_directory diff --git a/repos/os/src/drivers/acpi/README b/repos/os/src/driver/acpi/README similarity index 100% rename from repos/os/src/drivers/acpi/README rename to repos/os/src/driver/acpi/README diff --git a/repos/os/src/drivers/acpi/acpi.cc b/repos/os/src/driver/acpi/acpi.cc similarity index 100% rename from repos/os/src/drivers/acpi/acpi.cc rename to repos/os/src/driver/acpi/acpi.cc diff --git a/repos/os/src/drivers/acpi/acpi.h b/repos/os/src/driver/acpi/acpi.h similarity index 100% rename from repos/os/src/drivers/acpi/acpi.h rename to repos/os/src/driver/acpi/acpi.h diff --git a/repos/os/src/drivers/acpi/efi_system_table.h b/repos/os/src/driver/acpi/efi_system_table.h similarity index 100% rename from repos/os/src/drivers/acpi/efi_system_table.h rename to repos/os/src/driver/acpi/efi_system_table.h diff --git a/repos/os/src/drivers/acpi/intel_opregion.cc b/repos/os/src/driver/acpi/intel_opregion.cc similarity index 100% rename from repos/os/src/drivers/acpi/intel_opregion.cc rename to repos/os/src/driver/acpi/intel_opregion.cc diff --git a/repos/os/src/drivers/acpi/intel_opregion.h b/repos/os/src/driver/acpi/intel_opregion.h similarity index 100% rename from repos/os/src/drivers/acpi/intel_opregion.h rename to repos/os/src/driver/acpi/intel_opregion.h diff --git a/repos/os/src/drivers/acpi/main.cc b/repos/os/src/driver/acpi/main.cc similarity index 100% rename from repos/os/src/drivers/acpi/main.cc rename to repos/os/src/driver/acpi/main.cc diff --git a/repos/os/src/drivers/acpi/memory.h b/repos/os/src/driver/acpi/memory.h similarity index 100% rename from repos/os/src/drivers/acpi/memory.h rename to repos/os/src/driver/acpi/memory.h diff --git a/repos/os/src/drivers/acpi/smbios_table_reporter.cc b/repos/os/src/driver/acpi/smbios_table_reporter.cc similarity index 100% rename from repos/os/src/drivers/acpi/smbios_table_reporter.cc rename to repos/os/src/driver/acpi/smbios_table_reporter.cc diff --git a/repos/os/src/drivers/acpi/smbios_table_reporter.h b/repos/os/src/driver/acpi/smbios_table_reporter.h similarity index 100% rename from repos/os/src/drivers/acpi/smbios_table_reporter.h rename to repos/os/src/driver/acpi/smbios_table_reporter.h diff --git a/repos/os/src/drivers/acpi/spec/x86/target.mk b/repos/os/src/driver/acpi/spec/x86/target.mk similarity index 100% rename from repos/os/src/drivers/acpi/spec/x86/target.mk rename to repos/os/src/driver/acpi/spec/x86/target.mk diff --git a/repos/os/src/drivers/ahci/README b/repos/os/src/driver/ahci/README similarity index 100% rename from repos/os/src/drivers/ahci/README rename to repos/os/src/driver/ahci/README diff --git a/repos/os/src/drivers/ahci/ahci.h b/repos/os/src/driver/ahci/ahci.h similarity index 100% rename from repos/os/src/drivers/ahci/ahci.h rename to repos/os/src/driver/ahci/ahci.h diff --git a/repos/os/src/drivers/ahci/ata_protocol.h b/repos/os/src/driver/ahci/ata_protocol.h similarity index 100% rename from repos/os/src/drivers/ahci/ata_protocol.h rename to repos/os/src/driver/ahci/ata_protocol.h diff --git a/repos/os/src/drivers/ahci/atapi_protocol.h b/repos/os/src/driver/ahci/atapi_protocol.h similarity index 100% rename from repos/os/src/drivers/ahci/atapi_protocol.h rename to repos/os/src/driver/ahci/atapi_protocol.h diff --git a/repos/os/src/drivers/ahci/main.cc b/repos/os/src/driver/ahci/main.cc similarity index 100% rename from repos/os/src/drivers/ahci/main.cc rename to repos/os/src/driver/ahci/main.cc diff --git a/repos/os/src/drivers/ahci/target.mk b/repos/os/src/driver/ahci/target.mk similarity index 100% rename from repos/os/src/drivers/ahci/target.mk rename to repos/os/src/driver/ahci/target.mk diff --git a/repos/os/src/drivers/ahci/util.h b/repos/os/src/driver/ahci/util.h similarity index 100% rename from repos/os/src/drivers/ahci/util.h rename to repos/os/src/driver/ahci/util.h diff --git a/repos/os/src/drivers/audio/spec/linux/alsa.c b/repos/os/src/driver/audio/spec/linux/alsa.c similarity index 100% rename from repos/os/src/drivers/audio/spec/linux/alsa.c rename to repos/os/src/driver/audio/spec/linux/alsa.c diff --git a/repos/os/src/drivers/audio/spec/linux/alsa.h b/repos/os/src/driver/audio/spec/linux/alsa.h similarity index 100% rename from repos/os/src/drivers/audio/spec/linux/alsa.h rename to repos/os/src/driver/audio/spec/linux/alsa.h diff --git a/repos/os/src/drivers/audio/spec/linux/main.cc b/repos/os/src/driver/audio/spec/linux/main.cc similarity index 100% rename from repos/os/src/drivers/audio/spec/linux/main.cc rename to repos/os/src/driver/audio/spec/linux/main.cc diff --git a/repos/os/src/drivers/audio/spec/linux/target.mk b/repos/os/src/driver/audio/spec/linux/target.mk similarity index 100% rename from repos/os/src/drivers/audio/spec/linux/target.mk rename to repos/os/src/driver/audio/spec/linux/target.mk diff --git a/repos/os/src/drivers/framebuffer/boot/README b/repos/os/src/driver/framebuffer/boot/README similarity index 100% rename from repos/os/src/drivers/framebuffer/boot/README rename to repos/os/src/driver/framebuffer/boot/README diff --git a/repos/os/src/drivers/framebuffer/boot/main.cc b/repos/os/src/driver/framebuffer/boot/main.cc similarity index 100% rename from repos/os/src/drivers/framebuffer/boot/main.cc rename to repos/os/src/driver/framebuffer/boot/main.cc diff --git a/repos/os/src/drivers/framebuffer/boot/target.mk b/repos/os/src/driver/framebuffer/boot/target.mk similarity index 100% rename from repos/os/src/drivers/framebuffer/boot/target.mk rename to repos/os/src/driver/framebuffer/boot/target.mk diff --git a/repos/os/src/drivers/framebuffer/pl11x/main.cc b/repos/os/src/driver/framebuffer/pl11x/main.cc similarity index 100% rename from repos/os/src/drivers/framebuffer/pl11x/main.cc rename to repos/os/src/driver/framebuffer/pl11x/main.cc diff --git a/repos/os/src/drivers/framebuffer/pl11x/target.mk b/repos/os/src/driver/framebuffer/pl11x/target.mk similarity index 100% rename from repos/os/src/drivers/framebuffer/pl11x/target.mk rename to repos/os/src/driver/framebuffer/pl11x/target.mk diff --git a/repos/os/src/drivers/framebuffer/ram/README b/repos/os/src/driver/framebuffer/ram/README similarity index 100% rename from repos/os/src/drivers/framebuffer/ram/README rename to repos/os/src/driver/framebuffer/ram/README diff --git a/repos/os/src/drivers/framebuffer/ram/main.cc b/repos/os/src/driver/framebuffer/ram/main.cc similarity index 100% rename from repos/os/src/drivers/framebuffer/ram/main.cc rename to repos/os/src/driver/framebuffer/ram/main.cc diff --git a/repos/os/src/drivers/framebuffer/ram/target.mk b/repos/os/src/driver/framebuffer/ram/target.mk similarity index 100% rename from repos/os/src/drivers/framebuffer/ram/target.mk rename to repos/os/src/driver/framebuffer/ram/target.mk diff --git a/repos/os/src/drivers/framebuffer/sdl/convert_keycode.h b/repos/os/src/driver/framebuffer/sdl/convert_keycode.h similarity index 100% rename from repos/os/src/drivers/framebuffer/sdl/convert_keycode.h rename to repos/os/src/driver/framebuffer/sdl/convert_keycode.h diff --git a/repos/os/src/drivers/framebuffer/sdl/main.cc b/repos/os/src/driver/framebuffer/sdl/main.cc similarity index 100% rename from repos/os/src/drivers/framebuffer/sdl/main.cc rename to repos/os/src/driver/framebuffer/sdl/main.cc diff --git a/repos/os/src/drivers/framebuffer/sdl/target.mk b/repos/os/src/driver/framebuffer/sdl/target.mk similarity index 100% rename from repos/os/src/drivers/framebuffer/sdl/target.mk rename to repos/os/src/driver/framebuffer/sdl/target.mk diff --git a/repos/os/src/drivers/framebuffer/virtio/component.h b/repos/os/src/driver/framebuffer/virtio/component.h similarity index 100% rename from repos/os/src/drivers/framebuffer/virtio/component.h rename to repos/os/src/driver/framebuffer/virtio/component.h diff --git a/repos/os/src/drivers/framebuffer/virtio/mmio_device.cc b/repos/os/src/driver/framebuffer/virtio/mmio_device.cc similarity index 100% rename from repos/os/src/drivers/framebuffer/virtio/mmio_device.cc rename to repos/os/src/driver/framebuffer/virtio/mmio_device.cc diff --git a/repos/os/src/driver/framebuffer/virtio/spec/arm/target.mk b/repos/os/src/driver/framebuffer/virtio/spec/arm/target.mk new file mode 100644 index 0000000000..455d6dfebd --- /dev/null +++ b/repos/os/src/driver/framebuffer/virtio/spec/arm/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm + +include $(REP_DIR)/src/driver/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/driver/framebuffer/virtio/spec/arm_64/target.mk b/repos/os/src/driver/framebuffer/virtio/spec/arm_64/target.mk new file mode 100644 index 0000000000..76ed57818d --- /dev/null +++ b/repos/os/src/driver/framebuffer/virtio/spec/arm_64/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm_64 + +include $(REP_DIR)/src/driver/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/driver/framebuffer/virtio/spec/riscv/target.mk b/repos/os/src/driver/framebuffer/virtio/spec/riscv/target.mk new file mode 100644 index 0000000000..f2bcffb50a --- /dev/null +++ b/repos/os/src/driver/framebuffer/virtio/spec/riscv/target.mk @@ -0,0 +1,3 @@ +REQUIRES = riscv + +include $(REP_DIR)/src/driver/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/driver/framebuffer/virtio/target_mmio.inc b/repos/os/src/driver/framebuffer/virtio/target_mmio.inc new file mode 100644 index 0000000000..3c9f9e642c --- /dev/null +++ b/repos/os/src/driver/framebuffer/virtio/target_mmio.inc @@ -0,0 +1,6 @@ +TARGET = virtio_mmio_fb +SRC_CC = mmio_device.cc +LIBS = base blit +INC_DIR = $(REP_DIR)/src/driver/framebuffer/virtio + +vpath % $(REP_DIR)/src/driver/framebuffer/virtio diff --git a/repos/os/src/drivers/gpio/rpi/driver.h b/repos/os/src/driver/gpio/rpi/driver.h similarity index 100% rename from repos/os/src/drivers/gpio/rpi/driver.h rename to repos/os/src/driver/gpio/rpi/driver.h diff --git a/repos/os/src/drivers/gpio/rpi/empty.cc b/repos/os/src/driver/gpio/rpi/empty.cc similarity index 100% rename from repos/os/src/drivers/gpio/rpi/empty.cc rename to repos/os/src/driver/gpio/rpi/empty.cc diff --git a/repos/os/src/drivers/gpio/rpi/gpio.h b/repos/os/src/driver/gpio/rpi/gpio.h similarity index 100% rename from repos/os/src/drivers/gpio/rpi/gpio.h rename to repos/os/src/driver/gpio/rpi/gpio.h diff --git a/repos/os/src/drivers/gpio/rpi/main.cc b/repos/os/src/driver/gpio/rpi/main.cc similarity index 100% rename from repos/os/src/drivers/gpio/rpi/main.cc rename to repos/os/src/driver/gpio/rpi/main.cc diff --git a/repos/os/src/drivers/gpio/rpi/target.mk b/repos/os/src/driver/gpio/rpi/target.mk similarity index 100% rename from repos/os/src/drivers/gpio/rpi/target.mk rename to repos/os/src/driver/gpio/rpi/target.mk diff --git a/repos/os/src/drivers/gpu/intel/commands.h b/repos/os/src/driver/gpu/intel/commands.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/commands.h rename to repos/os/src/driver/gpu/intel/commands.h diff --git a/repos/os/src/drivers/gpu/intel/context.h b/repos/os/src/driver/gpu/intel/context.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/context.h rename to repos/os/src/driver/gpu/intel/context.h diff --git a/repos/os/src/drivers/gpu/intel/context_descriptor.h b/repos/os/src/driver/gpu/intel/context_descriptor.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/context_descriptor.h rename to repos/os/src/driver/gpu/intel/context_descriptor.h diff --git a/repos/os/src/drivers/gpu/intel/ggtt.h b/repos/os/src/driver/gpu/intel/ggtt.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/ggtt.h rename to repos/os/src/driver/gpu/intel/ggtt.h diff --git a/repos/os/src/drivers/gpu/intel/main.cc b/repos/os/src/driver/gpu/intel/main.cc similarity index 100% rename from repos/os/src/drivers/gpu/intel/main.cc rename to repos/os/src/driver/gpu/intel/main.cc diff --git a/repos/os/src/drivers/gpu/intel/mmio.h b/repos/os/src/driver/gpu/intel/mmio.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/mmio.h rename to repos/os/src/driver/gpu/intel/mmio.h diff --git a/repos/os/src/drivers/gpu/intel/mmio_dump.cc b/repos/os/src/driver/gpu/intel/mmio_dump.cc similarity index 100% rename from repos/os/src/drivers/gpu/intel/mmio_dump.cc rename to repos/os/src/driver/gpu/intel/mmio_dump.cc diff --git a/repos/os/src/drivers/gpu/intel/platform_session.h b/repos/os/src/driver/gpu/intel/platform_session.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/platform_session.h rename to repos/os/src/driver/gpu/intel/platform_session.h diff --git a/repos/os/src/drivers/gpu/intel/ppgtt.h b/repos/os/src/driver/gpu/intel/ppgtt.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/ppgtt.h rename to repos/os/src/driver/gpu/intel/ppgtt.h diff --git a/repos/os/src/drivers/gpu/intel/ppgtt_allocator.h b/repos/os/src/driver/gpu/intel/ppgtt_allocator.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/ppgtt_allocator.h rename to repos/os/src/driver/gpu/intel/ppgtt_allocator.h diff --git a/repos/os/src/drivers/gpu/intel/reset.h b/repos/os/src/driver/gpu/intel/reset.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/reset.h rename to repos/os/src/driver/gpu/intel/reset.h diff --git a/repos/os/src/drivers/gpu/intel/ring_buffer.h b/repos/os/src/driver/gpu/intel/ring_buffer.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/ring_buffer.h rename to repos/os/src/driver/gpu/intel/ring_buffer.h diff --git a/repos/os/src/drivers/gpu/intel/target.mk b/repos/os/src/driver/gpu/intel/target.mk similarity index 100% rename from repos/os/src/drivers/gpu/intel/target.mk rename to repos/os/src/driver/gpu/intel/target.mk diff --git a/repos/os/src/drivers/gpu/intel/types.h b/repos/os/src/driver/gpu/intel/types.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/types.h rename to repos/os/src/driver/gpu/intel/types.h diff --git a/repos/os/src/drivers/gpu/intel/utils.h b/repos/os/src/driver/gpu/intel/utils.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/utils.h rename to repos/os/src/driver/gpu/intel/utils.h diff --git a/repos/os/src/drivers/gpu/intel/workarounds.h b/repos/os/src/driver/gpu/intel/workarounds.h similarity index 100% rename from repos/os/src/drivers/gpu/intel/workarounds.h rename to repos/os/src/driver/gpu/intel/workarounds.h diff --git a/repos/os/src/drivers/i2c/README b/repos/os/src/driver/i2c/README similarity index 98% rename from repos/os/src/drivers/i2c/README rename to repos/os/src/driver/i2c/README index 8e9d25ab1a..5bf031ddd5 100644 --- a/repos/os/src/drivers/i2c/README +++ b/repos/os/src/driver/i2c/README @@ -38,7 +38,7 @@ interface is provided in 'i2c_interface.h'. The specific platform implementation must expose a 'driver.h' header file that contains a declaration of 'I2c::Driver' that implements the 'I2c::Driver_base' interface. An example of a specific platform implementation can be found -in 'os/src/drivers/i2c/imx8q_evk'. +in 'os/src/driver/i2c/imx8q_evk'. Configuration ============= diff --git a/repos/os/src/drivers/i2c/component.h b/repos/os/src/driver/i2c/component.h similarity index 100% rename from repos/os/src/drivers/i2c/component.h rename to repos/os/src/driver/i2c/component.h diff --git a/repos/os/src/drivers/i2c/i2c_interface.h b/repos/os/src/driver/i2c/i2c_interface.h similarity index 100% rename from repos/os/src/drivers/i2c/i2c_interface.h rename to repos/os/src/driver/i2c/i2c_interface.h diff --git a/repos/os/src/drivers/i2c/imx8q_evk/driver.cc b/repos/os/src/driver/i2c/imx8q_evk/driver.cc similarity index 100% rename from repos/os/src/drivers/i2c/imx8q_evk/driver.cc rename to repos/os/src/driver/i2c/imx8q_evk/driver.cc diff --git a/repos/os/src/drivers/i2c/imx8q_evk/driver.h b/repos/os/src/driver/i2c/imx8q_evk/driver.h similarity index 100% rename from repos/os/src/drivers/i2c/imx8q_evk/driver.h rename to repos/os/src/driver/i2c/imx8q_evk/driver.h diff --git a/repos/os/src/drivers/i2c/imx8q_evk/mmio.h b/repos/os/src/driver/i2c/imx8q_evk/mmio.h similarity index 100% rename from repos/os/src/drivers/i2c/imx8q_evk/mmio.h rename to repos/os/src/driver/i2c/imx8q_evk/mmio.h diff --git a/repos/os/src/driver/i2c/imx8q_evk/target.mk b/repos/os/src/driver/i2c/imx8q_evk/target.mk new file mode 100644 index 0000000000..ebef37b4a3 --- /dev/null +++ b/repos/os/src/driver/i2c/imx8q_evk/target.mk @@ -0,0 +1,9 @@ +TARGET = imx8q_evk_i2c + +REQUIRES = arm_v8 + +SRC_CC += driver.cc + +INC_DIR += $(PRG_DIR)/src/driver/i2c/imx8q_evk + +include $(REP_DIR)/src/driver/i2c/target.inc diff --git a/repos/os/src/drivers/i2c/main.cc b/repos/os/src/driver/i2c/main.cc similarity index 100% rename from repos/os/src/drivers/i2c/main.cc rename to repos/os/src/driver/i2c/main.cc diff --git a/repos/os/src/drivers/i2c/target.inc b/repos/os/src/driver/i2c/target.inc similarity index 51% rename from repos/os/src/drivers/i2c/target.inc rename to repos/os/src/driver/i2c/target.inc index b08a390136..fd1839cab0 100644 --- a/repos/os/src/drivers/i2c/target.inc +++ b/repos/os/src/driver/i2c/target.inc @@ -1,9 +1,9 @@ LIBS += base INC_DIR += $(PRG_DIR) -INC_DIR += $(REP_DIR)/src/drivers/i2c +INC_DIR += $(REP_DIR)/src/driver/i2c SRC_CC += main.cc -vpath %.cc $(REP_DIR)/src/drivers/i2c +vpath %.cc $(REP_DIR)/src/driver/i2c vpath %.cc $(REP_DIR) diff --git a/repos/os/src/drivers/input/virtio/README b/repos/os/src/driver/input/virtio/README similarity index 100% rename from repos/os/src/drivers/input/virtio/README rename to repos/os/src/driver/input/virtio/README diff --git a/repos/os/src/drivers/input/virtio/component.h b/repos/os/src/driver/input/virtio/component.h similarity index 100% rename from repos/os/src/drivers/input/virtio/component.h rename to repos/os/src/driver/input/virtio/component.h diff --git a/repos/os/src/drivers/input/virtio/mmio_device.cc b/repos/os/src/driver/input/virtio/mmio_device.cc similarity index 100% rename from repos/os/src/drivers/input/virtio/mmio_device.cc rename to repos/os/src/driver/input/virtio/mmio_device.cc diff --git a/repos/os/src/driver/input/virtio/spec/arm/target.mk b/repos/os/src/driver/input/virtio/spec/arm/target.mk new file mode 100644 index 0000000000..e9ba6dbc3b --- /dev/null +++ b/repos/os/src/driver/input/virtio/spec/arm/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm + +include $(REP_DIR)/src/driver/input/virtio/target_mmio.inc diff --git a/repos/os/src/driver/input/virtio/spec/arm_64/target.mk b/repos/os/src/driver/input/virtio/spec/arm_64/target.mk new file mode 100644 index 0000000000..5345782f6b --- /dev/null +++ b/repos/os/src/driver/input/virtio/spec/arm_64/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm_64 + +include $(REP_DIR)/src/driver/input/virtio/target_mmio.inc diff --git a/repos/os/src/driver/input/virtio/spec/riscv/target.mk b/repos/os/src/driver/input/virtio/spec/riscv/target.mk new file mode 100644 index 0000000000..f2d021d2d3 --- /dev/null +++ b/repos/os/src/driver/input/virtio/spec/riscv/target.mk @@ -0,0 +1,3 @@ +REQUIRES = riscv + +include $(REP_DIR)/src/driver/input/virtio/target_mmio.inc diff --git a/repos/os/src/driver/input/virtio/target_mmio.inc b/repos/os/src/driver/input/virtio/target_mmio.inc new file mode 100644 index 0000000000..3bb4365638 --- /dev/null +++ b/repos/os/src/driver/input/virtio/target_mmio.inc @@ -0,0 +1,6 @@ +TARGET = virtio_mmio_input +SRC_CC = mmio_device.cc +LIBS = base +INC_DIR = $(REP_DIR)/src/driver/input/virtio + +vpath % $(REP_DIR)/src/driver/input/virtio diff --git a/repos/os/src/drivers/nic/include/drivers/nic/uplink_client_base.h b/repos/os/src/driver/nic/include/drivers/nic/uplink_client_base.h similarity index 100% rename from repos/os/src/drivers/nic/include/drivers/nic/uplink_client_base.h rename to repos/os/src/driver/nic/include/drivers/nic/uplink_client_base.h diff --git a/repos/os/src/drivers/nic/lan9118/lan9118.h b/repos/os/src/driver/nic/lan9118/lan9118.h similarity index 100% rename from repos/os/src/drivers/nic/lan9118/lan9118.h rename to repos/os/src/driver/nic/lan9118/lan9118.h diff --git a/repos/os/src/drivers/nic/lan9118/main.cc b/repos/os/src/driver/nic/lan9118/main.cc similarity index 100% rename from repos/os/src/drivers/nic/lan9118/main.cc rename to repos/os/src/driver/nic/lan9118/main.cc diff --git a/repos/os/src/drivers/nic/lan9118/target.mk b/repos/os/src/driver/nic/lan9118/target.mk similarity index 100% rename from repos/os/src/drivers/nic/lan9118/target.mk rename to repos/os/src/driver/nic/lan9118/target.mk diff --git a/repos/os/src/drivers/nic/spec/linux/README b/repos/os/src/driver/nic/spec/linux/README similarity index 100% rename from repos/os/src/drivers/nic/spec/linux/README rename to repos/os/src/driver/nic/spec/linux/README diff --git a/repos/os/src/drivers/nic/spec/linux/main.cc b/repos/os/src/driver/nic/spec/linux/main.cc similarity index 100% rename from repos/os/src/drivers/nic/spec/linux/main.cc rename to repos/os/src/driver/nic/spec/linux/main.cc diff --git a/repos/os/src/drivers/nic/spec/linux/target.mk b/repos/os/src/driver/nic/spec/linux/target.mk similarity index 100% rename from repos/os/src/drivers/nic/spec/linux/target.mk rename to repos/os/src/driver/nic/spec/linux/target.mk diff --git a/repos/os/src/drivers/nic/virtio/README b/repos/os/src/driver/nic/virtio/README similarity index 100% rename from repos/os/src/drivers/nic/virtio/README rename to repos/os/src/driver/nic/virtio/README diff --git a/repos/os/src/drivers/nic/virtio/component.h b/repos/os/src/driver/nic/virtio/component.h similarity index 100% rename from repos/os/src/drivers/nic/virtio/component.h rename to repos/os/src/driver/nic/virtio/component.h diff --git a/repos/os/src/drivers/nic/virtio/config.xsd b/repos/os/src/driver/nic/virtio/config.xsd similarity index 100% rename from repos/os/src/drivers/nic/virtio/config.xsd rename to repos/os/src/driver/nic/virtio/config.xsd diff --git a/repos/os/src/drivers/nic/virtio/mmio_device.cc b/repos/os/src/driver/nic/virtio/mmio_device.cc similarity index 100% rename from repos/os/src/drivers/nic/virtio/mmio_device.cc rename to repos/os/src/driver/nic/virtio/mmio_device.cc diff --git a/repos/os/src/drivers/nic/virtio/pci_device.cc b/repos/os/src/driver/nic/virtio/pci_device.cc similarity index 100% rename from repos/os/src/drivers/nic/virtio/pci_device.cc rename to repos/os/src/driver/nic/virtio/pci_device.cc diff --git a/repos/os/src/driver/nic/virtio/spec/arm/target.mk b/repos/os/src/driver/nic/virtio/spec/arm/target.mk new file mode 100644 index 0000000000..e073ba4f8a --- /dev/null +++ b/repos/os/src/driver/nic/virtio/spec/arm/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm + +include $(REP_DIR)/src/driver/nic/virtio/target_mmio.inc diff --git a/repos/os/src/driver/nic/virtio/spec/arm_64/target.mk b/repos/os/src/driver/nic/virtio/spec/arm_64/target.mk new file mode 100644 index 0000000000..5280cf551c --- /dev/null +++ b/repos/os/src/driver/nic/virtio/spec/arm_64/target.mk @@ -0,0 +1,3 @@ +REQUIRES = arm_64 + +include $(REP_DIR)/src/driver/nic/virtio/target_mmio.inc diff --git a/repos/os/src/driver/nic/virtio/spec/riscv/target.mk b/repos/os/src/driver/nic/virtio/spec/riscv/target.mk new file mode 100644 index 0000000000..d0b48eea8b --- /dev/null +++ b/repos/os/src/driver/nic/virtio/spec/riscv/target.mk @@ -0,0 +1,3 @@ +REQUIRES = riscv + +include $(REP_DIR)/src/driver/nic/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/nic/virtio/spec/x86/target.mk b/repos/os/src/driver/nic/virtio/spec/x86/target.mk similarity index 59% rename from repos/os/src/drivers/nic/virtio/spec/x86/target.mk rename to repos/os/src/driver/nic/virtio/spec/x86/target.mk index da2d995713..182bc5d1f1 100644 --- a/repos/os/src/drivers/nic/virtio/spec/x86/target.mk +++ b/repos/os/src/driver/nic/virtio/spec/x86/target.mk @@ -2,7 +2,7 @@ TARGET = virtio_pci_nic REQUIRES = x86 SRC_CC = pci_device.cc LIBS = base nic_driver -INC_DIR = $(REP_DIR)/src/drivers/nic/virtio +INC_DIR = $(REP_DIR)/src/driver/nic/virtio CONFIG_XSD = ../../config.xsd -vpath % $(REP_DIR)/src/drivers/nic/virtio +vpath % $(REP_DIR)/src/driver/nic/virtio diff --git a/repos/os/src/drivers/nic/virtio/target_mmio.inc b/repos/os/src/driver/nic/virtio/target_mmio.inc similarity index 56% rename from repos/os/src/drivers/nic/virtio/target_mmio.inc rename to repos/os/src/driver/nic/virtio/target_mmio.inc index 5731bfc7b4..82ab3acc34 100644 --- a/repos/os/src/drivers/nic/virtio/target_mmio.inc +++ b/repos/os/src/driver/nic/virtio/target_mmio.inc @@ -1,7 +1,7 @@ TARGET = virtio_mmio_nic SRC_CC = mmio_device.cc LIBS = base nic_driver -INC_DIR = $(REP_DIR)/src/drivers/nic/virtio +INC_DIR = $(REP_DIR)/src/driver/nic/virtio CONFIG_XSD = ../../config.xsd -vpath % $(REP_DIR)/src/drivers/nic/virtio +vpath % $(REP_DIR)/src/driver/nic/virtio diff --git a/repos/os/src/drivers/nvme/README b/repos/os/src/driver/nvme/README similarity index 100% rename from repos/os/src/drivers/nvme/README rename to repos/os/src/driver/nvme/README diff --git a/repos/os/src/drivers/nvme/dma_buffer.h b/repos/os/src/driver/nvme/dma_buffer.h similarity index 100% rename from repos/os/src/drivers/nvme/dma_buffer.h rename to repos/os/src/driver/nvme/dma_buffer.h diff --git a/repos/os/src/drivers/nvme/main.cc b/repos/os/src/driver/nvme/main.cc similarity index 100% rename from repos/os/src/drivers/nvme/main.cc rename to repos/os/src/driver/nvme/main.cc diff --git a/repos/os/src/drivers/nvme/spec/arm_64/dma_buffer.cc b/repos/os/src/driver/nvme/spec/arm_64/dma_buffer.cc similarity index 100% rename from repos/os/src/drivers/nvme/spec/arm_64/dma_buffer.cc rename to repos/os/src/driver/nvme/spec/arm_64/dma_buffer.cc diff --git a/repos/os/src/drivers/nvme/spec/arm_64/target.mk b/repos/os/src/driver/nvme/spec/arm_64/target.mk similarity index 100% rename from repos/os/src/drivers/nvme/spec/arm_64/target.mk rename to repos/os/src/driver/nvme/spec/arm_64/target.mk diff --git a/repos/os/src/drivers/nvme/spec/x86/dma_buffer.cc b/repos/os/src/driver/nvme/spec/x86/dma_buffer.cc similarity index 100% rename from repos/os/src/drivers/nvme/spec/x86/dma_buffer.cc rename to repos/os/src/driver/nvme/spec/x86/dma_buffer.cc diff --git a/repos/os/src/drivers/nvme/spec/x86/target.mk b/repos/os/src/driver/nvme/spec/x86/target.mk similarity index 100% rename from repos/os/src/drivers/nvme/spec/x86/target.mk rename to repos/os/src/driver/nvme/spec/x86/target.mk diff --git a/repos/os/src/drivers/nvme/target.inc b/repos/os/src/driver/nvme/target.inc similarity index 100% rename from repos/os/src/drivers/nvme/target.inc rename to repos/os/src/driver/nvme/target.inc diff --git a/repos/os/src/drivers/nvme/util.h b/repos/os/src/driver/nvme/util.h similarity index 100% rename from repos/os/src/drivers/nvme/util.h rename to repos/os/src/driver/nvme/util.h diff --git a/repos/os/src/drivers/platform/README b/repos/os/src/driver/platform/README similarity index 100% rename from repos/os/src/drivers/platform/README rename to repos/os/src/driver/platform/README diff --git a/repos/os/src/drivers/platform/clock.h b/repos/os/src/driver/platform/clock.h similarity index 100% rename from repos/os/src/drivers/platform/clock.h rename to repos/os/src/driver/platform/clock.h diff --git a/repos/os/src/drivers/platform/common.h b/repos/os/src/driver/platform/common.h similarity index 100% rename from repos/os/src/drivers/platform/common.h rename to repos/os/src/driver/platform/common.h diff --git a/repos/os/src/drivers/platform/device.cc b/repos/os/src/driver/platform/device.cc similarity index 100% rename from repos/os/src/drivers/platform/device.cc rename to repos/os/src/driver/platform/device.cc diff --git a/repos/os/src/drivers/platform/device.h b/repos/os/src/driver/platform/device.h similarity index 100% rename from repos/os/src/drivers/platform/device.h rename to repos/os/src/driver/platform/device.h diff --git a/repos/os/src/drivers/platform/device_component.cc b/repos/os/src/driver/platform/device_component.cc similarity index 100% rename from repos/os/src/drivers/platform/device_component.cc rename to repos/os/src/driver/platform/device_component.cc diff --git a/repos/os/src/drivers/platform/device_component.h b/repos/os/src/driver/platform/device_component.h similarity index 100% rename from repos/os/src/drivers/platform/device_component.h rename to repos/os/src/driver/platform/device_component.h diff --git a/repos/os/src/drivers/platform/device_owner.h b/repos/os/src/driver/platform/device_owner.h similarity index 100% rename from repos/os/src/drivers/platform/device_owner.h rename to repos/os/src/driver/platform/device_owner.h diff --git a/repos/os/src/drivers/platform/device_pd.cc b/repos/os/src/driver/platform/device_pd.cc similarity index 100% rename from repos/os/src/drivers/platform/device_pd.cc rename to repos/os/src/driver/platform/device_pd.cc diff --git a/repos/os/src/drivers/platform/device_pd.h b/repos/os/src/driver/platform/device_pd.h similarity index 100% rename from repos/os/src/drivers/platform/device_pd.h rename to repos/os/src/driver/platform/device_pd.h diff --git a/repos/os/src/drivers/platform/dma_allocator.cc b/repos/os/src/driver/platform/dma_allocator.cc similarity index 100% rename from repos/os/src/drivers/platform/dma_allocator.cc rename to repos/os/src/driver/platform/dma_allocator.cc diff --git a/repos/os/src/drivers/platform/dma_allocator.h b/repos/os/src/driver/platform/dma_allocator.h similarity index 100% rename from repos/os/src/drivers/platform/dma_allocator.h rename to repos/os/src/driver/platform/dma_allocator.h diff --git a/repos/os/src/drivers/platform/io_mmu.h b/repos/os/src/driver/platform/io_mmu.h similarity index 100% rename from repos/os/src/drivers/platform/io_mmu.h rename to repos/os/src/driver/platform/io_mmu.h diff --git a/repos/os/src/drivers/platform/io_mmu_domain_registry.h b/repos/os/src/driver/platform/io_mmu_domain_registry.h similarity index 100% rename from repos/os/src/drivers/platform/io_mmu_domain_registry.h rename to repos/os/src/driver/platform/io_mmu_domain_registry.h diff --git a/repos/os/src/drivers/platform/main.cc b/repos/os/src/driver/platform/main.cc similarity index 100% rename from repos/os/src/drivers/platform/main.cc rename to repos/os/src/driver/platform/main.cc diff --git a/repos/os/src/drivers/platform/named_registry.h b/repos/os/src/driver/platform/named_registry.h similarity index 100% rename from repos/os/src/drivers/platform/named_registry.h rename to repos/os/src/driver/platform/named_registry.h diff --git a/repos/os/src/drivers/platform/pci.cc b/repos/os/src/driver/platform/pci.cc similarity index 100% rename from repos/os/src/drivers/platform/pci.cc rename to repos/os/src/driver/platform/pci.cc diff --git a/repos/os/src/drivers/platform/pci.h b/repos/os/src/driver/platform/pci.h similarity index 100% rename from repos/os/src/drivers/platform/pci.h rename to repos/os/src/driver/platform/pci.h diff --git a/repos/os/src/drivers/platform/pci_ehci.h b/repos/os/src/driver/platform/pci_ehci.h similarity index 100% rename from repos/os/src/drivers/platform/pci_ehci.h rename to repos/os/src/driver/platform/pci_ehci.h diff --git a/repos/os/src/drivers/platform/pci_hd_audio.h b/repos/os/src/driver/platform/pci_hd_audio.h similarity index 100% rename from repos/os/src/drivers/platform/pci_hd_audio.h rename to repos/os/src/driver/platform/pci_hd_audio.h diff --git a/repos/os/src/drivers/platform/pci_intel_graphics.h b/repos/os/src/driver/platform/pci_intel_graphics.h similarity index 100% rename from repos/os/src/drivers/platform/pci_intel_graphics.h rename to repos/os/src/driver/platform/pci_intel_graphics.h diff --git a/repos/os/src/drivers/platform/pci_uhci.h b/repos/os/src/driver/platform/pci_uhci.h similarity index 100% rename from repos/os/src/drivers/platform/pci_uhci.h rename to repos/os/src/driver/platform/pci_uhci.h diff --git a/repos/os/src/drivers/platform/pci_virtio.h b/repos/os/src/driver/platform/pci_virtio.h similarity index 100% rename from repos/os/src/drivers/platform/pci_virtio.h rename to repos/os/src/driver/platform/pci_virtio.h diff --git a/repos/os/src/drivers/platform/policy.h b/repos/os/src/driver/platform/policy.h similarity index 100% rename from repos/os/src/drivers/platform/policy.h rename to repos/os/src/driver/platform/policy.h diff --git a/repos/os/src/drivers/platform/power.h b/repos/os/src/driver/platform/power.h similarity index 100% rename from repos/os/src/drivers/platform/power.h rename to repos/os/src/driver/platform/power.h diff --git a/repos/os/src/drivers/platform/reset.h b/repos/os/src/driver/platform/reset.h similarity index 100% rename from repos/os/src/drivers/platform/reset.h rename to repos/os/src/driver/platform/reset.h diff --git a/repos/os/src/drivers/platform/root.cc b/repos/os/src/driver/platform/root.cc similarity index 100% rename from repos/os/src/drivers/platform/root.cc rename to repos/os/src/driver/platform/root.cc diff --git a/repos/os/src/drivers/platform/root.h b/repos/os/src/driver/platform/root.h similarity index 100% rename from repos/os/src/drivers/platform/root.h rename to repos/os/src/driver/platform/root.h diff --git a/repos/os/src/drivers/platform/session_component.cc b/repos/os/src/driver/platform/session_component.cc similarity index 100% rename from repos/os/src/drivers/platform/session_component.cc rename to repos/os/src/driver/platform/session_component.cc diff --git a/repos/os/src/drivers/platform/session_component.h b/repos/os/src/driver/platform/session_component.h similarity index 100% rename from repos/os/src/drivers/platform/session_component.h rename to repos/os/src/driver/platform/session_component.h diff --git a/repos/os/src/drivers/platform/shared_irq.cc b/repos/os/src/driver/platform/shared_irq.cc similarity index 100% rename from repos/os/src/drivers/platform/shared_irq.cc rename to repos/os/src/driver/platform/shared_irq.cc diff --git a/repos/os/src/drivers/platform/shared_irq.h b/repos/os/src/driver/platform/shared_irq.h similarity index 100% rename from repos/os/src/drivers/platform/shared_irq.h rename to repos/os/src/driver/platform/shared_irq.h diff --git a/repos/os/src/drivers/platform/target.inc b/repos/os/src/driver/platform/target.inc similarity index 78% rename from repos/os/src/drivers/platform/target.inc rename to repos/os/src/driver/platform/target.inc index a3cb61a6f3..a624289be2 100644 --- a/repos/os/src/drivers/platform/target.inc +++ b/repos/os/src/driver/platform/target.inc @@ -8,7 +8,7 @@ SRC_CC += session_component.cc SRC_CC += shared_irq.cc SRC_CC += dma_allocator.cc -GENERIC_DIR := $(dir $(call select_from_repositories,src/drivers/platform/target.inc)) +GENERIC_DIR := $(dir $(call select_from_repositories,src/driver/platform/target.inc)) INC_DIR += $(PRG_DIR) $(GENERIC_DIR) LIBS += base diff --git a/repos/os/src/drivers/platform/target.mk b/repos/os/src/driver/platform/target.mk similarity index 100% rename from repos/os/src/drivers/platform/target.mk rename to repos/os/src/driver/platform/target.mk diff --git a/repos/os/src/drivers/platform/types.h b/repos/os/src/driver/platform/types.h similarity index 100% rename from repos/os/src/drivers/platform/types.h rename to repos/os/src/driver/platform/types.h diff --git a/repos/os/src/drivers/ps2/README b/repos/os/src/driver/ps2/README similarity index 100% rename from repos/os/src/drivers/ps2/README rename to repos/os/src/driver/ps2/README diff --git a/repos/os/src/drivers/ps2/input_driver.h b/repos/os/src/driver/ps2/input_driver.h similarity index 100% rename from repos/os/src/drivers/ps2/input_driver.h rename to repos/os/src/driver/ps2/input_driver.h diff --git a/repos/os/src/drivers/ps2/irq_handler.h b/repos/os/src/driver/ps2/irq_handler.h similarity index 100% rename from repos/os/src/drivers/ps2/irq_handler.h rename to repos/os/src/driver/ps2/irq_handler.h diff --git a/repos/os/src/drivers/ps2/led_state.h b/repos/os/src/driver/ps2/led_state.h similarity index 100% rename from repos/os/src/drivers/ps2/led_state.h rename to repos/os/src/driver/ps2/led_state.h diff --git a/repos/os/src/drivers/ps2/pl050/main.cc b/repos/os/src/driver/ps2/pl050/main.cc similarity index 100% rename from repos/os/src/drivers/ps2/pl050/main.cc rename to repos/os/src/driver/ps2/pl050/main.cc diff --git a/repos/os/src/drivers/ps2/pl050/pl050.h b/repos/os/src/driver/ps2/pl050/pl050.h similarity index 100% rename from repos/os/src/drivers/ps2/pl050/pl050.h rename to repos/os/src/driver/ps2/pl050/pl050.h diff --git a/repos/os/src/drivers/ps2/pl050/target.mk b/repos/os/src/driver/ps2/pl050/target.mk similarity index 100% rename from repos/os/src/drivers/ps2/pl050/target.mk rename to repos/os/src/driver/ps2/pl050/target.mk diff --git a/repos/os/src/drivers/ps2/ps2_keyboard.h b/repos/os/src/driver/ps2/ps2_keyboard.h similarity index 100% rename from repos/os/src/drivers/ps2/ps2_keyboard.h rename to repos/os/src/driver/ps2/ps2_keyboard.h diff --git a/repos/os/src/drivers/ps2/ps2_mouse.h b/repos/os/src/driver/ps2/ps2_mouse.h similarity index 100% rename from repos/os/src/drivers/ps2/ps2_mouse.h rename to repos/os/src/driver/ps2/ps2_mouse.h diff --git a/repos/os/src/drivers/ps2/scan_code_set_1.h b/repos/os/src/driver/ps2/scan_code_set_1.h similarity index 100% rename from repos/os/src/drivers/ps2/scan_code_set_1.h rename to repos/os/src/driver/ps2/scan_code_set_1.h diff --git a/repos/os/src/drivers/ps2/scan_code_set_2.h b/repos/os/src/driver/ps2/scan_code_set_2.h similarity index 100% rename from repos/os/src/drivers/ps2/scan_code_set_2.h rename to repos/os/src/driver/ps2/scan_code_set_2.h diff --git a/repos/os/src/drivers/ps2/serial_interface.h b/repos/os/src/driver/ps2/serial_interface.h similarity index 100% rename from repos/os/src/drivers/ps2/serial_interface.h rename to repos/os/src/driver/ps2/serial_interface.h diff --git a/repos/os/src/drivers/ps2/verbose.h b/repos/os/src/driver/ps2/verbose.h similarity index 100% rename from repos/os/src/drivers/ps2/verbose.h rename to repos/os/src/driver/ps2/verbose.h diff --git a/repos/os/src/drivers/ps2/x86/i8042.h b/repos/os/src/driver/ps2/x86/i8042.h similarity index 100% rename from repos/os/src/drivers/ps2/x86/i8042.h rename to repos/os/src/driver/ps2/x86/i8042.h diff --git a/repos/os/src/drivers/ps2/x86/main.cc b/repos/os/src/driver/ps2/x86/main.cc similarity index 100% rename from repos/os/src/drivers/ps2/x86/main.cc rename to repos/os/src/driver/ps2/x86/main.cc diff --git a/repos/os/src/drivers/ps2/x86/target.mk b/repos/os/src/driver/ps2/x86/target.mk similarity index 100% rename from repos/os/src/drivers/ps2/x86/target.mk rename to repos/os/src/driver/ps2/x86/target.mk diff --git a/repos/os/src/drivers/rtc/README b/repos/os/src/driver/rtc/README similarity index 100% rename from repos/os/src/drivers/rtc/README rename to repos/os/src/driver/rtc/README diff --git a/repos/os/src/drivers/rtc/dummy/rtc.cc b/repos/os/src/driver/rtc/dummy/rtc.cc similarity index 100% rename from repos/os/src/drivers/rtc/dummy/rtc.cc rename to repos/os/src/driver/rtc/dummy/rtc.cc diff --git a/repos/os/src/driver/rtc/dummy/target.mk b/repos/os/src/driver/rtc/dummy/target.mk new file mode 100644 index 0000000000..442702914d --- /dev/null +++ b/repos/os/src/driver/rtc/dummy/target.mk @@ -0,0 +1,4 @@ +TARGET = dummy_rtc +LIBS = base + +include $(REP_DIR)/src/driver/rtc/target.inc diff --git a/repos/os/src/drivers/rtc/main.cc b/repos/os/src/driver/rtc/main.cc similarity index 100% rename from repos/os/src/drivers/rtc/main.cc rename to repos/os/src/driver/rtc/main.cc diff --git a/repos/os/src/drivers/rtc/rtc.h b/repos/os/src/driver/rtc/rtc.h similarity index 100% rename from repos/os/src/drivers/rtc/rtc.h rename to repos/os/src/driver/rtc/rtc.h diff --git a/repos/os/src/drivers/rtc/spec/linux/rtc.cc b/repos/os/src/driver/rtc/spec/linux/rtc.cc similarity index 100% rename from repos/os/src/drivers/rtc/spec/linux/rtc.cc rename to repos/os/src/driver/rtc/spec/linux/rtc.cc diff --git a/repos/os/src/drivers/rtc/spec/linux/target.mk b/repos/os/src/driver/rtc/spec/linux/target.mk similarity index 57% rename from repos/os/src/drivers/rtc/spec/linux/target.mk rename to repos/os/src/driver/rtc/spec/linux/target.mk index 19c804d5b5..4a7a037039 100644 --- a/repos/os/src/drivers/rtc/spec/linux/target.mk +++ b/repos/os/src/driver/rtc/spec/linux/target.mk @@ -2,4 +2,4 @@ TARGET = linux_rtc REQUIRES = linux LIBS = lx_hybrid -include $(REP_DIR)/src/drivers/rtc/target.inc +include $(REP_DIR)/src/driver/rtc/target.inc diff --git a/repos/os/src/drivers/rtc/spec/x86/rtc.cc b/repos/os/src/driver/rtc/spec/x86/rtc.cc similarity index 100% rename from repos/os/src/drivers/rtc/spec/x86/rtc.cc rename to repos/os/src/driver/rtc/spec/x86/rtc.cc diff --git a/repos/os/src/drivers/rtc/spec/x86/target.mk b/repos/os/src/driver/rtc/spec/x86/target.mk similarity index 53% rename from repos/os/src/drivers/rtc/spec/x86/target.mk rename to repos/os/src/driver/rtc/spec/x86/target.mk index 687ede4910..bebf17e7f0 100644 --- a/repos/os/src/drivers/rtc/spec/x86/target.mk +++ b/repos/os/src/driver/rtc/spec/x86/target.mk @@ -2,4 +2,4 @@ TARGET = pc_rtc REQUIRES = x86 LIBS = base -include $(REP_DIR)/src/drivers/rtc/target.inc +include $(REP_DIR)/src/driver/rtc/target.inc diff --git a/repos/os/src/driver/rtc/target.inc b/repos/os/src/driver/rtc/target.inc new file mode 100644 index 0000000000..5deb4245f8 --- /dev/null +++ b/repos/os/src/driver/rtc/target.inc @@ -0,0 +1,5 @@ +SRC_CC = main.cc rtc.cc +INC_DIR += $(REP_DIR)/src/driver/rtc + +vpath main.cc $(REP_DIR)/src/driver/rtc +vpath rtc.cc $(PRG_DIR) diff --git a/repos/os/src/drivers/sd_card/adma2.cc b/repos/os/src/driver/sd_card/adma2.cc similarity index 100% rename from repos/os/src/drivers/sd_card/adma2.cc rename to repos/os/src/driver/sd_card/adma2.cc diff --git a/repos/os/src/drivers/sd_card/adma2.h b/repos/os/src/driver/sd_card/adma2.h similarity index 100% rename from repos/os/src/drivers/sd_card/adma2.h rename to repos/os/src/driver/sd_card/adma2.h diff --git a/repos/os/src/drivers/sd_card/benchmark.h b/repos/os/src/driver/sd_card/benchmark.h similarity index 100% rename from repos/os/src/drivers/sd_card/benchmark.h rename to repos/os/src/driver/sd_card/benchmark.h diff --git a/repos/os/src/drivers/sd_card/driver_base.h b/repos/os/src/driver/sd_card/driver_base.h similarity index 100% rename from repos/os/src/drivers/sd_card/driver_base.h rename to repos/os/src/driver/sd_card/driver_base.h diff --git a/repos/os/src/drivers/sd_card/imx/driver.cc b/repos/os/src/driver/sd_card/imx/driver.cc similarity index 100% rename from repos/os/src/drivers/sd_card/imx/driver.cc rename to repos/os/src/driver/sd_card/imx/driver.cc diff --git a/repos/os/src/drivers/sd_card/imx/driver.h b/repos/os/src/driver/sd_card/imx/driver.h similarity index 100% rename from repos/os/src/drivers/sd_card/imx/driver.h rename to repos/os/src/driver/sd_card/imx/driver.h diff --git a/repos/os/src/drivers/sd_card/imx53/driver.cc b/repos/os/src/driver/sd_card/imx53/driver.cc similarity index 100% rename from repos/os/src/drivers/sd_card/imx53/driver.cc rename to repos/os/src/driver/sd_card/imx53/driver.cc diff --git a/repos/os/src/driver/sd_card/imx53/target.mk b/repos/os/src/driver/sd_card/imx53/target.mk new file mode 100644 index 0000000000..42f50ee970 --- /dev/null +++ b/repos/os/src/driver/sd_card/imx53/target.mk @@ -0,0 +1,6 @@ +TARGET = imx53_sd_card +REQUIRES = arm_v7 +SRC_CC = adma2.cc imx/driver.cc +INC_DIR = $(REP_DIR)/src/driver/sd_card/imx + +include $(REP_DIR)/src/driver/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/imx6/driver.cc b/repos/os/src/driver/sd_card/imx6/driver.cc similarity index 100% rename from repos/os/src/drivers/sd_card/imx6/driver.cc rename to repos/os/src/driver/sd_card/imx6/driver.cc diff --git a/repos/os/src/driver/sd_card/imx6/target.mk b/repos/os/src/driver/sd_card/imx6/target.mk new file mode 100644 index 0000000000..005ee5eaee --- /dev/null +++ b/repos/os/src/driver/sd_card/imx6/target.mk @@ -0,0 +1,6 @@ +TARGET = imx6_sd_card +SRC_CC = adma2.cc imx/driver.cc +INC_DIR = $(REP_DIR)/src/driver/sd_card/imx +REQUIRES = arm_v7a + +include $(REP_DIR)/src/driver/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/main.cc b/repos/os/src/driver/sd_card/main.cc similarity index 100% rename from repos/os/src/drivers/sd_card/main.cc rename to repos/os/src/driver/sd_card/main.cc diff --git a/repos/os/src/drivers/sd_card/pl180/driver.cc b/repos/os/src/driver/sd_card/pl180/driver.cc similarity index 100% rename from repos/os/src/drivers/sd_card/pl180/driver.cc rename to repos/os/src/driver/sd_card/pl180/driver.cc diff --git a/repos/os/src/drivers/sd_card/pl180/driver.h b/repos/os/src/driver/sd_card/pl180/driver.h similarity index 100% rename from repos/os/src/drivers/sd_card/pl180/driver.h rename to repos/os/src/driver/sd_card/pl180/driver.h diff --git a/repos/os/src/driver/sd_card/pl180/target.mk b/repos/os/src/driver/sd_card/pl180/target.mk new file mode 100644 index 0000000000..c5916ed003 --- /dev/null +++ b/repos/os/src/driver/sd_card/pl180/target.mk @@ -0,0 +1,4 @@ +TARGET = pl180_sd_card +REQUIRES = arm_v7 + +include $(REP_DIR)/src/driver/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/sd_card.h b/repos/os/src/driver/sd_card/sd_card.h similarity index 100% rename from repos/os/src/drivers/sd_card/sd_card.h rename to repos/os/src/driver/sd_card/sd_card.h diff --git a/repos/os/src/driver/sd_card/target.inc b/repos/os/src/driver/sd_card/target.inc new file mode 100644 index 0000000000..a073d3d7e3 --- /dev/null +++ b/repos/os/src/driver/sd_card/target.inc @@ -0,0 +1,6 @@ +SRC_CC += main.cc driver.cc +LIBS += base +INC_DIR += $(PRG_DIR) $(REP_DIR)/src/driver/sd_card + +vpath %.cc $(REP_DIR)/src/driver/sd_card +vpath %.cc $(PRG_DIR) diff --git a/repos/os/src/drivers/touch/synaptics_dsx/i2c.h b/repos/os/src/driver/touch/synaptics_dsx/i2c.h similarity index 100% rename from repos/os/src/drivers/touch/synaptics_dsx/i2c.h rename to repos/os/src/driver/touch/synaptics_dsx/i2c.h diff --git a/repos/os/src/drivers/touch/synaptics_dsx/irq_handler.h b/repos/os/src/driver/touch/synaptics_dsx/irq_handler.h similarity index 100% rename from repos/os/src/drivers/touch/synaptics_dsx/irq_handler.h rename to repos/os/src/driver/touch/synaptics_dsx/irq_handler.h diff --git a/repos/os/src/drivers/touch/synaptics_dsx/main.cc b/repos/os/src/driver/touch/synaptics_dsx/main.cc similarity index 100% rename from repos/os/src/drivers/touch/synaptics_dsx/main.cc rename to repos/os/src/driver/touch/synaptics_dsx/main.cc diff --git a/repos/os/src/drivers/touch/synaptics_dsx/target.mk b/repos/os/src/driver/touch/synaptics_dsx/target.mk similarity index 100% rename from repos/os/src/drivers/touch/synaptics_dsx/target.mk rename to repos/os/src/driver/touch/synaptics_dsx/target.mk diff --git a/repos/os/src/drivers/uart/README b/repos/os/src/driver/uart/README similarity index 100% rename from repos/os/src/drivers/uart/README rename to repos/os/src/driver/uart/README diff --git a/repos/os/src/drivers/uart/main.cc b/repos/os/src/driver/uart/main.cc similarity index 100% rename from repos/os/src/drivers/uart/main.cc rename to repos/os/src/driver/uart/main.cc diff --git a/repos/os/src/driver/uart/spec/pbxa9/target.mk b/repos/os/src/driver/uart/spec/pbxa9/target.mk new file mode 100644 index 0000000000..55102f5496 --- /dev/null +++ b/repos/os/src/driver/uart/spec/pbxa9/target.mk @@ -0,0 +1,4 @@ +TARGET = pbxa9_uart +REQUIRES = arm_v7 + +include $(REP_DIR)/src/driver/uart/target.inc diff --git a/repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h b/repos/os/src/driver/uart/spec/pbxa9/uart_driver.h similarity index 100% rename from repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h rename to repos/os/src/driver/uart/spec/pbxa9/uart_driver.h diff --git a/repos/os/src/driver/uart/spec/x86/target.mk b/repos/os/src/driver/uart/spec/x86/target.mk new file mode 100644 index 0000000000..6c7122e93f --- /dev/null +++ b/repos/os/src/driver/uart/spec/x86/target.mk @@ -0,0 +1,4 @@ +TARGET = pc_uart +REQUIRES = x86 + +include $(REP_DIR)/src/driver/uart/target.inc diff --git a/repos/os/src/drivers/uart/spec/x86/uart_driver.h b/repos/os/src/driver/uart/spec/x86/uart_driver.h similarity index 100% rename from repos/os/src/drivers/uart/spec/x86/uart_driver.h rename to repos/os/src/driver/uart/spec/x86/uart_driver.h diff --git a/repos/os/src/drivers/uart/target.inc b/repos/os/src/driver/uart/target.inc similarity index 88% rename from repos/os/src/drivers/uart/target.inc rename to repos/os/src/driver/uart/target.inc index 63deb326d0..995b52b461 100644 --- a/repos/os/src/drivers/uart/target.inc +++ b/repos/os/src/driver/uart/target.inc @@ -1,7 +1,7 @@ SRC_CC = main.cc LIBS = base -GENERIC_DRV_DIR = $(dir $(call select_from_repositories,src/drivers/uart/target.inc)) +GENERIC_DRV_DIR = $(dir $(call select_from_repositories,src/driver/uart/target.inc)) INC_DIR += $(PRG_DIR) $(GENERIC_DRV_DIR) diff --git a/repos/os/src/drivers/uart/uart_component.h b/repos/os/src/driver/uart/uart_component.h similarity index 100% rename from repos/os/src/drivers/uart/uart_component.h rename to repos/os/src/driver/uart/uart_component.h diff --git a/repos/os/src/drivers/uart/uart_driver_base.h b/repos/os/src/driver/uart/uart_driver_base.h similarity index 100% rename from repos/os/src/drivers/uart/uart_driver_base.h rename to repos/os/src/driver/uart/uart_driver_base.h diff --git a/repos/os/src/drivers/usb_block/README b/repos/os/src/driver/usb_block/README similarity index 100% rename from repos/os/src/drivers/usb_block/README rename to repos/os/src/driver/usb_block/README diff --git a/repos/os/src/drivers/usb_block/cbw_csw.h b/repos/os/src/driver/usb_block/cbw_csw.h similarity index 100% rename from repos/os/src/drivers/usb_block/cbw_csw.h rename to repos/os/src/driver/usb_block/cbw_csw.h diff --git a/repos/os/src/drivers/usb_block/main.cc b/repos/os/src/driver/usb_block/main.cc similarity index 100% rename from repos/os/src/drivers/usb_block/main.cc rename to repos/os/src/driver/usb_block/main.cc diff --git a/repos/os/src/drivers/usb_block/mmio.h b/repos/os/src/driver/usb_block/mmio.h similarity index 100% rename from repos/os/src/drivers/usb_block/mmio.h rename to repos/os/src/driver/usb_block/mmio.h diff --git a/repos/os/src/drivers/usb_block/scsi.h b/repos/os/src/driver/usb_block/scsi.h similarity index 100% rename from repos/os/src/drivers/usb_block/scsi.h rename to repos/os/src/driver/usb_block/scsi.h diff --git a/repos/os/src/drivers/usb_block/target.mk b/repos/os/src/driver/usb_block/target.mk similarity index 100% rename from repos/os/src/drivers/usb_block/target.mk rename to repos/os/src/driver/usb_block/target.mk diff --git a/repos/os/src/drivers/virtdev_rom/README b/repos/os/src/driver/virtdev_rom/README similarity index 100% rename from repos/os/src/drivers/virtdev_rom/README rename to repos/os/src/driver/virtdev_rom/README diff --git a/repos/os/src/drivers/virtdev_rom/main.cc b/repos/os/src/driver/virtdev_rom/main.cc similarity index 100% rename from repos/os/src/drivers/virtdev_rom/main.cc rename to repos/os/src/driver/virtdev_rom/main.cc diff --git a/repos/os/src/drivers/virtdev_rom/spec/arm/platform_config.h b/repos/os/src/driver/virtdev_rom/spec/arm/platform_config.h similarity index 100% rename from repos/os/src/drivers/virtdev_rom/spec/arm/platform_config.h rename to repos/os/src/driver/virtdev_rom/spec/arm/platform_config.h diff --git a/repos/os/src/driver/virtdev_rom/spec/arm/target.mk b/repos/os/src/driver/virtdev_rom/spec/arm/target.mk new file mode 100644 index 0000000000..721233051e --- /dev/null +++ b/repos/os/src/driver/virtdev_rom/spec/arm/target.mk @@ -0,0 +1,5 @@ +REQUIRES = arm + +INC_DIR = $(PRG_DIR) + +include $(REP_DIR)/src/driver/virtdev_rom/target.inc diff --git a/repos/os/src/driver/virtdev_rom/spec/arm_64/target.mk b/repos/os/src/driver/virtdev_rom/spec/arm_64/target.mk new file mode 100644 index 0000000000..c4f99e6861 --- /dev/null +++ b/repos/os/src/driver/virtdev_rom/spec/arm_64/target.mk @@ -0,0 +1,5 @@ +REQUIRES = arm_64 + +INC_DIR = $(PRG_DIR)/../arm + +include $(REP_DIR)/src/driver/virtdev_rom/target.inc diff --git a/repos/os/src/drivers/virtdev_rom/spec/riscv/platform_config.h b/repos/os/src/driver/virtdev_rom/spec/riscv/platform_config.h similarity index 100% rename from repos/os/src/drivers/virtdev_rom/spec/riscv/platform_config.h rename to repos/os/src/driver/virtdev_rom/spec/riscv/platform_config.h diff --git a/repos/os/src/driver/virtdev_rom/spec/riscv/target.mk b/repos/os/src/driver/virtdev_rom/spec/riscv/target.mk new file mode 100644 index 0000000000..c469f3e6dc --- /dev/null +++ b/repos/os/src/driver/virtdev_rom/spec/riscv/target.mk @@ -0,0 +1,5 @@ +REQUIRES = riscv + +INC_DIR = $(PRG_DIR) + +include $(REP_DIR)/src/driver/virtdev_rom/target.inc diff --git a/repos/os/src/drivers/virtdev_rom/target.inc b/repos/os/src/driver/virtdev_rom/target.inc similarity index 54% rename from repos/os/src/drivers/virtdev_rom/target.inc rename to repos/os/src/driver/virtdev_rom/target.inc index 14bf820da2..f445fc387d 100644 --- a/repos/os/src/drivers/virtdev_rom/target.inc +++ b/repos/os/src/driver/virtdev_rom/target.inc @@ -2,4 +2,4 @@ TARGET = virtdev_rom SRC_CC = main.cc LIBS = base -vpath main.cc $(REP_DIR)/src/drivers/virtdev_rom +vpath main.cc $(REP_DIR)/src/driver/virtdev_rom diff --git a/repos/os/src/drivers/framebuffer/virtio/spec/arm/target.mk b/repos/os/src/drivers/framebuffer/virtio/spec/arm/target.mk deleted file mode 100644 index deb31aef49..0000000000 --- a/repos/os/src/drivers/framebuffer/virtio/spec/arm/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm - -include $(REP_DIR)/src/drivers/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/framebuffer/virtio/spec/arm_64/target.mk b/repos/os/src/drivers/framebuffer/virtio/spec/arm_64/target.mk deleted file mode 100644 index 488c889735..0000000000 --- a/repos/os/src/drivers/framebuffer/virtio/spec/arm_64/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm_64 - -include $(REP_DIR)/src/drivers/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/framebuffer/virtio/spec/riscv/target.mk b/repos/os/src/drivers/framebuffer/virtio/spec/riscv/target.mk deleted file mode 100644 index a3ad102711..0000000000 --- a/repos/os/src/drivers/framebuffer/virtio/spec/riscv/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = riscv - -include $(REP_DIR)/src/drivers/framebuffer/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc b/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc deleted file mode 100644 index 3dfba41863..0000000000 --- a/repos/os/src/drivers/framebuffer/virtio/target_mmio.inc +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = virtio_mmio_fb -SRC_CC = mmio_device.cc -LIBS = base blit -INC_DIR = $(REP_DIR)/src/drivers/framebuffer/virtio - -vpath % $(REP_DIR)/src/drivers/framebuffer/virtio diff --git a/repos/os/src/drivers/i2c/imx8q_evk/target.mk b/repos/os/src/drivers/i2c/imx8q_evk/target.mk deleted file mode 100644 index bc19c41175..0000000000 --- a/repos/os/src/drivers/i2c/imx8q_evk/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -TARGET = imx8q_evk_i2c - -REQUIRES = arm_v8 - -SRC_CC += driver.cc - -INC_DIR += $(PRG_DIR)/src/drivers/i2c/imx8q_evk - -include $(REP_DIR)/src/drivers/i2c/target.inc diff --git a/repos/os/src/drivers/input/virtio/spec/arm/target.mk b/repos/os/src/drivers/input/virtio/spec/arm/target.mk deleted file mode 100644 index 89090dc1c3..0000000000 --- a/repos/os/src/drivers/input/virtio/spec/arm/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm - -include $(REP_DIR)/src/drivers/input/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/input/virtio/spec/arm_64/target.mk b/repos/os/src/drivers/input/virtio/spec/arm_64/target.mk deleted file mode 100644 index 7443d832aa..0000000000 --- a/repos/os/src/drivers/input/virtio/spec/arm_64/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm_64 - -include $(REP_DIR)/src/drivers/input/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/input/virtio/spec/riscv/target.mk b/repos/os/src/drivers/input/virtio/spec/riscv/target.mk deleted file mode 100644 index ecf75bc827..0000000000 --- a/repos/os/src/drivers/input/virtio/spec/riscv/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = riscv - -include $(REP_DIR)/src/drivers/input/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/input/virtio/target_mmio.inc b/repos/os/src/drivers/input/virtio/target_mmio.inc deleted file mode 100644 index e85ac392d5..0000000000 --- a/repos/os/src/drivers/input/virtio/target_mmio.inc +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = virtio_mmio_input -SRC_CC = mmio_device.cc -LIBS = base -INC_DIR = $(REP_DIR)/src/drivers/input/virtio - -vpath % $(REP_DIR)/src/drivers/input/virtio diff --git a/repos/os/src/drivers/nic/virtio/spec/arm/target.mk b/repos/os/src/drivers/nic/virtio/spec/arm/target.mk deleted file mode 100644 index 73920eeb1e..0000000000 --- a/repos/os/src/drivers/nic/virtio/spec/arm/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm - -include $(REP_DIR)/src/drivers/nic/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/nic/virtio/spec/arm_64/target.mk b/repos/os/src/drivers/nic/virtio/spec/arm_64/target.mk deleted file mode 100644 index ba17e4f3b6..0000000000 --- a/repos/os/src/drivers/nic/virtio/spec/arm_64/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = arm_64 - -include $(REP_DIR)/src/drivers/nic/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/nic/virtio/spec/riscv/target.mk b/repos/os/src/drivers/nic/virtio/spec/riscv/target.mk deleted file mode 100644 index 20569fd810..0000000000 --- a/repos/os/src/drivers/nic/virtio/spec/riscv/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -REQUIRES = riscv - -include $(REP_DIR)/src/drivers/nic/virtio/target_mmio.inc diff --git a/repos/os/src/drivers/rtc/dummy/target.mk b/repos/os/src/drivers/rtc/dummy/target.mk deleted file mode 100644 index b99a8013ec..0000000000 --- a/repos/os/src/drivers/rtc/dummy/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = dummy_rtc -LIBS = base - -include $(REP_DIR)/src/drivers/rtc/target.inc diff --git a/repos/os/src/drivers/rtc/target.inc b/repos/os/src/drivers/rtc/target.inc deleted file mode 100644 index 49c4942c1c..0000000000 --- a/repos/os/src/drivers/rtc/target.inc +++ /dev/null @@ -1,5 +0,0 @@ -SRC_CC = main.cc rtc.cc -INC_DIR += $(REP_DIR)/src/drivers/rtc - -vpath main.cc $(REP_DIR)/src/drivers/rtc -vpath rtc.cc $(PRG_DIR) diff --git a/repos/os/src/drivers/sd_card/imx53/target.mk b/repos/os/src/drivers/sd_card/imx53/target.mk deleted file mode 100644 index d1060e3a9f..0000000000 --- a/repos/os/src/drivers/sd_card/imx53/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = imx53_sd_card -REQUIRES = arm_v7 -SRC_CC = adma2.cc imx/driver.cc -INC_DIR = $(REP_DIR)/src/drivers/sd_card/imx - -include $(REP_DIR)/src/drivers/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/imx6/target.mk b/repos/os/src/drivers/sd_card/imx6/target.mk deleted file mode 100644 index ccba906a91..0000000000 --- a/repos/os/src/drivers/sd_card/imx6/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = imx6_sd_card -SRC_CC = adma2.cc imx/driver.cc -INC_DIR = $(REP_DIR)/src/drivers/sd_card/imx -REQUIRES = arm_v7a - -include $(REP_DIR)/src/drivers/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/pl180/target.mk b/repos/os/src/drivers/sd_card/pl180/target.mk deleted file mode 100644 index 1fcd465697..0000000000 --- a/repos/os/src/drivers/sd_card/pl180/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = pl180_sd_card -REQUIRES = arm_v7 - -include $(REP_DIR)/src/drivers/sd_card/target.inc diff --git a/repos/os/src/drivers/sd_card/target.inc b/repos/os/src/drivers/sd_card/target.inc deleted file mode 100644 index 7ed2532b50..0000000000 --- a/repos/os/src/drivers/sd_card/target.inc +++ /dev/null @@ -1,6 +0,0 @@ -SRC_CC += main.cc driver.cc -LIBS += base -INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/sd_card - -vpath %.cc $(REP_DIR)/src/drivers/sd_card -vpath %.cc $(PRG_DIR) diff --git a/repos/os/src/drivers/uart/spec/pbxa9/target.mk b/repos/os/src/drivers/uart/spec/pbxa9/target.mk deleted file mode 100644 index 110600cbce..0000000000 --- a/repos/os/src/drivers/uart/spec/pbxa9/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = pbxa9_uart -REQUIRES = arm_v7 - -include $(REP_DIR)/src/drivers/uart/target.inc diff --git a/repos/os/src/drivers/uart/spec/x86/target.mk b/repos/os/src/drivers/uart/spec/x86/target.mk deleted file mode 100644 index c5bb5f8489..0000000000 --- a/repos/os/src/drivers/uart/spec/x86/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = pc_uart -REQUIRES = x86 - -include $(REP_DIR)/src/drivers/uart/target.inc diff --git a/repos/os/src/drivers/virtdev_rom/spec/arm/target.mk b/repos/os/src/drivers/virtdev_rom/spec/arm/target.mk deleted file mode 100644 index a5b7d389b1..0000000000 --- a/repos/os/src/drivers/virtdev_rom/spec/arm/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -REQUIRES = arm - -INC_DIR = $(PRG_DIR) - -include $(REP_DIR)/src/drivers/virtdev_rom/target.inc diff --git a/repos/os/src/drivers/virtdev_rom/spec/arm_64/target.mk b/repos/os/src/drivers/virtdev_rom/spec/arm_64/target.mk deleted file mode 100644 index 27474ca3a8..0000000000 --- a/repos/os/src/drivers/virtdev_rom/spec/arm_64/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -REQUIRES = arm_64 - -INC_DIR = $(PRG_DIR)/../arm - -include $(REP_DIR)/src/drivers/virtdev_rom/target.inc diff --git a/repos/os/src/drivers/virtdev_rom/spec/riscv/target.mk b/repos/os/src/drivers/virtdev_rom/spec/riscv/target.mk deleted file mode 100644 index 9932022332..0000000000 --- a/repos/os/src/drivers/virtdev_rom/spec/riscv/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -REQUIRES = riscv - -INC_DIR = $(PRG_DIR) - -include $(REP_DIR)/src/drivers/virtdev_rom/target.inc diff --git a/repos/pc/recipes/src/pc_intel_fb/content.mk b/repos/pc/recipes/src/pc_intel_fb/content.mk index 94aa3c0024..a5ccba775b 100644 --- a/repos/pc/recipes/src/pc_intel_fb/content.mk +++ b/repos/pc/recipes/src/pc_intel_fb/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/drivers/framebuffer/intel/pc \ +MIRROR_FROM_REP_DIR := src/driver/framebuffer/intel/pc \ src/lib/pc/lx_emul \ src/include diff --git a/repos/pc/recipes/src/pc_nic/content.mk b/repos/pc/recipes/src/pc_nic/content.mk index 6ebc3cfe09..5b097b8cdc 100644 --- a/repos/pc/recipes/src/pc_nic/content.mk +++ b/repos/pc/recipes/src/pc_nic/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/drivers/nic/pc \ +MIRROR_FROM_REP_DIR := src/driver/nic/pc \ src/lib/pc/lx_emul \ src/include diff --git a/repos/pc/recipes/src/pc_nic/hash b/repos/pc/recipes/src/pc_nic/hash index b82c8b1e07..90f87c2a38 100644 --- a/repos/pc/recipes/src/pc_nic/hash +++ b/repos/pc/recipes/src/pc_nic/hash @@ -1 +1 @@ -2024-05-28 eac83fc96d0ecce14620d8cf906f7456ad7111d5 +2024-05-31 7049aa215ae525e1b6c1d3116ccab3e09f087794 diff --git a/repos/pc/recipes/src/pc_platform/content.mk b/repos/pc/recipes/src/pc_platform/content.mk index 5478306037..903d5863e2 100644 --- a/repos/pc/recipes/src/pc_platform/content.mk +++ b/repos/pc/recipes/src/pc_platform/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/platform/pc +SRC_DIR = src/driver/platform/pc include $(GENODE_DIR)/repos/os/recipes/src/platform/content.inc diff --git a/repos/pc/recipes/src/pc_usb_host/content.mk b/repos/pc/recipes/src/pc_usb_host/content.mk index 3de00a11d7..9ba7272d45 100644 --- a/repos/pc/recipes/src/pc_usb_host/content.mk +++ b/repos/pc/recipes/src/pc_usb_host/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/drivers/usb_host/pc \ +MIRROR_FROM_REP_DIR := src/driver/usb_host/pc \ src/lib/pc/lx_emul \ src/include MIRROR_FROM_OS_DIR := src/lib/genode_c_api/usb.cc diff --git a/repos/pc/recipes/src/pc_usb_host/hash b/repos/pc/recipes/src/pc_usb_host/hash index ef3601dfb1..30f108332b 100644 --- a/repos/pc/recipes/src/pc_usb_host/hash +++ b/repos/pc/recipes/src/pc_usb_host/hash @@ -1 +1 @@ -2024-05-28 0bb21364133043ce7eb214ec9fa28ec52b0a9682 +2024-05-31 1a0c96e039a95df6b332e3fddf518486616b11b8 diff --git a/repos/pc/recipes/src/pc_wifi/content.mk b/repos/pc/recipes/src/pc_wifi/content.mk index 4ab7f1e53d..a98eaab32c 100644 --- a/repos/pc/recipes/src/pc_wifi/content.mk +++ b/repos/pc/recipes/src/pc_wifi/content.mk @@ -28,7 +28,7 @@ DDE_LINUX_LIB_MK := \ $(addprefix lib/mk/,wpa_driver_nl80211.mk wpa_supplicant.mk) MIRROR_FROM_DDE_LINUX_DIR := $(DDE_LINUX_LIB_MK) \ - src/drivers/wifi \ + src/driver/wifi \ lib/import/import-libnl_include.mk \ lib/import/import-libnl.mk \ lib/symbols/wifi \ diff --git a/repos/pc/run/intel_fb.run b/repos/pc/run/intel_fb.run index 54367f9e77..d9dd527ebd 100644 --- a/repos/pc/run/intel_fb.run +++ b/repos/pc/run/intel_fb.run @@ -25,17 +25,17 @@ if {$use_fb_controller} { set build_components { core lib/ld init timer - drivers/acpi - drivers/platform + driver/acpi + driver/platform app/pci_decode - drivers/framebuffer/intel/pc + driver/framebuffer/intel/pc test/framebuffer server/report_rom server/vfs lib/vfs lib/vfs_import server/fs_rom } -append_if $use_gpu build_components { drivers/gpu/intel } +append_if $use_gpu build_components { driver/gpu/intel } append_if $use_top build_components { app/top } build $build_components diff --git a/repos/pc/run/pc_nic.run b/repos/pc/run/pc_nic.run index 67c0900d0b..7970abde2e 100644 --- a/repos/pc/run/pc_nic.run +++ b/repos/pc/run/pc_nic.run @@ -1,10 +1,6 @@ assert_spec x86 -set build_components { - drivers/nic/pc -} - -build $build_components +build { driver/nic/pc } create_boot_directory diff --git a/repos/pc/run/pc_wifi.run b/repos/pc/run/pc_wifi.run index 1c9cfc4f20..2165813fc4 100644 --- a/repos/pc/run/pc_wifi.run +++ b/repos/pc/run/pc_wifi.run @@ -84,9 +84,9 @@ import_from_depot [depot_user]/pkg/pc_wifi \ set build_components { core init timer app/pci_decode - drivers/acpi - drivers/platform - drivers/rtc + driver/acpi + driver/platform + driver/rtc server/report_rom server/dynamic_rom server/nic_router @@ -95,7 +95,7 @@ set build_components { } append_if $debug_driver build_components { - drivers/wifi + driver/wifi lib/pc_wifi lib/vfs_jitterentropy } diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/README b/repos/pc/src/driver/framebuffer/intel/pc/README similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/README rename to repos/pc/src/driver/framebuffer/intel/pc/README diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/dep.list b/repos/pc/src/driver/framebuffer/intel/pc/dep.list similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/dep.list rename to repos/pc/src/driver/framebuffer/intel/pc/dep.list diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/dummies.c b/repos/pc/src/driver/framebuffer/intel/pc/dummies.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/dummies.c rename to repos/pc/src/driver/framebuffer/intel/pc/dummies.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/emul.cc b/repos/pc/src/driver/framebuffer/intel/pc/emul.cc similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/emul.cc rename to repos/pc/src/driver/framebuffer/intel/pc/emul.cc diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/fb.c b/repos/pc/src/driver/framebuffer/intel/pc/fb.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/fb.c rename to repos/pc/src/driver/framebuffer/intel/pc/fb.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/gem.c b/repos/pc/src/driver/framebuffer/intel/pc/gem.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/gem.c rename to repos/pc/src/driver/framebuffer/intel/pc/gem.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/generated_dummies.c b/repos/pc/src/driver/framebuffer/intel/pc/generated_dummies.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/generated_dummies.c rename to repos/pc/src/driver/framebuffer/intel/pc/generated_dummies.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/lx_emul.c b/repos/pc/src/driver/framebuffer/intel/pc/lx_emul.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/lx_emul.c rename to repos/pc/src/driver/framebuffer/intel/pc/lx_emul.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/lx_emul.h b/repos/pc/src/driver/framebuffer/intel/pc/lx_emul.h similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/lx_emul.h rename to repos/pc/src/driver/framebuffer/intel/pc/lx_emul.h diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/lx_emul/fb.h b/repos/pc/src/driver/framebuffer/intel/pc/lx_emul/fb.h similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/lx_emul/fb.h rename to repos/pc/src/driver/framebuffer/intel/pc/lx_emul/fb.h diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/lx_i915.h b/repos/pc/src/driver/framebuffer/intel/pc/lx_i915.h similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/lx_i915.h rename to repos/pc/src/driver/framebuffer/intel/pc/lx_i915.h diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/lx_user.c b/repos/pc/src/driver/framebuffer/intel/pc/lx_user.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/lx_user.c rename to repos/pc/src/driver/framebuffer/intel/pc/lx_user.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/main.cc b/repos/pc/src/driver/framebuffer/intel/pc/main.cc similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/main.cc rename to repos/pc/src/driver/framebuffer/intel/pc/main.cc diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/opregion_io_mem.cc b/repos/pc/src/driver/framebuffer/intel/pc/opregion_io_mem.cc similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/opregion_io_mem.cc rename to repos/pc/src/driver/framebuffer/intel/pc/opregion_io_mem.cc diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/pci.c b/repos/pc/src/driver/framebuffer/intel/pc/pci.c similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/pci.c rename to repos/pc/src/driver/framebuffer/intel/pc/pci.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/dep.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/dep.list similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/dep.list rename to repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/dep.list diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/source.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/source.list rename to repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/source.list diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/target.mk b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/target.mk similarity index 65% rename from repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/target.mk rename to repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/target.mk index d74c56df41..68493deb75 100644 --- a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_32/target.mk +++ b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_32/target.mk @@ -1,4 +1,4 @@ -include $(REP_DIR)/src/drivers/framebuffer/intel/pc/target.inc +include $(REP_DIR)/src/driver/framebuffer/intel/pc/target.inc REQUIRES += 32bit SRC_C += lx_emul/spec/x86_32/atomic64_32.c diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/dep.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/dep.list similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/dep.list rename to repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/dep.list diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/source.list b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/source.list rename to repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/source.list diff --git a/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/target.mk b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/target.mk new file mode 100644 index 0000000000..157bf47bfb --- /dev/null +++ b/repos/pc/src/driver/framebuffer/intel/pc/spec/x86_64/target.mk @@ -0,0 +1,3 @@ +include $(REP_DIR)/src/driver/framebuffer/intel/pc/target.inc + +REQUIRES += 64bit diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/target.inc b/repos/pc/src/driver/framebuffer/intel/pc/target.inc similarity index 100% rename from repos/pc/src/drivers/framebuffer/intel/pc/target.inc rename to repos/pc/src/driver/framebuffer/intel/pc/target.inc diff --git a/repos/pc/src/drivers/nic/pc/dep.list b/repos/pc/src/driver/nic/pc/dep.list similarity index 100% rename from repos/pc/src/drivers/nic/pc/dep.list rename to repos/pc/src/driver/nic/pc/dep.list diff --git a/repos/pc/src/drivers/nic/pc/dummies.c b/repos/pc/src/driver/nic/pc/dummies.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/dummies.c rename to repos/pc/src/driver/nic/pc/dummies.c diff --git a/repos/pc/src/drivers/nic/pc/lx_emul.c b/repos/pc/src/driver/nic/pc/lx_emul.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/lx_emul.c rename to repos/pc/src/driver/nic/pc/lx_emul.c diff --git a/repos/pc/src/drivers/nic/pc/lx_emul.h b/repos/pc/src/driver/nic/pc/lx_emul.h similarity index 100% rename from repos/pc/src/drivers/nic/pc/lx_emul.h rename to repos/pc/src/driver/nic/pc/lx_emul.h diff --git a/repos/pc/src/drivers/nic/pc/lx_user.c b/repos/pc/src/driver/nic/pc/lx_user.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/lx_user.c rename to repos/pc/src/driver/nic/pc/lx_user.c diff --git a/repos/pc/src/drivers/nic/pc/main.cc b/repos/pc/src/driver/nic/pc/main.cc similarity index 100% rename from repos/pc/src/drivers/nic/pc/main.cc rename to repos/pc/src/driver/nic/pc/main.cc diff --git a/repos/pc/src/drivers/nic/pc/rtnetlink.c b/repos/pc/src/driver/nic/pc/rtnetlink.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/rtnetlink.c rename to repos/pc/src/driver/nic/pc/rtnetlink.c diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_32/generated_dummies.c b/repos/pc/src/driver/nic/pc/spec/x86_32/generated_dummies.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_32/generated_dummies.c rename to repos/pc/src/driver/nic/pc/spec/x86_32/generated_dummies.c diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_32/source.list b/repos/pc/src/driver/nic/pc/spec/x86_32/source.list similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_32/source.list rename to repos/pc/src/driver/nic/pc/spec/x86_32/source.list diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_32/target.mk b/repos/pc/src/driver/nic/pc/spec/x86_32/target.mk similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_32/target.mk rename to repos/pc/src/driver/nic/pc/spec/x86_32/target.mk diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_64/generated_dummies.c b/repos/pc/src/driver/nic/pc/spec/x86_64/generated_dummies.c similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_64/generated_dummies.c rename to repos/pc/src/driver/nic/pc/spec/x86_64/generated_dummies.c diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_64/source.list b/repos/pc/src/driver/nic/pc/spec/x86_64/source.list similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_64/source.list rename to repos/pc/src/driver/nic/pc/spec/x86_64/source.list diff --git a/repos/pc/src/drivers/nic/pc/spec/x86_64/target.mk b/repos/pc/src/driver/nic/pc/spec/x86_64/target.mk similarity index 100% rename from repos/pc/src/drivers/nic/pc/spec/x86_64/target.mk rename to repos/pc/src/driver/nic/pc/spec/x86_64/target.mk diff --git a/repos/pc/src/drivers/nic/pc/target.inc b/repos/pc/src/driver/nic/pc/target.inc similarity index 100% rename from repos/pc/src/drivers/nic/pc/target.inc rename to repos/pc/src/driver/nic/pc/target.inc diff --git a/repos/pc/src/drivers/platform/pc/expanding_page_table_allocator.h b/repos/pc/src/driver/platform/pc/expanding_page_table_allocator.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/expanding_page_table_allocator.h rename to repos/pc/src/driver/platform/pc/expanding_page_table_allocator.h diff --git a/repos/pc/src/drivers/platform/pc/intel/context_table.cc b/repos/pc/src/driver/platform/pc/intel/context_table.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/context_table.cc rename to repos/pc/src/driver/platform/pc/intel/context_table.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/context_table.h b/repos/pc/src/driver/platform/pc/intel/context_table.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/context_table.h rename to repos/pc/src/driver/platform/pc/intel/context_table.h diff --git a/repos/pc/src/drivers/platform/pc/intel/default_mappings.cc b/repos/pc/src/driver/platform/pc/intel/default_mappings.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/default_mappings.cc rename to repos/pc/src/driver/platform/pc/intel/default_mappings.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/default_mappings.h b/repos/pc/src/driver/platform/pc/intel/default_mappings.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/default_mappings.h rename to repos/pc/src/driver/platform/pc/intel/default_mappings.h diff --git a/repos/pc/src/drivers/platform/pc/intel/domain_allocator.h b/repos/pc/src/driver/platform/pc/intel/domain_allocator.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/domain_allocator.h rename to repos/pc/src/driver/platform/pc/intel/domain_allocator.h diff --git a/repos/pc/src/drivers/platform/pc/intel/io_mmu.cc b/repos/pc/src/driver/platform/pc/intel/io_mmu.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/io_mmu.cc rename to repos/pc/src/driver/platform/pc/intel/io_mmu.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/io_mmu.h b/repos/pc/src/driver/platform/pc/intel/io_mmu.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/io_mmu.h rename to repos/pc/src/driver/platform/pc/intel/io_mmu.h diff --git a/repos/pc/src/drivers/platform/pc/intel/managed_root_table.cc b/repos/pc/src/driver/platform/pc/intel/managed_root_table.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/managed_root_table.cc rename to repos/pc/src/driver/platform/pc/intel/managed_root_table.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/managed_root_table.h b/repos/pc/src/driver/platform/pc/intel/managed_root_table.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/managed_root_table.h rename to repos/pc/src/driver/platform/pc/intel/managed_root_table.h diff --git a/repos/pc/src/drivers/platform/pc/intel/page_table.cc b/repos/pc/src/driver/platform/pc/intel/page_table.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/page_table.cc rename to repos/pc/src/driver/platform/pc/intel/page_table.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/page_table.h b/repos/pc/src/driver/platform/pc/intel/page_table.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/page_table.h rename to repos/pc/src/driver/platform/pc/intel/page_table.h diff --git a/repos/pc/src/drivers/platform/pc/intel/report_helper.h b/repos/pc/src/driver/platform/pc/intel/report_helper.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/report_helper.h rename to repos/pc/src/driver/platform/pc/intel/report_helper.h diff --git a/repos/pc/src/drivers/platform/pc/intel/root_table.cc b/repos/pc/src/driver/platform/pc/intel/root_table.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/root_table.cc rename to repos/pc/src/driver/platform/pc/intel/root_table.cc diff --git a/repos/pc/src/drivers/platform/pc/intel/root_table.h b/repos/pc/src/driver/platform/pc/intel/root_table.h similarity index 100% rename from repos/pc/src/drivers/platform/pc/intel/root_table.h rename to repos/pc/src/driver/platform/pc/intel/root_table.h diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_32/main.cc b/repos/pc/src/driver/platform/pc/spec/x86_32/main.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/spec/x86_32/main.cc rename to repos/pc/src/driver/platform/pc/spec/x86_32/main.cc diff --git a/repos/pc/src/driver/platform/pc/spec/x86_32/target.mk b/repos/pc/src/driver/platform/pc/spec/x86_32/target.mk new file mode 100644 index 0000000000..cb51595492 --- /dev/null +++ b/repos/pc/src/driver/platform/pc/spec/x86_32/target.mk @@ -0,0 +1,4 @@ +TARGET = pc_platform +REQUIRES = x86_32 + +include $(call select_from_repositories,src/driver/platform/target.inc) diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_64/main.cc b/repos/pc/src/driver/platform/pc/spec/x86_64/main.cc similarity index 100% rename from repos/pc/src/drivers/platform/pc/spec/x86_64/main.cc rename to repos/pc/src/driver/platform/pc/spec/x86_64/main.cc diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk b/repos/pc/src/driver/platform/pc/spec/x86_64/target.mk similarity index 80% rename from repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk rename to repos/pc/src/driver/platform/pc/spec/x86_64/target.mk index 0a8ce3ce32..b4c1927e22 100644 --- a/repos/pc/src/drivers/platform/pc/spec/x86_64/target.mk +++ b/repos/pc/src/driver/platform/pc/spec/x86_64/target.mk @@ -1,7 +1,7 @@ TARGET = pc_platform REQUIRES = x86_64 -include $(call select_from_repositories,src/drivers/platform/target.inc) +include $(call select_from_repositories,src/driver/platform/target.inc) SRC_CC += intel/root_table.cc SRC_CC += intel/context_table.cc diff --git a/repos/pc/src/drivers/usb_host/pc/README b/repos/pc/src/driver/usb_host/pc/README similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/README rename to repos/pc/src/driver/usb_host/pc/README diff --git a/repos/pc/src/drivers/usb_host/pc/dep.list b/repos/pc/src/driver/usb_host/pc/dep.list similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/dep.list rename to repos/pc/src/driver/usb_host/pc/dep.list diff --git a/repos/pc/src/drivers/usb_host/pc/dummies.c b/repos/pc/src/driver/usb_host/pc/dummies.c similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/dummies.c rename to repos/pc/src/driver/usb_host/pc/dummies.c diff --git a/repos/pc/src/drivers/usb_host/pc/generated_dummies.c b/repos/pc/src/driver/usb_host/pc/generated_dummies.c similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/generated_dummies.c rename to repos/pc/src/driver/usb_host/pc/generated_dummies.c diff --git a/repos/pc/src/drivers/usb_host/pc/lx_emul.c b/repos/pc/src/driver/usb_host/pc/lx_emul.c similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/lx_emul.c rename to repos/pc/src/driver/usb_host/pc/lx_emul.c diff --git a/repos/pc/src/drivers/usb_host/pc/lx_emul.h b/repos/pc/src/driver/usb_host/pc/lx_emul.h similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/lx_emul.h rename to repos/pc/src/driver/usb_host/pc/lx_emul.h diff --git a/repos/pc/src/drivers/usb_host/pc/main.cc b/repos/pc/src/driver/usb_host/pc/main.cc similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/main.cc rename to repos/pc/src/driver/usb_host/pc/main.cc diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_32/dep.list b/repos/pc/src/driver/usb_host/pc/spec/x86_32/dep.list similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/spec/x86_32/dep.list rename to repos/pc/src/driver/usb_host/pc/spec/x86_32/dep.list diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_32/source.list b/repos/pc/src/driver/usb_host/pc/spec/x86_32/source.list similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/spec/x86_32/source.list rename to repos/pc/src/driver/usb_host/pc/spec/x86_32/source.list diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_32/target.mk b/repos/pc/src/driver/usb_host/pc/spec/x86_32/target.mk similarity index 68% rename from repos/pc/src/drivers/usb_host/pc/spec/x86_32/target.mk rename to repos/pc/src/driver/usb_host/pc/spec/x86_32/target.mk index 571119e8fb..602ec13135 100644 --- a/repos/pc/src/drivers/usb_host/pc/spec/x86_32/target.mk +++ b/repos/pc/src/driver/usb_host/pc/spec/x86_32/target.mk @@ -1,5 +1,5 @@ -include $(REP_DIR)/src/drivers/usb_host/pc/target.inc +include $(REP_DIR)/src/driver/usb_host/pc/target.inc REQUIRES += 32bit SRC_C += lx_emul/spec/x86_32/atomic64_32.c diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_64/dep.list b/repos/pc/src/driver/usb_host/pc/spec/x86_64/dep.list similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/spec/x86_64/dep.list rename to repos/pc/src/driver/usb_host/pc/spec/x86_64/dep.list diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_64/source.list b/repos/pc/src/driver/usb_host/pc/spec/x86_64/source.list similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/spec/x86_64/source.list rename to repos/pc/src/driver/usb_host/pc/spec/x86_64/source.list diff --git a/repos/pc/src/driver/usb_host/pc/spec/x86_64/target.mk b/repos/pc/src/driver/usb_host/pc/spec/x86_64/target.mk new file mode 100644 index 0000000000..c63bf3b969 --- /dev/null +++ b/repos/pc/src/driver/usb_host/pc/spec/x86_64/target.mk @@ -0,0 +1,3 @@ +include $(REP_DIR)/src/driver/usb_host/pc/target.inc + +REQUIRES += 64bit diff --git a/repos/pc/src/drivers/usb_host/pc/target.inc b/repos/pc/src/driver/usb_host/pc/target.inc similarity index 100% rename from repos/pc/src/drivers/usb_host/pc/target.inc rename to repos/pc/src/driver/usb_host/pc/target.inc diff --git a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/target.mk b/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/target.mk deleted file mode 100644 index 2504ab6cf0..0000000000 --- a/repos/pc/src/drivers/framebuffer/intel/pc/spec/x86_64/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -include $(REP_DIR)/src/drivers/framebuffer/intel/pc/target.inc - -REQUIRES += 64bit diff --git a/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk b/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk deleted file mode 100644 index 85b458d9a8..0000000000 --- a/repos/pc/src/drivers/platform/pc/spec/x86_32/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -TARGET = pc_platform -REQUIRES = x86_32 - -include $(call select_from_repositories,src/drivers/platform/target.inc) diff --git a/repos/pc/src/drivers/usb_host/pc/spec/x86_64/target.mk b/repos/pc/src/drivers/usb_host/pc/spec/x86_64/target.mk deleted file mode 100644 index 61794803d7..0000000000 --- a/repos/pc/src/drivers/usb_host/pc/spec/x86_64/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -include $(REP_DIR)/src/drivers/usb_host/pc/target.inc - -REQUIRES += 64bit diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/bus.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/bus.c index 3b51387deb..d83b06281c 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/bus.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/bus.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/bus.c + * \brief Replaces driver/acpi/bus.c * \author Josef Soentgen * \date 2022-05-06 */ diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c index 28f3c0f3fa..1aa0684db9 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/device_sysfs.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/device_sysfs.c + * \brief Replaces driver/acpi/device_sysfs.c * \author Josef Soentgen * \date 2022-05-06 */ diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/glue.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/glue.c index d74b5e8ace..27bcb8572d 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/glue.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/glue.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/glue.c + * \brief Replaces driver/acpi/glue.c * \author Josef Soentgen * \date 2022-05-05 */ diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/property.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/property.c index c652a111b3..f07635b701 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/property.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/property.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/property.c + * \brief Replaces driver/acpi/property.c * \author Josef Soentgen * \date 2022-05-06 */ diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/scan.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/scan.c index b130453e97..867648c401 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/scan.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/scan.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/scan.c + * \brief Replaces driver/acpi/scan.c * \author Josef Soentgen * \date 2022-05-06 */ diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/utils.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/utils.c index ac92a169d8..adb426527c 100644 --- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/utils.c +++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/acpi/utils.c @@ -1,5 +1,5 @@ /* - * \brief Replaces drivers/acpi/utils.c + * \brief Replaces driver/acpi/utils.c * \author Josef Soentgen * \date 2022-05-06 */ diff --git a/repos/ports/lib/mk/virtualbox5-main.mk b/repos/ports/lib/mk/virtualbox5-main.mk index 35809a71c2..a742828838 100644 --- a/repos/ports/lib/mk/virtualbox5-main.mk +++ b/repos/ports/lib/mk/virtualbox5-main.mk @@ -94,6 +94,6 @@ INC_DIR += $(REP_DIR)/src/virtualbox5/frontend INC_DIR += $(VIRTUALBOX_DIR)/VBoxAPIWrap # search path to 'scan_code_set_2.h' -INC_DIR += $(call select_from_repositories,src/drivers/ps2) +INC_DIR += $(call select_from_repositories,src/driver/ps2) CC_CXX_WARN_STRICT = diff --git a/repos/ports/recipes/src/vbox5-nova/content.mk b/repos/ports/recipes/src/vbox5-nova/content.mk index e2aaab4aae..2df069d3ac 100644 --- a/repos/ports/recipes/src/vbox5-nova/content.mk +++ b/repos/ports/recipes/src/vbox5-nova/content.mk @@ -65,7 +65,7 @@ $(MIRROR_FROM_QEMU_USB_PORT_DIR): mkdir -p $(dir $@) cp -r $(QEMU_USB_PORT_DIR)/$@ $(dir $@) -MIRROR_FROM_OS := src/drivers/ps2/scan_code_set_1.h \ +MIRROR_FROM_OS := src/driver/ps2/scan_code_set_1.h \ include/pointer/shape_report.h \ content: $(MIRROR_FROM_OS) diff --git a/repos/ports/recipes/src/vbox6/content.mk b/repos/ports/recipes/src/vbox6/content.mk index d133dd0fe5..a7acd4569a 100644 --- a/repos/ports/recipes/src/vbox6/content.mk +++ b/repos/ports/recipes/src/vbox6/content.mk @@ -65,7 +65,7 @@ $(MIRROR_FROM_QEMU_USB_PORT_DIR): mkdir -p $(dir $@) cp -r $(QEMU_USB_PORT_DIR)/$@ $(dir $@) -MIRROR_FROM_OS := src/drivers/ps2/scan_code_set_1.h \ +MIRROR_FROM_OS := src/driver/ps2/scan_code_set_1.h \ include/pointer/shape_report.h \ content: $(MIRROR_FROM_OS) diff --git a/repos/ports/run/gdb.inc b/repos/ports/run/gdb.inc index bd0995bde2..37e3148aa9 100644 --- a/repos/ports/run/gdb.inc +++ b/repos/ports/run/gdb.inc @@ -50,7 +50,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/[gdb_pkg_name] if {[have_include power_on/qemu]} { - append build_components { drivers/uart } + append build_components { driver/uart } } else { import_from_depot [depot_user]/pkg/[drivers_nic_pkg] \ [depot_user]/src/nic_router \ diff --git a/repos/ports/run/socat.run b/repos/ports/run/socat.run index 357cbae9c6..bbe16d722a 100644 --- a/repos/ports/run/socat.run +++ b/repos/ports/run/socat.run @@ -25,7 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/test-terminal_echo if {[have_include power_on/qemu]} { - build { drivers/uart } + build { driver/uart } } else { import_from_depot [depot_user]/pkg/[drivers_nic_pkg] \ [depot_user]/src/nic_router \ diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 1156c50813..9208e6445e 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -104,7 +104,7 @@ set build_components { lib/vfs lib/libc lib/posix lib/vfs_lwip lib/vfs_pipe lib/vfs_import server/event_filter server/report_rom server/fs_rom server/vfs server/tcp_terminal server/nic_router - drivers/nic + driver/nic } # diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index a8d546cb72..7fb877bcf4 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -38,8 +38,8 @@ if {![info exists webcam_vflip]} { set build_components { server/nic_router server/event_filter - drivers/nic/pc - drivers/audio + driver/nic/pc + driver/audio server/report_rom server/dynamic_rom } diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index e23b5c30da..2a4388247b 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -11,7 +11,7 @@ set use_gui 0 set build_components { lib/libiconv lib/qemu-usb lib/libyuv server/report_rom - drivers/framebuffer + driver/framebuffer virtualbox5 } @@ -30,9 +30,9 @@ import_from_depot [depot_user]/src/[base_src] \ lappend_if [expr $use_top] build_components app/top lappend_if [expr $use_serial] build_components server/log_terminal -lappend_if [have_spec x86] build_components drivers/rtc +lappend_if [have_spec x86] build_components driver/rtc -lappend_if [expr $use_net] build_components drivers/nic +lappend_if [expr $use_net] build_components driver/nic lappend_if [expr $use_net] build_components server/nic_router set config { diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run index 0c5e408e5c..76fa10e1e5 100644 --- a/repos/ports/run/virtualbox6.run +++ b/repos/ports/run/virtualbox6.run @@ -37,13 +37,13 @@ import_from_depot $depot_archives set build_components { lib/libc lib/vfs lib/libiconv lib/stdcxx lib/qemu-usb lib/virtualbox6-shaderlib - drivers/audio + driver/audio virtualbox6 } lappend_if [expr $use_top] build_components app/top lappend_if [expr $use_serial] build_components server/log_terminal -lappend_if [have_spec x86] build_components drivers/rtc +lappend_if [have_spec x86] build_components driver/rtc build $build_components diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index bcbd07c0c8..57cd83adf2 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -56,10 +56,10 @@ if {$use_rumpfs} { } append build_components { - drivers/ahci - drivers/framebuffer - drivers/rtc - drivers/ps2 + driver/ahci + driver/framebuffer + driver/rtc + driver/ps2 lib/qemu-usb lib/libyuv virtualbox5 } diff --git a/repos/ports/src/virtualbox5/frontend/console.h b/repos/ports/src/virtualbox5/frontend/console.h index 6963d7b7ce..169568f0ff 100644 --- a/repos/ports/src/virtualbox5/frontend/console.h +++ b/repos/ports/src/virtualbox5/frontend/console.h @@ -25,7 +25,7 @@ #include #include -/* included from os/src/drivers/ps2 */ +/* included from os/src/driver/ps2 */ #include /* repos/ports includes */ diff --git a/repos/ports/src/virtualbox5/target.inc b/repos/ports/src/virtualbox5/target.inc index 1637f16da6..34139151bf 100644 --- a/repos/ports/src/virtualbox5/target.inc +++ b/repos/ports/src/virtualbox5/target.inc @@ -55,4 +55,4 @@ INC_DIR += $(VBOX_DIR)/Main/xml INC_DIR += $(VBOX_DIR)/HostServices # search path to 'scan_code_set_2.h' -INC_DIR += $(call select_from_repositories,src/drivers/ps2) +INC_DIR += $(call select_from_repositories,src/driver/ps2) diff --git a/repos/ports/src/virtualbox6/scan_code.h b/repos/ports/src/virtualbox6/scan_code.h index 4fe9ade3e6..ae282542aa 100644 --- a/repos/ports/src/virtualbox6/scan_code.h +++ b/repos/ports/src/virtualbox6/scan_code.h @@ -16,7 +16,7 @@ #define _SCAN_CODE_H_ /* Genode includes */ -#include /* included from os/src/drivers/ps2 */ +#include /* included from os/src/driver/ps2 */ class Scan_code diff --git a/repos/ports/src/virtualbox6/target.mk b/repos/ports/src/virtualbox6/target.mk index 941004d21c..20030138cc 100644 --- a/repos/ports/src/virtualbox6/target.mk +++ b/repos/ports/src/virtualbox6/target.mk @@ -52,7 +52,7 @@ INC_DIR += $(VIRTUALBOX_DIR)/VBoxAPIWrap INC_DIR += $(VIRTUALBOX_DIR)/include/VBox/Graphics # search path to 'scan_code_set_1.h' -INC_DIR += $(call select_from_repositories,src/drivers/ps2) +INC_DIR += $(call select_from_repositories,src/driver/ps2) # export VirtualBox symbols to shared objects (e.g., VBoxSharedClipboard.so) LD_OPT = --export-dynamic