From fcb21732e0ae74d4efa7075e24cac68d04ead211 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 14 Aug 2020 12:03:09 +0200 Subject: [PATCH] Move drivers/input/spec/ps2 to drivers/ps2 This simplifies the directory structure. Issue #2190 --- repos/libports/run/acpica.run | 2 +- repos/os/recipes/src/pbxa9_drivers/content.mk | 6 +++--- repos/os/recipes/src/ps2_drv/content.mk | 2 +- repos/os/run/audio_out_click.run | 2 +- repos/os/run/input.run | 2 +- repos/os/src/drivers/{input/spec => }/ps2/README | 0 repos/os/src/drivers/{input/spec => }/ps2/input_driver.h | 0 repos/os/src/drivers/{input/spec => }/ps2/irq_handler.h | 0 repos/os/src/drivers/{input/spec => }/ps2/led_state.h | 0 repos/os/src/drivers/{input/spec => }/ps2/pl050/main.cc | 0 repos/os/src/drivers/{input/spec => }/ps2/pl050/pl050.h | 0 repos/os/src/drivers/{input/spec => }/ps2/pl050/target.mk | 0 repos/os/src/drivers/{input/spec => }/ps2/ps2_keyboard.h | 0 repos/os/src/drivers/{input/spec => }/ps2/ps2_mouse.h | 0 repos/os/src/drivers/{input/spec => }/ps2/scan_code_set_1.h | 0 repos/os/src/drivers/{input/spec => }/ps2/scan_code_set_2.h | 0 .../os/src/drivers/{input/spec => }/ps2/serial_interface.h | 0 repos/os/src/drivers/{input/spec => }/ps2/verbose.h | 0 repos/os/src/drivers/{input/spec => }/ps2/x86/i8042.h | 0 repos/os/src/drivers/{input/spec => }/ps2/x86/main.cc | 0 repos/os/src/drivers/{input/spec => }/ps2/x86/target.mk | 0 repos/ports/lib/mk/virtualbox5-main.mk | 2 +- repos/ports/recipes/src/vbox5-nova/content.mk | 2 +- repos/ports/recipes/src/vbox5/content.mk | 2 +- repos/ports/run/seoul.inc | 2 +- repos/ports/run/vbox5_genode_usb_hid.run | 2 +- repos/ports/run/virtualbox.run | 2 +- repos/ports/run/virtualbox_auto.inc | 2 +- repos/ports/src/virtualbox5/frontend/console.h | 2 +- repos/ports/src/virtualbox5/target.inc | 2 +- 30 files changed, 16 insertions(+), 16 deletions(-) rename repos/os/src/drivers/{input/spec => }/ps2/README (100%) rename repos/os/src/drivers/{input/spec => }/ps2/input_driver.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/irq_handler.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/led_state.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/pl050/main.cc (100%) rename repos/os/src/drivers/{input/spec => }/ps2/pl050/pl050.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/pl050/target.mk (100%) rename repos/os/src/drivers/{input/spec => }/ps2/ps2_keyboard.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/ps2_mouse.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/scan_code_set_1.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/scan_code_set_2.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/serial_interface.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/verbose.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/x86/i8042.h (100%) rename repos/os/src/drivers/{input/spec => }/ps2/x86/main.cc (100%) rename repos/os/src/drivers/{input/spec => }/ps2/x86/target.mk (100%) diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 9f2b2458ed..b5c33b42c5 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -11,7 +11,7 @@ if { set build_components { core init timer - drivers/input + drivers/ps2 server/dynamic_rom server/event_filter server/report_rom diff --git a/repos/os/recipes/src/pbxa9_drivers/content.mk b/repos/os/recipes/src/pbxa9_drivers/content.mk index 1575cf12a4..bbf6ffb774 100644 --- a/repos/os/recipes/src/pbxa9_drivers/content.mk +++ b/repos/os/recipes/src/pbxa9_drivers/content.mk @@ -3,7 +3,7 @@ include $(GENODE_DIR)/repos/base/recipes/src/content.inc content: src/drivers src/drivers: - mkdir -p $@/framebuffer $@/input/ps2 + mkdir -p $@/framebuffer $@/ps2 cp -r $(REP_DIR)/src/drivers/framebuffer/pl11x/* $@/framebuffer - cp $(REP_DIR)/src/drivers/input/spec/ps2/*.h $@/input/ps2/ - cp -r $(REP_DIR)/src/drivers/input/spec/ps2/pl050 $@/input/ps2/ + cp $(REP_DIR)/src/drivers/ps2/*.h $@/ps2/ + cp -r $(REP_DIR)/src/drivers/ps2/pl050 $@/ps2/ diff --git a/repos/os/recipes/src/ps2_drv/content.mk b/repos/os/recipes/src/ps2_drv/content.mk index 8bd25d5718..b6dc8f6673 100644 --- a/repos/os/recipes/src/ps2_drv/content.mk +++ b/repos/os/recipes/src/ps2_drv/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/drivers/input/spec/ps2 +SRC_DIR = src/drivers/ps2 include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/run/audio_out_click.run b/repos/os/run/audio_out_click.run index 575efcb77e..a3a949205b 100644 --- a/repos/os/run/audio_out_click.run +++ b/repos/os/run/audio_out_click.run @@ -7,7 +7,7 @@ assert_spec x86 set build_components { core init timer drivers/audio - drivers/input + drivers/ps2 server/mixer test/audio_out test/audio_out_click diff --git a/repos/os/run/input.run b/repos/os/run/input.run index 0e2767f79f..916c734793 100644 --- a/repos/os/run/input.run +++ b/repos/os/run/input.run @@ -9,7 +9,7 @@ set build_components { core init timer server/dynamic_rom server/event_dump } source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components -lappend_if [have_spec ps2] build_components drivers/input/spec/ps2 +lappend_if [have_spec ps2] build_components drivers/ps2 lappend_if [have_spec sdl] build_components drivers/framebuffer/spec/sdl lappend_if [have_spec sdl] build_components server/nitpicker diff --git a/repos/os/src/drivers/input/spec/ps2/README b/repos/os/src/drivers/ps2/README similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/README rename to repos/os/src/drivers/ps2/README diff --git a/repos/os/src/drivers/input/spec/ps2/input_driver.h b/repos/os/src/drivers/ps2/input_driver.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/input_driver.h rename to repos/os/src/drivers/ps2/input_driver.h diff --git a/repos/os/src/drivers/input/spec/ps2/irq_handler.h b/repos/os/src/drivers/ps2/irq_handler.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/irq_handler.h rename to repos/os/src/drivers/ps2/irq_handler.h diff --git a/repos/os/src/drivers/input/spec/ps2/led_state.h b/repos/os/src/drivers/ps2/led_state.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/led_state.h rename to repos/os/src/drivers/ps2/led_state.h diff --git a/repos/os/src/drivers/input/spec/ps2/pl050/main.cc b/repos/os/src/drivers/ps2/pl050/main.cc similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/pl050/main.cc rename to repos/os/src/drivers/ps2/pl050/main.cc diff --git a/repos/os/src/drivers/input/spec/ps2/pl050/pl050.h b/repos/os/src/drivers/ps2/pl050/pl050.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/pl050/pl050.h rename to repos/os/src/drivers/ps2/pl050/pl050.h diff --git a/repos/os/src/drivers/input/spec/ps2/pl050/target.mk b/repos/os/src/drivers/ps2/pl050/target.mk similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/pl050/target.mk rename to repos/os/src/drivers/ps2/pl050/target.mk diff --git a/repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h b/repos/os/src/drivers/ps2/ps2_keyboard.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/ps2_keyboard.h rename to repos/os/src/drivers/ps2/ps2_keyboard.h diff --git a/repos/os/src/drivers/input/spec/ps2/ps2_mouse.h b/repos/os/src/drivers/ps2/ps2_mouse.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/ps2_mouse.h rename to repos/os/src/drivers/ps2/ps2_mouse.h diff --git a/repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h b/repos/os/src/drivers/ps2/scan_code_set_1.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/scan_code_set_1.h rename to repos/os/src/drivers/ps2/scan_code_set_1.h diff --git a/repos/os/src/drivers/input/spec/ps2/scan_code_set_2.h b/repos/os/src/drivers/ps2/scan_code_set_2.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/scan_code_set_2.h rename to repos/os/src/drivers/ps2/scan_code_set_2.h diff --git a/repos/os/src/drivers/input/spec/ps2/serial_interface.h b/repos/os/src/drivers/ps2/serial_interface.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/serial_interface.h rename to repos/os/src/drivers/ps2/serial_interface.h diff --git a/repos/os/src/drivers/input/spec/ps2/verbose.h b/repos/os/src/drivers/ps2/verbose.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/verbose.h rename to repos/os/src/drivers/ps2/verbose.h diff --git a/repos/os/src/drivers/input/spec/ps2/x86/i8042.h b/repos/os/src/drivers/ps2/x86/i8042.h similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/x86/i8042.h rename to repos/os/src/drivers/ps2/x86/i8042.h diff --git a/repos/os/src/drivers/input/spec/ps2/x86/main.cc b/repos/os/src/drivers/ps2/x86/main.cc similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/x86/main.cc rename to repos/os/src/drivers/ps2/x86/main.cc diff --git a/repos/os/src/drivers/input/spec/ps2/x86/target.mk b/repos/os/src/drivers/ps2/x86/target.mk similarity index 100% rename from repos/os/src/drivers/input/spec/ps2/x86/target.mk rename to repos/os/src/drivers/ps2/x86/target.mk diff --git a/repos/ports/lib/mk/virtualbox5-main.mk b/repos/ports/lib/mk/virtualbox5-main.mk index 780262cf39..35809a71c2 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/input/spec/ps2) +INC_DIR += $(call select_from_repositories,src/drivers/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 5baeec96f7..954da15763 100644 --- a/repos/ports/recipes/src/vbox5-nova/content.mk +++ b/repos/ports/recipes/src/vbox5-nova/content.mk @@ -66,7 +66,7 @@ $(MIRROR_FROM_QEMU_USB_PORT_DIR): mkdir -p $(dir $@) cp -r $(QEMU_USB_PORT_DIR)/$@ $(dir $@) -MIRROR_FROM_OS := src/drivers/input/spec/ps2/scan_code_set_1.h \ +MIRROR_FROM_OS := src/drivers/ps2/scan_code_set_1.h \ include/pointer/shape_report.h \ content: $(MIRROR_FROM_OS) diff --git a/repos/ports/recipes/src/vbox5/content.mk b/repos/ports/recipes/src/vbox5/content.mk index e933bcef8e..1b2c8778f2 100644 --- a/repos/ports/recipes/src/vbox5/content.mk +++ b/repos/ports/recipes/src/vbox5/content.mk @@ -67,7 +67,7 @@ $(MIRROR_FROM_QEMU_USB_PORT_DIR): mkdir -p $(dir $@) cp -r $(QEMU_USB_PORT_DIR)/$@ $(dir $@) -MIRROR_FROM_OS := src/drivers/input/spec/ps2/scan_code_set_1.h \ +MIRROR_FROM_OS := src/drivers/ps2/scan_code_set_1.h \ include/pointer/shape_report.h \ content: $(MIRROR_FROM_OS) diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 2a27a6bad2..90032c1d8d 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -62,7 +62,7 @@ proc platform_drv_priority {} { return { priority="-1"} } set build_components { drivers/rtc - drivers/input + drivers/ps2 app/seoul } diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index 1dfba00ffb..c70320fd5d 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -15,7 +15,7 @@ if { [have_include "power_on/qemu"] || ![have_spec nova] || ![have_spec x86_64]} set build_components { drivers/framebuffer - drivers/input + drivers/ps2 drivers/usb server/log_terminal server/fs_rom diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index d28a0aacb0..59f837b744 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -36,7 +36,7 @@ source ${genode_dir}/repos/base/run/platform_drv.inc proc platform_drv_priority {} { return { priority="-1"} } lappend_if [expr $use_top] build_components app/top -lappend_if [expr $use_ps2] build_components drivers/input +lappend_if [expr $use_ps2] build_components drivers/ps2 lappend_if [expr $use_usb] build_components drivers/usb lappend_if [expr $use_serial] build_components server/log_terminal lappend_if [have_spec x86] build_components drivers/rtc diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 6ee171e4bf..56da730ecb 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -41,7 +41,7 @@ lappend_if [expr $use_serial] build_components server/log_terminal lappend_if [expr $use_rumpfs] build_components lib/vfs/rump lappend_if [expr $use_rumpfs] build_components server/vfs lappend_if [expr $use_vbox5] build_components virtualbox5 -lappend_if [expr $use_ps2] build_components drivers/input +lappend_if [expr $use_ps2] build_components drivers/ps2 lappend_if [expr $use_usb] build_components drivers/usb lappend_if [expr $use_usb] build_components app/usb_report_filter lappend_if [have_spec x86] build_components drivers/rtc diff --git a/repos/ports/src/virtualbox5/frontend/console.h b/repos/ports/src/virtualbox5/frontend/console.h index 184220593f..2b37739566 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/input/spec/ps2 */ +/* included from os/src/drivers/ps2 */ #include /* repos/ports includes */ diff --git a/repos/ports/src/virtualbox5/target.inc b/repos/ports/src/virtualbox5/target.inc index 5a93c8e71d..b7eb0fdb40 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/input/spec/ps2) +INC_DIR += $(call select_from_repositories,src/drivers/ps2)