test commit fgor eye grsph

Author: root

cli/diag.c

@@ -37,6 +37,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 struct diag_common_cfg {
 	struct switchtec_dev *dev;
@@ -1085,14 +1086,24 @@ int eye_observe_dev(struct switchtec_dev *dev, int port_id,
 			       int lane_id, int *gen)
 {
 	int ret;
-	
+	struct switchtec_diag_port_eye_data data_out;
+	unsigned int eye_data[6];
+
 	ret = switchtec_diag_eye_start(dev, lane_id);
 	if (ret) {
 		switchtec_perror("eye_start");
 	}
 
-	ret = switchtec_diag_eye_fetch(dev);
+	ret = switchtec_diag_eye_fetch(dev, &data_out);
+
+	data_out.eye_left = abs(data_out.eye_left);
+	data_out.eye_right = abs(data_out.eye_right);
+	data_out.eye_top_x1 = abs(data_out.eye_top_x1);
+	data_out.eye_bottom_x1 = abs(data_out.eye_bottom_x1);
 
+	printf("%d %d %d %d\n", data_out.eye_left, data_out.eye_right, data_out.eye_top_x1, data_out.eye_bottom_x1);	
+	memcpy(&eye_data[0], &data_out, sizeof(struct switchtec_diag_port_eye_data));
+	graph_draw_eom_win(eye_data, 4,"Eye Observation Monitor","press q to quit");
 	return 0;
 }
 

cli/graph.c

@@ -374,6 +374,95 @@ void graph_init(void)
 	curses_initialized = true;
 }
 
+void draw_eom_data(WINDOW *win, unsigned int *data, int count, int x_offset, int y_offset)
+{
+    for (int i = 0; i < count; ++i) {
+        int xl = data[i] + x_offset;
+        int xr = data[i] + x_offset;
+        int yt = data[i] + y_offset;
+        int yb = data[i] + y_offset;
+
+        // Draw points
+        mvwaddch(win, yt, xl, 'L'); // Left
+        mvwaddch(win, yt, xr, 'R'); // Right
+        mvwaddch(win, yt, xl, 'T'); // Top
+        mvwaddch(win, yb, xl, 'B'); // Bottom
+
+        // Draw horizontal line (left to right at eye_top)
+        for (int x = xl; x <= xr; ++x)
+            mvwaddch(win, yt, x, '-');
+
+        // Draw vertical line (top to bottom at eye_left)
+        for (int y = yt; y <= yb; ++y)
+            mvwaddch(win, y, xl, '|');
+    }
+    wrefresh(win);
+}
+
+int graph_draw_eom_win(unsigned int *data, int count, const char *title, char *status)
+{
+    WINDOW *datawin, *stwin = NULL;
+    const int x_off = 7, y_off = 4;
+    int s_off;
+    int c;
+	printf("%d %d %d %d\n", data[0], data[1], data[2], data[3]);
+    if (!isatty(STDOUT_FILENO)) {
+        // Fallback to text output if not a terminal
+        return 0;
+    }
+
+    if (!curses_initialized) {
+        initscr();
+        curses_initialized = true;
+    }
+
+    noecho();
+    cbreak();
+    curs_set(0);
+    keypad(stdscr, true);
+    start_color();
+
+    if (status) {
+        s_off = 2;
+        stwin = newwin(2, 0, LINES - 2, 0);
+        if (!stwin) {
+            perror("Unable to create window");
+            return 1;
+        }
+    } else {
+        s_off = 0;
+    }
+
+    datawin = newwin(LINES - y_off - s_off, COLS - x_off, y_off, x_off);
+    if (!datawin) {
+        perror("Unable to create window");
+        return 1;
+    }
+
+    // Main loop
+    while (1) {
+        werase(datawin);
+        box(datawin, 0, 0);
+        draw_eom_data(datawin, data, count, 0, 0);
+
+        if (stwin) {
+            werase(stwin);
+            mvwprintw(stwin, 0, 0, "%s", status);
+            wrefresh(stwin);
+        }
+
+        c = getch();
+        if (c == 'q' || c == 'x')
+            break;
+    }
+
+    if (stwin)
+        delwin(stwin);
+    delwin(datawin);
+    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.h

@@ -69,4 +69,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 graph_draw_eom_win(unsigned int *data, int count, const char *title, char *status);
+
 #endif

inc/switchtec/diag.h

@@ -233,6 +233,13 @@ struct switchtec_diag_port_eye_fetch {
 	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 {

inc/switchtec/switchtec.h

@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
+#include "diag.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1242,7 +1243,7 @@ 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_id);
-int switchtec_diag_eye_fetch(struct switchtec_dev *dev);
+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,

lib/diag.c

@@ -216,12 +216,13 @@ const char* diag_eom_status_string[] = {
  * mode, otherwise data will be lost and the number of pixels fetched
  * will be greater than the space in the pixel buffer.
  */
-int switchtec_diag_eye_fetch(struct switchtec_dev *dev)
+int switchtec_diag_eye_fetch(struct switchtec_dev *dev, struct switchtec_diag_port_eye_data *data_out)
 {
 	struct switchtec_diag_port_eye_cmd in = {
 		.sub_cmd = MRPC_EYE_OBSERVE_FETCH,
 	};
 	struct switchtec_diag_port_eye_fetch out;
+	struct switchtec_diag_port_eye_data data;
 	int ret;
 
 retry:
@@ -242,9 +243,15 @@ int switchtec_diag_eye_fetch(struct switchtec_dev *dev)
 	else if(out.status == 0)
 	{
 		printf("Eye Left %d\n", out.eye_left);
-		printf("Eye Right %d\n", out.eye_right);
-		printf("Eye top %d\n", out.eye_top_x1);
-		printf("Eye Bottom %d\n", out.eye_bottom_x1);
+       	 	printf("Eye Right %d\n", out.eye_right);
+        	printf("Eye top %d\n", out.eye_top_x1);
+        	printf("Eye Bottom %d\n", out.eye_bottom_x1);
+		
+		data.eye_left = out.eye_left;	
+		data.eye_right = out.eye_right;	
+		data.eye_top_x1 = out.eye_top_x1;	
+		data.eye_bottom_x1 = out.eye_bottom_x1;	
+		memcpy(data_out, &data, sizeof(struct switchtec_diag_port_eye_fetch));
 	}
 	else
 	{