2 files changed, 29 insertions, 0 deletions
diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index 340849e7..ced4f567 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -37,6 +37,7 @@ public:
 private:
 	int parseOptions(int argc, char *argv[]);
 	int prepareConfig();
+	int listControls();
 	int listProperties();
 	int infoConfiguration();
 	int run();
@@ -182,6 +183,8 @@ int CamApp::parseOptions(int argc, char *argv[])
 	parser.addOption(OptInfo, OptionNone,
 			 "Display information about stream(s)", "info");
 	parser.addOption(OptList, OptionNone, "List all cameras", "list");
+	parser.addOption(OptListControls, OptionNone, "List cameras controls",
+			 "list-controls");
 	parser.addOption(OptListProperties, OptionNone, "List cameras properties",
 			 "list-properties");
 
@@ -276,6 +279,25 @@ int CamApp::prepareConfig()
 	return 0;
 }
 
+int CamApp::listControls()
+{
+	if (!camera_) {
+		std::cout << "Cannot list controls without a camera"
+			  << std::endl;
+		return -EINVAL;
+	}
+
+	for (const auto &ctrl : camera_->controls()) {
+		const ControlId *id = ctrl.first;
+		const ControlInfo &info = ctrl.second;
+
+		std::cout << "Control: " << id->name() << ": "
+			  << info.toString() << std::endl;
+	}
+
+	return 0;
+}
+
 int CamApp::listProperties()
 {
 	if (!camera_) {
@@ -339,6 +361,12 @@ int CamApp::run()
 		}
 	}
 
+	if (options_.isSet(OptListControls)) {
+		ret = listControls();
+		if (ret)
+			return ret;
+	}
+
 	if (options_.isSet(OptListProperties)) {
 		ret = listProperties();
 		if (ret)
diff --git a/src/cam/main.h b/src/cam/main.h
index d23c6dfb..4a130d8d 100644
--- a/src/cam/main.h
+++ b/src/cam/main.h
@@ -16,6 +16,7 @@ enum {
 	OptList = 'l',
 	OptListProperties = 'p',
 	OptStream = 's',
+	OptListControls = 256,
 };
 
 #endif /* __CAM_MAIN_H__ */