userspace/wrsw_hal: bugfix 1236, read which fiber is connected to a port

HAL didn't read "fiber=" parameter of port from the dot-config Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/wrsw_hal: bugfix 1236, read which fiber is connected to a port
HAL didn't read "fiber=" parameter of port from the dot-config Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
3eb6e4e2 · Adam Wujek · 6b856c9c · 3eb6e4e2
Commit 3eb6e4e2 authored Feb 05, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

hal_ports.c userspace/wrsw_hal/hal_ports.c +18 -0

No files found.
--- a/userspace/wrsw_hal/hal_ports.c
+++ b/userspace/wrsw_hal/hal_ports.c
@@ -163,6 +163,24 @@ static int hal_port_init(int index)

 		pr_info("Port %s: mode %i\n", p->name, val);
 	}
+
+	/* Get fiber type */
+	error = libwr_cfg_convert2("PORT%02i_PARAMS", "fiber",
+				   LIBWR_INT, &p->fiber_index, index);
+
+	if (error) {
+		fprintf(stderr, "port index %i (%s): "
+			"no \"fiber=\" specified, default fiber to 0\n",
+			index, name);
+		p->fiber_index = 0;
+		}
+	if (p->fiber_index > 3) {
+		fprintf(stderr, "port index %i (%s): "
+			"not supported \"fiber=\" value, default to 0\n",
+			index, name);
+		p->fiber_index = 0;
+		}
+
 	/* Used to pre-calibrate the TX path for each port. No more in V3 */

 	/* FIXME: this address should come from the driver header */