Simplify port lock handling.

cmd.c

@@ -166,16 +166,10 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 
 		case CMD_VIDEO_OUTPUT_LOCKS:
 			if (valid_slot) {
-				// L is lock owned by somebody else (set from other IP address)
-				// O is lock owned by us (set from our IP address)
-				if (slot_data[0] == 'L' || slot_data[0] == 'O') {
-					data->outputs[slot_pos].locked = true;
-					if (slot_data[0] == 'L')
-						data->outputs[slot_pos].locked_other = true;
-					else
-						data->outputs[slot_pos].locked_other = false;
-				} else {
-					data->outputs[slot_pos].locked = false;
+				switch (slot_data[0]) {
+				case 'O': data->outputs[slot_pos].lock = PORT_LOCKED; break;
+				case 'L': data->outputs[slot_pos].lock = PORT_LOCKED_OTHER; break;
+				default : data->outputs[slot_pos].lock = PORT_UNLOCKED; break;
 				}
 			}
 			break;
@@ -274,10 +268,8 @@ void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e) {
 			e->port_no1 = search_video_output_name(d, e->param1);
 			if (!e->port_no1)
 				die("Unknown output port number/name: %s", e->param1);
-			e->locked_other = d->outputs[e->port_no1 - 1].locked_other;
-		} else {
-			e->locked_other = d->outputs[e->port_no1 - 1].locked_other;
 		}
+		e->lock = d->outputs[e->port_no1 - 1].lock;
 		break;
 	case CMD_VIDEO_OUTPUT_ROUTING:
 		if (e->port_no1 == 0 || e->port_no1 > d->device.num_video_outputs) {
@@ -314,7 +306,7 @@ void format_cmd_text(struct vcmd_entry *e, char *buf, unsigned int bufsz) {
 		break;
 	case CMD_VIDEO_OUTPUT_LOCKS:
 		snprintf(buf, bufsz, "%s:\n%u %s\n\n", get_cmd_text(e->cmd),
-			e->port_no1 - 1, e->do_lock ? "O" : (e->locked_other ? "F" : "U"));
+			e->port_no1 - 1, e->do_lock ? "O" : (e->lock == PORT_LOCKED_OTHER ? "F" : "U"));
 		break;
 	case CMD_VIDEO_OUTPUT_ROUTING:
 		snprintf(buf, bufsz, "%s:\n%u %u\n\n", get_cmd_text(e->cmd),
@@ -351,7 +343,7 @@ void show_cmd(struct videohub_data *d, struct vcmd_entry *e) {
 	case CMD_VIDEO_OUTPUT_LOCKS:
 		printf("%s%s video output %d - \"%s\"\n",
 			prefix,
-			e->do_lock ? "lock" : (e->locked_other ? "force unlock" : "unlock"),
+			e->do_lock ? "lock" : (e->lock == PORT_LOCKED_OTHER ? "force unlock" : "unlock"),
 			e->port_no1, d->outputs[e->port_no1 - 1].name
 		);
 		break;

cmd.h

@@ -39,7 +39,7 @@ struct vcmd_entry {
 	unsigned int	port_no1;
 	unsigned int	port_no2;
 	bool			do_lock;
-	bool			locked_other;
+	enum port_lock	lock;
 };
 
 void prepare_cmd_entry(struct videohub_data *d, struct vcmd_entry *e);

data.h

@@ -34,6 +34,12 @@ struct device_desc {
 	unsigned int	num_serial_ports;
 };
 
+enum port_lock {
+	PORT_UNLOCKED,
+	PORT_LOCKED,
+	PORT_LOCKED_OTHER,
+};
+
 struct input_desc {
 	char			name[MAX_NAME_LEN];
 	// Port statuses are supported only by Universal Videohub
@@ -43,10 +49,9 @@ struct input_desc {
 };
 
 struct output_desc {
+	enum port_lock	lock;
 	char			name[MAX_NAME_LEN];
 	unsigned int	routed_to;
-	bool			locked;
-	bool			locked_other;
 	char			status[8];
 };
 

display.c

@@ -94,6 +94,15 @@ void print_device_video_inputs(struct videohub_data *d) {
 	printf("\n");
 }
 
+static char port_lock_symbol(enum port_lock p) {
+	switch(p) {
+	case PORT_UNLOCKED    : return ' ';
+	case PORT_LOCKED      : return 'O';
+	case PORT_LOCKED_OTHER: return 'L';
+	}
+	return '?';
+}
+
 void print_device_video_outputs(struct videohub_data *d) {
 	unsigned int i, len = 68;
 	if (!d->device.num_video_outputs)
@@ -105,7 +114,7 @@ void print_device_video_outputs(struct videohub_data *d) {
 	for(i = 0; i < d->device.num_video_outputs; i++) {
 		printf("  | %2d | %c | %-24s | %-24s | %c |\n",
 			i + 1,
-			d->outputs[i].locked ? (d->outputs[i].locked_other ? 'L' : 'O') : ' ',
+			port_lock_symbol(d->outputs[i].lock),
 			d->outputs[i].name,
 			d->inputs[d->outputs[i].routed_to].name,
 			format_status(d->outputs[i].status)
@@ -125,7 +134,7 @@ void print_device_backup(struct videohub_data *d) {
 	for(i = 0; i < d->device.num_video_outputs; i++)
 		printf("  --vo-route %2d %2d \\\n", i + 1, d->outputs[i].routed_to + 1);
 	for(i = 0; i < d->device.num_video_outputs; i++) {
-		if (d->outputs[i].locked) {
+		if (d->outputs[i].lock != PORT_UNLOCKED) {
 			printf("  --vo-unlock %2d --vo-lock %2d%s\n", i + 1, i + 1,
 				i + 1 < d->device.num_video_outputs ? " \\" : "");
 		} else {