From f994b13c226275f8857fb3dd735799c8648bcdd2 Mon Sep 17 00:00:00 2001 From: Dominick Grift Date: Tue, 22 Aug 2023 18:36:32 +0200 Subject: termdev: use modern in after for appending macros Signed-off-by: Dominick Grift --- .../termdev/serialtermdev/loginserialtermdev.cil | 33 ++++++++++------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'src/dev/termdev/serialtermdev/loginserialtermdev.cil') diff --git a/src/dev/termdev/serialtermdev/loginserialtermdev.cil b/src/dev/termdev/serialtermdev/loginserialtermdev.cil index b5a9d91..9a789d8 100644 --- a/src/dev/termdev/serialtermdev/loginserialtermdev.cil +++ b/src/dev/termdev/serialtermdev/loginserialtermdev.cil @@ -6,27 +6,9 @@ (macro all_type_change ((type ARG1)(type ARG2)) (typechange ARG1 typeattr chr_file ARG2)) - (macro appendinherited_all_chr_files ((type ARG1)) - (allow ARG1 typeattr appendinherited_chr_file) - (allowx ARG1 typeattr IOCTLCONSOLE) - (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) - (allowx ARG1 typeattr IOCTLVT)) - - (macro readwriteinherited_all_chr_files ((type ARG1)) - (allow ARG1 typeattr readwriteinherited_chr_file) - (allowx ARG1 typeattr IOCTLCONSOLE) - (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) - (allowx ARG1 typeattr IOCTLVT)) - (macro type ((type ARG1)) (typeattributeset typeattr ARG1)) - (macro writeinherited_all_chr_files ((type ARG1)) - (allow ARG1 typeattr writeinherited_chr_file) - (allowx ARG1 typeattr IOCTLCONSOLE) - (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) - (allowx ARG1 typeattr IOCTLVT)) - (typeattribute typeattr) (blockinherit .file.all_macro_template_chr_files) @@ -50,3 +32,18 @@ (blockinherit .loginserialtermdev.base_template) (blockinherit .serialtermdev.macro_template_chr_files))) + +(in after loginserialtermdev.appendinherited_all_chr_files + (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) + (allowx ARG1 typeattr IOCTLVT)) + +(in after loginserialtermdev.readwriteinherited_all_chr_files + (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) + (allowx ARG1 typeattr IOCTLVT)) + +(in after loginserialtermdev.writeinherited_all_chr_files + (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) + (allowx ARG1 typeattr IOCTLVT)) -- cgit v1.2.3