ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disambiguate names of timer drivers 

Issue #2190
This commit is contained in:
Norman Feske 2016-12-10 23:22:13 +01:00
parent f54c85e045
commit 44df8db771
37 changed files with 57 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
repos/os/lib/mk/spec/fiasco/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic
SRC_CC += spec/periodic/time_source.cc spec/fiasco/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/foc/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic
SRC_CC += spec/periodic/time_source.cc spec/fiasco/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/hw/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/hw
SRC_CC += spec/hw/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

7
repos/os/lib/mk/spec/linux/timer.mk
View File

@ -1,7 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic
SRC_CC += spec/periodic/time_source.cc spec/linux/time_source.cc
LIBS += syscall
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/nova/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/nova
SRC_CC += spec/nova/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/okl4_x86/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/pit
SRC_CC += spec/pit/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/pistachio/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/periodic
SRC_CC += spec/periodic/time_source.cc spec/pistachio/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

5
repos/os/lib/mk/spec/sel4_x86_32/timer.mk
View File

@ -1,5 +0,0 @@
INC_DIR += $(REP_DIR)/src/drivers/timer/spec/pit
SRC_CC += spec/pit/time_source.cc
include $(REP_DIR)/lib/mk/timer.inc

3
repos/os/src/drivers/timer/empty.cc
View File

@ -1,3 +0,0 @@
/*
* Dummy compilation unit needed to link a valid target.
*/

6
repos/os/src/drivers/timer/fiasco/target.mk Normal file
View File

@ -0,0 +1,6 @@
TARGET = fiasco_timer_drv
REQUIRES = fiasco
INC_DIR += $(REP_DIR)/src/drivers/timer/periodic
SRC_CC += periodic/time_source.cc fiasco/time_source.cc
include $(REP_DIR)/src/drivers/timer/target.inc

0
repos/os/src/drivers/timer/spec/fiasco/time_source.cc → repos/os/src/drivers/timer/fiasco/time_source.cc
View File

6
repos/os/src/drivers/timer/foc/target.mk Normal file
View File

@ -0,0 +1,6 @@
TARGET = foc_timer_drv
REQUIRES = foc
INC_DIR += $(REP_DIR)/src/drivers/timer/periodic
SRC_CC += periodic/time_source.cc fiasco/time_source.cc
include $(REP_DIR)/src/drivers/timer/target.inc

7
repos/os/src/drivers/timer/hw/target.mk Normal file
View File

@ -0,0 +1,7 @@
TARGET = hw_timer_drv
REQUIRES = hw
LIBS = syscall-hw
INC_DIR += $(PRG_DIR)
SRC_CC += hw/time_source.cc
include $(REP_DIR)/src/drivers/timer/target.inc

0
repos/os/src/drivers/timer/spec/hw/time_source.cc → repos/os/src/drivers/timer/hw/time_source.cc
View File

0
repos/os/src/drivers/timer/spec/hw/time_source.h → repos/os/src/drivers/timer/hw/time_source.h
View File

7
repos/os/src/drivers/timer/linux/target.mk Normal file
View File

@ -0,0 +1,7 @@
TARGET = linux_timer_drv
REQUIRES = linux
INC_DIR += $(REP_DIR)/src/drivers/timer/periodic
SRC_CC += periodic/time_source.cc linux/time_source.cc
LIBS += syscall
include $(REP_DIR)/src/drivers/timer/target.inc

0
repos/os/src/drivers/timer/spec/linux/time_source.cc → repos/os/src/drivers/timer/linux/time_source.cc
View File

6
repos/os/src/drivers/timer/nova/target.mk Normal file
View File

@ -0,0 +1,6 @@
TARGET = nova_timer_drv
REQUIRES = nova
INC_DIR += $(REP_DIR)/src/drivers/timer/nova
SRC_CC += nova/time_source.cc
include $(REP_DIR)/src/drivers/timer/target.inc

0
repos/os/src/drivers/timer/spec/nova/time_source.cc → repos/os/src/drivers/timer/nova/time_source.cc
View File

0
repos/os/src/drivers/timer/spec/nova/time_source.h → repos/os/src/drivers/timer/nova/time_source.h
View File

0
repos/os/src/drivers/timer/spec/periodic/time_source.cc → repos/os/src/drivers/timer/periodic/time_source.cc
View File

0
repos/os/src/drivers/timer/spec/periodic/time_source.h → repos/os/src/drivers/timer/periodic/time_source.h
View File

8
repos/os/src/drivers/timer/pistachio/target.mk Normal file
View File

@ -0,0 +1,8 @@
TARGET = pistachio_timer_drv
REQUIRES = pistachio
INC_DIR += $(REP_DIR)/src/drivers/timer/include
INC_DIR += $(REP_DIR)/src/drivers/timer/periodic
SRC_CC += periodic/time_source.cc pistachio/time_source.cc main.cc
LIBS += syscall base-pistachio timeout
vpath %.cc $(REP_DIR)/src/drivers/timer

0
repos/os/src/drivers/timer/spec/pistachio/time_source.cc → repos/os/src/drivers/timer/pistachio/time_source.cc
View File

6
repos/os/src/drivers/timer/pit/target.mk Normal file
View File

@ -0,0 +1,6 @@
TARGET = pit_timer_drv
REQUIRES = x86
INC_DIR += $(PRG_DIR)
SRC_CC += time_source.cc
include $(REP_DIR)/src/drivers/timer/target.inc

0
repos/os/src/drivers/timer/spec/pit/time_source.cc → repos/os/src/drivers/timer/pit/time_source.cc
View File

0
repos/os/src/drivers/timer/spec/pit/time_source.h → repos/os/src/drivers/timer/pit/time_source.h
View File

6
repos/os/lib/mk/timer.inc → repos/os/src/drivers/timer/target.inc
View File

@ -1,7 +1,5 @@
SRC_CC += main.cc
LIBS += base timeout
SRC_CC += main.cc
LIBS += base timeout
INC_DIR += $(REP_DIR)/src/drivers/timer/include
vpath %.cc $(REP_DIR)/src/drivers/timer

3
repos/os/src/drivers/timer/target.mk
View File

@ -1,3 +0,0 @@
TARGET = timer
LIBS = timer
SRC_CC = empty.cc

1
tool/run/boot_dir/fiasco
View File

@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" }
proc binary_name_timer { } { return "fiasco_timer_drv" }
##

9
tool/run/boot_dir/foc
View File

@ -1,12 +1,5 @@
#
# \brief Fiasco.OC-specific test-environment supplements
# \author Stefan Kalkowski
# \date 2010-11-22
#
# This file is meant to be used as '--include' argument for 'tool/run'.
#
proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" }
proc binary_name_timer { } { return "foc_timer_drv" }
##

1
tool/run/boot_dir/hw
View File

@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" }
proc binary_name_timer { } { return "hw_timer_drv" }
proc run_boot_string { } { return "\nkernel initialized" }

1
tool/run/boot_dir/linux
View File

@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-linux.lib.so" }
proc binary_name_timer { } { return "linux_timer_drv" }
##

1
tool/run/boot_dir/nova
View File

@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" }
proc binary_name_timer { } { return "nova_timer_drv" }
##

1
tool/run/boot_dir/okl4
View File

@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" }
proc binary_name_timer { } { return "pit_timer_drv" }
##

9
tool/run/boot_dir/pistachio
View File

@ -1,12 +1,5 @@
#
# \brief Pistachio-specific test-environment supplements
# \author Norman Feske
# \date 2010-08-25
#
# This file is meant to be used as '--include' argument for 'tool/run'.
#
proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" }
proc binary_name_timer { } { return "pistachio_timer_drv" }
##

5
tool/run/boot_dir/sel4
View File

@ -1,9 +1,8 @@
proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" }
proc binary_name_timer { } { return "pit_timer_drv" }
proc run_boot_string { } { return "\n\rStarting node #0" }
proc run_boot_string { } { return "\n\rStarting node #0" }
proc core_link_address { } { return "0x02000000" }