hwdb: Relax parsing script to allow 0 and 1 for all ID_* properties

diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py
index d1ff4470de1cdd10af7da8cb4225faed2a8e24c1..d76a290f73e91586319431534e3eaafce6edcebf 100755 (executable)
--- a/hwdb.d/parse_hwdb.py
+++ b/hwdb.d/parse_hwdb.py
@@ -127,20 +127,20 @@ def property_grammar():
              ('MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL', INTEGER),
              ('MOUSE_WHEEL_CLICK_COUNT', INTEGER),
              ('MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL', INTEGER),
-             ('ID_AUTOSUSPEND', Literal('1')),
-             ('ID_INPUT', Literal('1')),
-             ('ID_INPUT_ACCELEROMETER', Literal('1')),
-             ('ID_INPUT_JOYSTICK', Literal('1')),
-             ('ID_INPUT_KEY', Literal('1')),
-             ('ID_INPUT_KEYBOARD', Literal('1')),
-             ('ID_INPUT_MOUSE', Literal('1')),
-             ('ID_INPUT_POINTINGSTICK', Literal('1')),
-             ('ID_INPUT_SWITCH', Literal('1')),
-             ('ID_INPUT_TABLET', Literal('1')),
-             ('ID_INPUT_TABLET_PAD', Literal('1')),
-             ('ID_INPUT_TOUCHPAD', Literal('1')),
-             ('ID_INPUT_TOUCHSCREEN', Literal('1')),
-             ('ID_INPUT_TRACKBALL', Literal('1')),
+             ('ID_AUTOSUSPEND', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_ACCELEROMETER', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_JOYSTICK', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_KEY', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_KEYBOARD', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_MOUSE', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_POINTINGSTICK', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_SWITCH', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_TABLET', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_TABLET_PAD', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_TOUCHPAD', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_TOUCHSCREEN', Or((Literal('0'), Literal('1')))),
+             ('ID_INPUT_TRACKBALL', Or((Literal('0'), Literal('1')))),
              ('POINTINGSTICK_SENSITIVITY', INTEGER),
              ('POINTINGSTICK_CONST_ACCEL', REAL),
              ('ID_INPUT_JOYSTICK_INTEGRATION', Or(('internal', 'external'))),