Implement sending of status and VLAN info

httpd/page_impl.c

@@ -1,4 +1,9 @@
+// #define REGDBG 1
+
+#include "../rtl837x_sfr.h"
 #include "../rtl837x_common.h"
+#include "../rtl837x_regs.h"
+#include "../rtl837x_port.h"
 #include "uip.h"
 #include "../html_data.h"
 
@@ -9,6 +14,15 @@ extern __xdata uint16_t slen;
 extern __code uint8_t * __code hex;
 extern __xdata uip_ipaddr_t uip_hostaddr, uip_draddr, uip_netmask;
 extern __code uint8_t ownMAC[];
+extern __code uint8_t log_to_phys_port[9];
+
+extern __xdata uint8_t minPort;
+extern __xdata uint8_t maxPort;
+extern __xdata uint8_t nSFPPorts;
+extern __xdata uint8_t sfr_data[4];
+extern __xdata uint8_t cpuPort;
+extern __xdata uint8_t isRTL8373;
+extern __xdata uint8_t sfp_pins_last;
 
 inline void byte_to_html(uint8_t a)
 {
@@ -49,15 +63,30 @@ uint16_t port_status(void)
 }
 
 
+void sfr_data_to_html(void)
+{
+	char_to_html(hex[sfr_data[0] >> 4]);
+	char_to_html(hex[sfr_data[0] & 0xf]);
+	char_to_html(hex[sfr_data[1] >> 4]);
+	char_to_html(hex[sfr_data[1] & 0xf]);
+	char_to_html(hex[sfr_data[2] >> 4]);
+	char_to_html(hex[sfr_data[2] & 0xf]);
+	char_to_html(hex[sfr_data[3] >> 4]);
+	char_to_html(hex[sfr_data[3] & 0xf]);
+}
+
+
+void reg_to_html(register uint16_t reg)
+{
+	reg_read_m(reg);
+	sfr_data_to_html();
+}
+
+
 uint16_t html_index(void)
 {
 	print_string("html_index called\n");
 	slen += strtox(outbuf + slen, "<tr><td>IP Address</td><td>");
-	print_string("\nIP:");
-	print_byte(uip_hostaddr[0]); write_char('.');
-	print_byte(uip_hostaddr[0] >> 8); write_char('.');
-	print_byte(uip_hostaddr[1]); write_char('.');
-	print_byte(uip_hostaddr[1] >> 8); write_char('\n');
 	itoa_html(uip_hostaddr[0]); char_to_html('.');
 	itoa_html(uip_hostaddr[0] >> 8); char_to_html('.');
 	itoa_html(uip_hostaddr[1]); char_to_html('.');
@@ -82,3 +111,89 @@ uint16_t html_index(void)
 	slen += strtox(outbuf + slen, "</td></tr>");
 	return 0;
 }
+
+
+uint16_t send_vlan(register uint16_t vlan)
+{
+	slen = strtox(outbuf, "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n");
+	print_string("sending VLAN\n");
+	//{"members":"0x00060011"}
+	slen += strtox(outbuf + slen, "{\"members\":\"0x");
+	vlan_get(vlan);
+	sfr_data_to_html();
+	slen += strtox(outbuf + slen, "\"}");
+	return 0;
+}
+
+
+uint16_t send_status(void)
+{
+	slen = strtox(outbuf, "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n");
+	print_string("sending status\n");
+	char_to_html('[');
+
+	for (uint8_t i = minPort; i <= maxPort; i++) {
+		slen += strtox(outbuf + slen, "{\"portNum\":");
+		if (!isRTL8373)
+			itoa_html(log_to_phys_port[i]);
+		else
+			itoa_html(i + 1);
+
+		slen += strtox(outbuf + slen, ",\"isSFP\":");
+		if (IS_SFP(i)) {
+			char_to_html('1');
+			slen += strtox(outbuf + slen, ",\"enabled\":");
+			if (!((sfp_pins_last >> (i == maxPort ? 0 : 4)) & 1)) {
+				char_to_html('1');
+			} else {
+				char_to_html('0');
+			}
+			slen += strtox(outbuf + slen, ",\"link\":");
+			uint8_t rate = sfp_read_reg(i == maxPort ? 0 : 1, 12);
+			if (rate == 0xd)
+				char_to_html('2'); // 1000BX
+			else if (rate == 0x1f)
+				char_to_html('5'); // 2G5
+			else if (rate > 0x65 && rate < 0x70)
+				char_to_html('4'); // 10G "4" is not a valid value for port LINK speed
+			else
+				char_to_html('1'); // 100M ???
+		} else {
+			char_to_html('0');
+			slen += strtox(outbuf + slen, ",\"enabled\":");
+			phy_read(i, 0x1f, 0xa610);
+			if (SFR_DATA_8 == 0x20)
+				char_to_html('1');
+			else
+				char_to_html('0');
+			slen += strtox(outbuf + slen, ",\"link\":");
+			reg_read_m(RTL837X_REG_LINKS);
+			uint8_t b = sfr_data[3 - (i >> 1)];
+			b = (i & 1) ? b >> 4 : b & 0xf;
+			char_to_html('0' + b);
+		}
+		STAT_GET(STAT_COUNTER_TX_PKTS, i);
+		slen += strtox(outbuf + slen, ",\"txG\":\"0x");
+		reg_to_html(RTL837X_STAT_V_HIGH);
+		reg_to_html(RTL837X_STAT_V_LOW);
+
+		slen += strtox(outbuf + slen, "\",\"txB\":\"0x");
+		STAT_GET(STAT_COUNTER_ERR_PKTS, i);
+		reg_to_html(RTL837X_STAT_V_LOW);	// 32 bit Tx Packet errors
+
+		slen += strtox(outbuf + slen, "\",\"rxG\":\"0x");
+		STAT_GET(STAT_COUNTER_RX_PKTS, i);
+		reg_to_html(RTL837X_STAT_V_HIGH);
+		reg_to_html(RTL837X_STAT_V_LOW);
+
+		slen += strtox(outbuf + slen, "\",\"rxB\":\"0x");
+		STAT_GET(STAT_COUNTER_ERR_PKTS, i);
+		reg_to_html(RTL837X_STAT_V_HIGH);	// 32bit RX packet errors
+		slen += strtox(outbuf + slen, "\"}");
+		if (i < maxPort)
+			char_to_html(',');
+		else
+			char_to_html(']');
+	}
+	return 0;
+}

httpd/page_impl.h

@@ -0,0 +1,7 @@
+#ifndef __PAGE_IMPL_H__
+#define __PAGE_IMPL_H__
+
+uint16_t send_status(void);
+uint16_t send_vlan(register uint16_t vlan);
+
+#endif