summaryrefslogtreecommitdiff
path: root/utils/gen-controls.py
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2023-11-09 11:31:31 +0000
committerNaushir Patuck <naush@raspberrypi.com>2023-11-29 09:05:39 +0000
commitd3365b358f350931ce5b1e51c39c23fa47b4a7ca (patch)
tree862d514e07ca37747a271d58d295bcfa46557aef /utils/gen-controls.py
parent0455bbbf518cc834bd72ac65e13c9ed40bf21f3c (diff)
libcamera: control: Add vendor control id range reservation
Add a new control_ranges.yaml file that is used to reserve control id ranges/offsets for libcamera and vendor specific controls. This file is used by the gen-controls.py script to generate control id values for each control. Draft controls now have a separate range from core libcamera controls, breaking the existing numbering behaviour. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Diffstat (limited to 'utils/gen-controls.py')
-rwxr-xr-xutils/gen-controls.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/utils/gen-controls.py b/utils/gen-controls.py
index 2a633cc0..8e592148 100755
--- a/utils/gen-controls.py
+++ b/utils/gen-controls.py
@@ -239,7 +239,7 @@ ${vendor_controls_str}
}
-def generate_h(controls, mode):
+def generate_h(controls, mode, ranges):
enum_template_start = string.Template('''enum ${name}Enum {''')
enum_value_template = string.Template('''\t${name} = ${value},''')
enum_values_template = string.Template('''extern const std::array<const ControlValue, ${size}> ${name}Values;''')
@@ -254,8 +254,10 @@ def generate_h(controls, mode):
vendor = 'draft' if ctrl.is_draft else ctrl.vendor
if vendor not in ctrls:
+ if vendor not in ranges.keys():
+ raise RuntimeError(f'Control id range is not defined for vendor {vendor}')
+ id_value[vendor] = ranges[vendor] + 1
ids[vendor] = []
- id_value[vendor] = 1
ctrls[vendor] = []
# Core and draft controls use the same ID value
@@ -341,6 +343,8 @@ def main(argv):
help='Mode of operation')
parser.add_argument('--output', '-o', metavar='file', type=str,
help='Output file name. Defaults to standard output if not specified.')
+ parser.add_argument('--ranges', '-r', type=str, required=True,
+ help='Control id range reservation file.')
parser.add_argument('--template', '-t', dest='template', type=str, required=True,
help='Template file name.')
parser.add_argument('input', type=str, nargs='+',
@@ -348,6 +352,11 @@ def main(argv):
args = parser.parse_args(argv[1:])
+ ranges = {}
+ with open(args.ranges, 'rb') as f:
+ data = open(args.ranges, 'rb').read()
+ ranges = yaml.safe_load(data)['ranges']
+
controls = []
for input in args.input:
with open(input, 'rb') as f:
@@ -359,7 +368,7 @@ def main(argv):
if args.template.endswith('.cpp.in'):
data = generate_cpp(controls)
elif args.template.endswith('.h.in'):
- data = generate_h(controls, args.mode)
+ data = generate_h(controls, args.mode, ranges)
else:
raise RuntimeError('Unknown template type')