Move drivers/input/spec/ps2 to drivers/ps2

This simplifies the directory structure.

Issue #2190
This commit is contained in:
Norman Feske 2020-08-14 12:03:09 +02:00
parent db0e86fa41
commit fcb21732e0
30 changed files with 16 additions and 16 deletions

View File

@ -11,7 +11,7 @@ if {
set build_components {
core init timer
drivers/input
drivers/ps2
server/dynamic_rom
server/event_filter
server/report_rom

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 =

View File

@ -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)

View File

@ -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)

View File

@ -62,7 +62,7 @@ proc platform_drv_priority {} { return { priority="-1"} }
set build_components {
drivers/rtc
drivers/input
drivers/ps2
app/seoul
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -25,7 +25,7 @@
#include <report_session/connection.h>
#include <timer_session/connection.h>
/* included from os/src/drivers/input/spec/ps2 */
/* included from os/src/drivers/ps2 */
#include <scan_code_set_1.h>
/* repos/ports includes */

View File

@ -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)