From 8f2a808cfa49f8a9c117a69515bcd99c47ee0c47 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Jan 2014 14:08:29 +1000 Subject: [PATCH] Drop --output flag and python generation code from make-event-names.py This is a leftover from when the file was in evemu and used to generate python headers too. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- libevdev/Makefile.am | 2 +- libevdev/make-event-names.py | 42 +----------------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am index 739ed7d..96974fc 100644 --- a/libevdev/Makefile.am +++ b/libevdev/Makefile.am @@ -22,7 +22,7 @@ libevdevincludedir = $(includedir)/libevdev-1.0/libevdev libevdevinclude_HEADERS = libevdev.h libevdev-uinput.h event-names.h: Makefile make-event-names.py - $(PYTHON) $(srcdir)/make-event-names.py --output=c $(top_srcdir)/include/linux/input.h > $@ + $(PYTHON) $(srcdir)/make-event-names.py $(top_srcdir)/include/linux/input.h > $@ EXTRA_DIST = make-event-names.py CLEANFILES = event-names.h diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py index 0dea9d6..ab643f7 100755 --- a/libevdev/make-event-names.py +++ b/libevdev/make-event-names.py @@ -72,21 +72,6 @@ def print_bits(bits, prefix): print("};") print("") -def print_python_bits(bits, prefix): - if not hasattr(bits, prefix): - return - - print("%s_map = {" % (prefix)) - for val, name in list(getattr(bits, prefix).items()): - print(" %d : \"%s\"," % (val, name)) - if prefix == "key": - for val, name in list(getattr(bits, "btn").items()): - print(" %d : \"%s\"," % (val, name)) - print("}") - print("for k, v in %s_map.items():" % (prefix)) - print(" %s_map[v] = k" % (prefix)) - print("") - def print_map(bits): print("static const char * const * const event_type_map[EV_MAX + 1] = {") @@ -168,27 +153,6 @@ def print_mapping_table(bits): print("#endif /* EVENT_NAMES_H */") -def print_python_mapping_table(bits): - print("# THIS FILE IS GENERATED, DO NOT EDIT") - print("") - - for prefix in prefixes: - if prefix == "BTN_": - continue - print_python_bits(bits, prefix[:-1].lower()) - - print_python_map(bits) - - print("def event_get_type_name(type):") - print(" return ev_map[type]") - print("") - print("") - print("def event_get_code_name(type, code):") - print(" if map.has_key(type) and map[type].has_key(code):") - print(" return map[type][code]") - print(" return 'UNKNOWN'") - print("") - def parse_define(bits, line): m = re.match(r"^#define\s+(\w+)\s+(\w+)", line) if m == None: @@ -228,14 +192,10 @@ def parse(fp): if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument("--output", default="c") parser.add_argument('source', metavar="/path/to/linux/input.h", type=argparse.FileType('r'), help='source file to parse') args = parser.parse_args(sys.argv[1:]) bits = parse(args.source) - if args.output == "python": - print_python_mapping_table(bits) - else: - print_mapping_table(bits) + print_mapping_table(bits) -- 2.7.4