Merge pull request #13 from MicrochipTech/feature/eom

EOM Changes as per 4P eye capture

Author: pvengat

cli/diag.c

@@ -134,7 +134,7 @@ static void draw_status(WINDOW *win, int x_off, int x_cnt, const char *status)
 	mvwprintw(win, 0, 0, "     ");
 	for (i = 0; i < x_cnt * 2 + x_off; i++)
 		mvwaddch(win, 1, i, ' ');
-	mvwprintw(win, 1, x_off, status);
+	mvwprintw(win, 1, x_off, "%s",status);
 	wrefresh(win);
 }
 
@@ -374,6 +374,56 @@ void graph_init(void)
 	curses_initialized = true;
 }
 
+void get_screen_coords(int x, int y, int *sx, int *sy) {
+    *sx = x*X_SCALE + 5;
+    *sy = y/Y_SCALE;
+}
+
+void plot_point(int x, int y) 
+{
+    mvprintw(y/Y_SCALE, x*X_SCALE, "O (%d,%d)", x-Y_PRINT_OFFSET, y-X_PRINT_OFFSET);
+}
+
+int eye_plot_graph(int *data)
+{
+    initscr();
+    noecho();
+    curs_set(FALSE);
+    // Draw axes
+    for (int x = 0; x <= PLOT_WIDTH; ++x)
+        mvaddch(0, (x*X_SCALE) + 5, '-'); // X-axis at the top
+    for (int y = 0; y <= PLOT_HEIGHT; ++y)
+        mvaddch(y/Y_SCALE, 5, '|'); // Y-axis at the left
+    // Draw scale on X-axis
+    for (int x = 0; x <= PLOT_WIDTH; x += 5)
+    {
+        mvaddch(0, (x*X_SCALE) + 5, '+');
+        mvprintw(1, (x*X_SCALE) + 5, "%d", x);
+    }
+    // Draw scale on Y-axis
+    for (int y = 0; y <= PLOT_HEIGHT; y += 10) {
+        mvaddch(y/Y_SCALE, 5, '+');
+        mvprintw(y/Y_SCALE, 0, "%2d", y);
+    }
+
+    //Adjusting the eye points to plot from 0 to 42 for x-axis and 0 t0 100 for Y-axis
+    //as ncurses library did not support negative ploting
+    data[0] = data[0] + X_LAYOUT_SHIFT;
+    data[1] = data[1] + X_LAYOUT_SHIFT;
+    data[2] = data[2] + Y_LAYOUT_SHIFT;
+    data[3] = data[3] + Y_LAYOUT_SHIFT;
+    
+    // Plot some points (example)
+    plot_point(data[0] + Y_PRINT_OFFSET, Y_LAYOUT_SHIFT + X_PRINT_OFFSET);   // (10,5)
+    plot_point(data[1] + Y_PRINT_OFFSET, Y_LAYOUT_SHIFT + X_PRINT_OFFSET);  // (20,10)
+    plot_point(X_LAYOUT_SHIFT + Y_PRINT_OFFSET, data[2] + X_PRINT_OFFSET);  // (30,15)
+    plot_point(X_LAYOUT_SHIFT + Y_PRINT_OFFSET, data[3] + X_PRINT_OFFSET);  // (35,18)
+
+    refresh();
+    getch();
+    endwin();
+    return 0;
+}
 #else /* defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES) */
 
 int graph_draw_win(struct range *X, struct range *Y, int *data, int *shades,

cli/graph.c

@@ -57,8 +57,23 @@
 #define GRAPH_PLUS	GRAPH_TEXT_PLUS
 #endif
 
+#define PLOT_WIDTH  42
+#define PLOT_HEIGHT 100// Map data coordinates to screen coordinates (top-left origin)
+#define Y_SCALE 2
+#define X_SCALE 4
+#define X_PRINT_OFFSET 1
+#define Y_PRINT_OFFSET 2
+#define X_LAYOUT_SHIFT 21
+#define Y_LAYOUT_SHIFT 50
+
 struct range;
 
+typedef struct {
+	int x;
+	int y;
+}point_t;
+
+
 typedef int graph_anim_fn(struct range *X, struct range *Y, int *data,
 		int *shades, char *status, bool *redraw, void *opaque);
 
@@ -69,4 +84,6 @@ int graph_draw_win(struct range *X, struct range *Y, int *data, int *shades,
 		   const char *title, char x_title, char y_title, char *status,
 		   graph_anim_fn *anim, void *opaque);
 
+int eye_plot_graph(int *data);
+
 #endif

cli/graph.h

@@ -187,18 +187,31 @@ struct switchtec_diag_pat_gen_out {
 	uint32_t err_cnt_hi;
 };
 
+#pragma pack (push,1)
 struct switchtec_diag_port_eye_start {
 	uint8_t sub_cmd;
 	uint8_t resvd1[3];
-	uint32_t resvd2;
-	uint32_t lane_mask[4];
-	int16_t x_start;
-	int16_t y_start;
-	int16_t x_end;
-	int16_t y_end;
-	uint16_t x_step;
-	uint16_t y_step;
-	uint32_t step_interval;
+	/*defines the lane ID to run */
+	uint8_t lane_id;
+	/*Target BER type */
+     	uint8_t target_ber_type;
+    	/*Defines the maximum numbers of errors*/
+    	uint8_t max_allowed_ber_errors;
+    	/*Defines the confidence Level*/
+    	uint8_t confidence_lvl;
+    	/*defines the horizontal step size*/
+    	int8_t x_step;
+    	/*defines the vertical step size*/
+    	int8_t y_step;
+    	/*Defines the vertical sweep at x1 for six point capture*/
+    	int8_t v_sweep_at_x1;
+    	/*Defines the vertical sweep at x2 for six point capture*/
+    	int8_t v_sweep_at_x2;
+    	/*Defines the Time in recovery before link down value for EOM*/
+    	uint32_t eom_time_in_recov_in_us;
+    	/*defines the error method 0-parity error method, 1-l2r error method*/
+    	uint8_t eom_error_method;
+    	uint8_t reserved[3];
 };
 
 struct switchtec_diag_port_eye_cmd {
@@ -213,27 +226,21 @@ struct switchtec_diag_port_eye_fetch {
 	uint8_t data_mode;
 	uint8_t resvd1;
 	uint8_t status;
-	uint32_t time_remaining;
-	uint32_t lane_mask[4];
-	uint8_t x_start;
-	uint8_t resvd2;
-	int16_t y_start;
-	uint8_t data_count_lo;
-	uint8_t frame_status;
-	uint8_t resvd3;
-	uint8_t data_count_hi;
-	union {
-		struct {
-			uint32_t error_cnt_lo;
-			uint32_t error_cnt_hi;
-			uint32_t sample_cnt_lo;
-			uint32_t sample_cnt_hi;
-		} raw[62];
-		struct {
-			uint16_t ratio;
-		} ratio[496];
-	};
+	int32_t eye_left;
+	int32_t eye_right;
+	int32_t eye_top_x1;
+	int32_t eye_bottom_x1;
+	int32_t eye_top_x2;
+	int32_t eye_bottom_x2;
+};
+
+struct switchtec_diag_port_eye_data {
+	int32_t eye_left;
+        int32_t eye_right;
+        int32_t eye_top_x1;
+        int32_t eye_bottom_x1;
 };
+#pragma pack(pop)
 
 struct switchtec_diag_cross_hair_in {
 	uint8_t sub_cmd;
@@ -272,5 +279,30 @@ struct switchtec_diag_cross_hair_get {
 	};
 };
 
+typedef enum {
+    /* command error code for Start, fetch and cancel */
+    EOM_SUCCESS,                  /* EOM general result, means no error */
+
+    /* Error codes for EOM Start sub command */
+    EOM_FAILED_TO_START,          /* EOM Failed to Start*/
+    EOM_INVALID_PARAMETER,        /* EOM parameter error */
+    EOM_PREV_CMD_NOT_FINISHED,    /* EOM cmd error, the previous cmd has not finished */
+
+    /* Error codes for EOM Fetch Sub command */
+    EOM_IN_PROGRESS,              /* EOM in progress, but no output data yet */
+    EOM_NOT_RUNNING,              /*EOM Not running*/
+
+    /* Error codes for EOM Cancel sub command*/
+    EOM_FAILED_TO_CANCEL,         /*EOM Failed to cancel*/
+
+    /* error codes for EOM Running state machine*/
+    EOM_SPEED_IS_NOT_GEN3_OR_4,   /* EOM Speed is not Gen3 or 4*/
+    EOM_MARGIN_CODE_OUT_OF_RANGE, /* EOM Margin code out of range*/
+    EOM_WAITING_FOR_HARDWARE,     /* EOM waiting for hardware*/
+
+    /*Invalid error code*/
+    EOM_ERROR = 0xFF,
+} mrpc_stat_eom_enum;
+
 #endif
 /**@}*/

inc/switchtec/diag.h

@@ -259,12 +259,12 @@ enum mrpc_sub_cmd {
 	MRPC_PAT_GEN_SET_MON = 8,
 	MRPC_PAT_GEN_INJ_ERR = 9,
 
-	MRPC_EYE_OBSERVE_START = 0,
-	MRPC_EYE_OBSERVE_FETCH = 1,
-	MRPC_EYE_OBSERVE_CANCEL = 2,
-	MRPC_EYE_OBSERVE_SET_DATA_MODE = 3,
-	MRPC_EYE_OBSERVE_GET_DATA_MODE = 4,
-
+	MRPC_EYE_OBSERVE_START = 6,
+	MRPC_EYE_OBSERVE_FETCH = 7,
+	MRPC_EYE_OBSERVE_6PT_START = 8,
+	MRPC_EYE_OBSERVE_6PT_FETCH = 9,
+	MRPC_EYE_OBSERVE_CANCEL = 0xa,
+	
 	MRPC_CROSS_HAIR_ENABLE = 0,
 	MRPC_CROSS_HAIR_DISABLE = 1,
 	MRPC_CROSS_HAIR_GET = 2,

inc/switchtec/mrpc.h

@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#include "diag.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1241,11 +1242,8 @@ int switchtec_diag_cross_hair_get(struct switchtec_dev *dev, int start_lane_id,
 
 int switchtec_diag_eye_set_mode(struct switchtec_dev *dev,
 				enum switchtec_diag_eye_data_mode mode);
-int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_mask[4],
-			     struct range *x_range, struct range *y_range,
-			     int step_interval);
-int switchtec_diag_eye_fetch(struct switchtec_dev *dev, double *pixels,
-			     size_t pixel_cnt, int *lane_id);
+int switchtec_diag_eye_start(struct switchtec_dev *dev, int lane_id, unsigned int error_threshold);
+int switchtec_diag_eye_fetch(struct switchtec_dev *dev, struct switchtec_diag_port_eye_data *data_out);
 int switchtec_diag_eye_cancel(struct switchtec_dev *dev);
 
 int switchtec_diag_loopback_set(struct switchtec_dev *dev, int port_id,