diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77b37312..31a94891 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
           apt install make gcc sdcc xxd python-is-python3 libjson-c-dev zlib1g-dev -y
       - name: Run the host-side unit tests
         run: make -C test
-      - name: Check if machine.c can be compiled for all machines
+      - name: Check that every machine definition can be compiled
         run: make machine_check
       - name: Make project (4x2/RTL8372)
         run: make CI=1 MACHINE="KP_9000_6XHML_X2"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c490505..b66c3013 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@
 
 ## Added
 
+- Devices
+  - Support the hongyavision HYWS-SGT0204S (PCB marking `2G5F4_10G2_V1.01`), an
+    RTL8372 based 4x2.5G + 2xSFP+ unmanaged switch with a 512 KB Bright Moon
+    `T25S40` flash. It is a sibling of the KP-9000-6XH-X2 (2M-PCB43-V1.1) with
+    the two SFP+ cages wired the other way round (physical 5 is on SDS1,
+    physical 6 on SDS0), no reset button fitted, wrong silkscreen labels on the
+    serial header, `LED_GLB_IO_EN` bit 6 has to be set for the port LEDs to
+    work, and the fitted T25S40 cannot be read in DIO mode on this board, so the
+    target selects single-IO flash reads (`flash_sio`). New machine target
+    `MACHINE_2G5F4_10G2_V1_01`, see `doc/devices/2G5F4_10G2_V1.01.md`.
+
 - Web UI
   - Compress the embedded assets (minify + gzip) and switch to a single-page layout. #315
   - Replace the multi-page UI with a themed single-page app: light, dark and Selenized themes following the browser by default,
diff --git a/Makefile b/Makefile
index 599d2b95..c95f12af 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,20 @@ HTML_LOCATION = 262144
 ifeq ($(origin CC),default)
 CC = sdcc
 endif
-CC_FLAGS = -mmcs51 -I. -Ihttpd -Iuip
+CC_FLAGS = -mmcs51 -I. -Imachine -Ihttpd -Iuip
 ASM ?= sdas8051
 AFLAGS= -plosgff
 
 SUBDIRS := tools
 SUBDIRSCLEAN=$(addsuffix clean,$(SUBDIRS))
 
-ifeq ($(MACHINE),)
-	MACHINE:= $(shell grep "^\s*#define MACHINE_" machine.h | sed "s/^\s*#define MACHINE_//")
-else
+# $MACHINE selects machine/$(MACHINE).c as the board definition and is passed
+# on as -DMACHINE_$(MACHINE), which the rest of the firmware tests with
+# #if defined(MACHINE_...), and as -DMACHINE_NAME, which machine.h uses to
+# include machine/$(MACHINE).h. Both take the same value, so they cannot drift.
+ifneq ($(MACHINE),)
 	CC_FLAGS += -DMACHINE_$(MACHINE)
+	CC_FLAGS += -DMACHINE_NAME=$(MACHINE)
 endif
 # Health instrumentation and the "health" console command: HEALTH=1 gmake ...
 ifneq ($(HEALTH),)
@@ -28,6 +31,9 @@ ifeq ($(CI),1)
 	CC_FLAGS += --Werror
 endif
 
+# The board definition being built: one file per MACHINE_* symbol in machine.h.
+MACHINE_SRC = machine/$(MACHINE).c
+
 BUILDDIR = output/$(MACHINE)
 VERSION_HEADER := version.h
 
@@ -51,16 +57,30 @@ BUILD_DATE := $(shell date -u -d @$(SOURCE_DATE_EPOCH) +"%Y-%m-%d %H:%M:%S" 2>/d
 	|| date -u -r $(SOURCE_DATE_EPOCH) +"%Y-%m-%d %H:%M:%S")
 endif
 
-all: create_build_dir $(VERSION_HEADER) $(SUBDIRS) $(BUILDDIR)/rtlplayground-$(FILENAME_EXTENSION).bin
+# $(MACHINE_SRC) is listed here so an unknown $MACHINE fails before anything else
+# is built, including the tools/ subdirectory.
+all: create_build_dir $(VERSION_HEADER) $(MACHINE_SRC) $(SUBDIRS) $(BUILDDIR)/rtlplayground-$(FILENAME_EXTENSION).bin
 
 create_build_dir:
 	mkdir -p "$(BUILDDIR)"
 	mkdir -p "$(BUILDDIR)/uip"
 	mkdir -p "$(BUILDDIR)/httpd"
+	mkdir -p "$(BUILDDIR)/machine"
 
-# Keep machine.c in first position to fail immediately on invalid $MACHINE value
+# Every machine is a pair machine/<MACHINE>.c + machine/<MACHINE>.h. Selecting
+# them by name means no #if/#elif chain, so an unknown or empty $MACHINE is
+# caught here instead of by a #error further down the build.
+$(MACHINE_SRC):
+	@echo "ERROR: MACHINE='$(MACHINE)' has no definition (expected $(MACHINE_SRC))." >&2
+	@echo "       Every machine is one file pair under machine/, named after the" >&2
+	@echo "       MACHINE_* symbol it defines; see machine/*.c for the full list." >&2
+	@echo "       Example: make MACHINE=KP_9000_6XHML_X2" >&2
+	@false
+
+# Keep the per-machine definition in first position to fail immediately on an
+# invalid $MACHINE value
 SRCS = \
-	machine.c \
+	$(MACHINE_SRC) \
 	machine_init.c \
 	cmd_editor.c \
 	cmd_parser.c \
@@ -79,9 +99,11 @@ SRCS = \
 # RTL837x
 SRCS += \
 	rtl837x_bandwidth.c \
+	rtl837x_cabletest.c \
 	rtl837x_flash.c \
 	rtl837x_igmp.c \
 	rtl837x_init.c \
+	rtl837x_nic.c \
 	rtl837x_leds.c \
 	rtl837x_leds_dump.c \
 	rtl837x_phy.c \
@@ -89,7 +111,9 @@ SRCS += \
 	rtl837x_port.c \
 	rtl837x_stp.c \
 	rtl837x_lldp.c \
-	rtl837x_storm.c
+	rtl837x_storm.c \
+	rtl837x_lacp.c \
+	rtl837x_trap.c
 SRCS += \
 	httpd/httpd.c \
 	httpd/page_impl.c
@@ -178,15 +202,22 @@ $(BUILDDIR)/rtlplayground-$(FILENAME_EXTENSION).bin: $(BUILDDIR)/rtlplayground.i
 
 .PHONY: clean distclean all $(SUBDIRS) $(SUBDIRSCLEAN) create_build_dir
 
+# Every machine/ definition is compiled, so a machine added to machine/ is
+# covered without registering it anywhere. The machine-specific defines are
+# filtered out of $(CC_FLAGS) and supplied per iteration instead, so this also
+# works as "make machine_check MACHINE=...".
+MACHINE_DEFS := $(sort $(patsubst machine/%.c,%,$(wildcard machine/*.c)))
+MACHINE_LESS_CC_FLAGS = $(filter-out -DMACHINE_%,$(CC_FLAGS))
+
 .PHONY:
 machine_check:
 	@mkdir -p $(BUILDDIR)/tmp
 	@set -eo pipefail; \
-	for MACHINE in `grep -E '^[[:space:]]*(//[[:space:]]*)?#define MACHINE_' machine.h | sed -E 's%^[[:space:]]*(//[[:space:]]*)?#define MACHINE_%%' | awk '{print $$1}' | sort -u`; \
+	for MACHINE in $(MACHINE_DEFS); \
 	do \
 	echo "Checking $${MACHINE}"; \
-	$(CC) $(CC_FLAGS) -DMACHINE_$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine.c; \
-	$(CC) $(CC_FLAGS) -DMACHINE_$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine_init.c; \
+	$(CC) $(MACHINE_LESS_CC_FLAGS) -DMACHINE_$${MACHINE} -DMACHINE_NAME=$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine/$${MACHINE}.c; \
+	$(CC) $(MACHINE_LESS_CC_FLAGS) -DMACHINE_$${MACHINE} -DMACHINE_NAME=$${MACHINE} -MMD -o $(BUILDDIR)/tmp/machine_check -c machine_init.c; \
 	done
 	@rm -rf $(BUILDDIR)/tmp
 
diff --git a/README.md b/README.md
index 6eaf74e8..22d9df5d 100644
--- a/README.md
+++ b/README.md
@@ -103,24 +103,29 @@ docker run --rm -p 8080:8080 -v $(pwd):/workspace rtlplayground-dev \
   tools/output/httpd_sim /workspace/html
 ```
 
-Edit `machine.h` or `config.txt` on your host, then re-run `make` — the
+Edit `config.txt` on your host, then re-run `make` — the
 source directory is mounted into the container, so changes take effect
-immediately. To build for a different machine, pass `MACHINE=...`.
+immediately. To build for a different machine, pass `MACHINE=<name>`, which
+selects `machine/<name>.c` (see [Adding a new device](doc/adding-a-device.md)).
 
 </details>
 
 ## (1) Compiling for direct chip flashing AND upgrading an existing RTLPlayground running device
 
-Edit machine.h with an editor like vi or nano. Select the correct machine the firmware should build for.
+Pass the machine that matches your device, for example:
+```
+make MACHINE=DEFAULT_8C_1SFP
+```
+The name selects the board definition `machine/<name>.c`; `make` without a
+`MACHINE` value stops with an error listing what is expected. If your board is
+not in the list yet, see [Adding a new device](doc/adding-a-device.md).
 
 > [!TIP]
 > You can write configuration parameters in config.txt (see below) in order your switch to get
 > straight at the first boot, a correct IP configuration.
 
-Now, building the firmware image should work:
-```
-make 
-```
+Now, building the firmware image should work.
+
 Note, that the image generated ends in .bin, not .img, in order to make IMSProg happy.
 
 image location is stored in `RTLPlayground/output/rtlplayground_version_machine.bin`
@@ -186,7 +191,7 @@ Go to "Firmware update" tab, select the correct file.
 
 > [!IMPORTANT]
 > If your device already runs RTLPlayground, you must upload the binary file /RTLPlayground/output/rtlplayground_Version_Machine.bin
-> If your device is OEM, you must upload the binary file /RTLPlayground/installer/outputrtlplayground_oem_upgrade.bin
+> If your device is OEM, you must upload the binary file /RTLPlayground/installer/output/rtlplayground_oem_upgrade.bin
 
 > [!CAUTION]
 > Check one more time that your device matches the machine type before flashing.
@@ -353,12 +358,14 @@ Enjoy playing!
 ## (11) Other documents
 
 The following documents give further documentation on specific features of the RTL837x SoCs:
+- [Adding a new device](doc/adding-a-device.md)
 - [RTL8372/3 Feature support](doc/hardware.md)
 - [CPU Port](doc/CpuPort.md)
 - [L2 learning](doc/l2.md) 
 - [IGMP (IP-MC streaming)](doc/igmp.md)
 - [SFP+ ports](doc/sfp.md) 
-- [Trunking aka. port aggregation](doc/trunking.md)
+- [Trunking aka. port aggregation](doc/link_aggregation.md)
+- [LACP (802.3ad link aggregation)](doc/lacp.md)
 - [VLAN](doc/vlan.md)
 - [Storm control](doc/storm_control.md)
 - [Modifications and Flash replacement](doc/mods.md)
diff --git a/boot.c b/boot.c
index 9e271660..adcb192b 100644
--- a/boot.c
+++ b/boot.c
@@ -257,7 +257,7 @@ void nic_setup(void) __banked
 
 	// This sets the size of the RX buffer, the filling level is in 0x7874
 	// R7848-000004ff
-	REG_SET(RTL837X_REG_NIC_RXBUFF_RX, 0x4ff);
+	REG_SET(RTL837X_REG_NIC_RXBUFF_RX, RTL837X_NIC_RX_LAST_SLOT);
 
 	// R7844-000007fe
 	REG_SET(RTL837X_REG_NIC_BUFFSIZE_TX, 0x7fe);
@@ -296,6 +296,7 @@ void nic_setup(void) __banked
 
 	// Sequence number of TX packets
 	tx_seq = 0;
+	REG_SET(RTL837X_NIC_INT_MSK, NIC_INT_RXIE);
 }
 
 
diff --git a/cmd_parser.c b/cmd_parser.c
index e7daa9e8..afc7831a 100644
--- a/cmd_parser.c
+++ b/cmd_parser.c
@@ -14,10 +14,13 @@
 #include "rtl837x_regs.h"
 #include "rtl837x_sfr.h"
 #include "rtl837x_stp.h"
+#include "rtl837x_lacp.h"
 #include "rtl837x_igmp.h"
 #include "rtl837x_bandwidth.h"
 #include "rtl837x_lldp.h"
 #include "rtl837x_storm.h"
+#include "rtl837x_trap.h"
+#include "rtl837x_cabletest.h"
 #include "sfp.h"
 #include "dhcp.h"
 #include "syslog.h"
@@ -164,10 +167,15 @@ uint8_t atoi_hex(uint8_t idx)
 			break;
 		}
 
+		if (h_idx == 8) {
+			h_idx = 0;
+			break;
+		}
+
 		// swap hex nibbles
 		val = (val >> 4) | (val << 4);
 
-		if (c - '0' < 10) {
+		if ((uint8_t)(c - '0') < 10) {
 			val |= c - '0';
 		} else {
 			c |= 0x20;
@@ -533,11 +541,21 @@ void parse_lag(void)
 		goto err;
 
 	if (cmd_compare(2, "d")) {
+		lacp_lag_set(group, 0);
 		port_lag_members_set(group, 0);
 		return;
 	}
 
 	uint8_t w = 2;
+	__xdata uint8_t lacp_mode = 0;
+	if (cmd_words_len > 2 && cmd_compare(2, "lacp")) {
+		lacp_mode = 1;
+		w = 3;
+		if (cmd_words_len > 3 && cmd_compare(3, "off")) {
+			lacp_lag_set(group, 0);
+			return;
+		}
+	}
 	while (w < cmd_words_len) {
 		// Parse port.
 		if (cmd_parse_port_separator(cmd_words_b[w++]) == 0)
@@ -545,10 +563,15 @@ void parse_lag(void)
 
 		members |= ((uint16_t)1) << atoi_results_u8;
 	}
-	port_lag_members_set(group, members);
+	if (lacp_mode) {
+		lacp_lag_set(group, members);
+	} else {
+		lacp_lag_set(group, 0);
+		port_lag_members_set(group, members);
+	}
 	return;
 err:
-	cmd_error("lag (show | <1-4> (d | <port>...))\n");
+	cmd_error("lag (show | <1-4> (d | [lacp] <port>...))\n");
 }
 
 
@@ -722,7 +745,7 @@ void parse_isolate(void)
 	if (cmd_compare(2, "off")) {
 		for (uint8_t i = machine.min_port; i <= machine.max_port; i++)
 			members |= ((uint16_t)1) << i;
-		members |= 0x200; // CPU-port
+		members |= PMASK_CPU; // CPU-port
 		port_isolate(port_configured, members);
 		return;
 	}
@@ -846,9 +869,14 @@ void parse_mirror(void)
 	if (cmd_words_len < 2)
 		goto err;
 
+	// The first argument is the mirroring (monitor) port
+	uint8_t ret = cmd_parse_port(cmd_words_b[1]);
+	if (ret == 0)
+		goto err;
+	mirroring_port = atoi_results_u8;
+
 	uint8_t w = 2;
 	uint8_t port;
-	uint8_t ret;
 	while (w < cmd_words_len) {
 		uint8_t idx = cmd_words_b[w++];
 		ret = cmd_parse_port(idx);
@@ -858,10 +886,6 @@ void parse_mirror(void)
 		idx += ret;
 		port = atoi_results_u8;
 
-		// Use the first port argument as mirroring_port
-		if (w == 2)
-			mirroring_port = port;
-
 		ret = cmd_buffer[idx];
 		uint16_t pmask = ((uint16_t)1) << port;
 		if (ret != 't')
@@ -885,6 +909,7 @@ void parse_port(void)
 					 "\nport <port> [show|on|off]" \
 					 "\nport <port> [10m|100m|1g|2g5|duplex] [half|full]" \
 					 "\nport <port> lldp [block|permit]" \
+					 "\nport <port> cabletest [show]" \
 					 "\nport <port> name [custom port name]\n");
 		return;
 	}
@@ -927,6 +952,11 @@ void parse_port(void)
 		}
 	} else if (machine.is_sfp[phy_settings.port]) {
 		print_string(" is SFP no PHY information available.\n");
+	} else if (cmd_compare(2, "cabletest")) {
+		if (cmd_words_len > 3 && cmd_compare(3, "show"))
+			cabletest_show();
+		else
+			cabletest_run();
 	} else if (cmd_compare(2, "10m")) {
 		print_string(" 10M\n");
 		phy_settings.speed = PHY_SPEED_10M;
@@ -1972,6 +2002,13 @@ void cmd_parser(void) __banked
 		} else if (cmd_compare(0, "health")) {
 			health_show();
 #endif
+		} else if (cmd_compare(0, "lacp")) {
+			if (cmd_compare(1, "show"))
+				lacp_show();
+			else if (cmd_compare(1, "off"))
+				lacp_off();
+			else
+				cmd_error("lacp (show | off); a group starts LACP with: lag <1-4> lacp <port>...\n");
 		} else if (cmd_compare(0, "pvid")) {
 			if (cmd_words_len == 3 && cmd_parse_port_separator(cmd_words_b[1]) != 0
 			    && atoi_short(cmd_words_b[2]) && atoi_results_short && atoi_results_short <= 4094)
@@ -2043,9 +2080,11 @@ void cmd_parser(void) __banked
 			if (cmd_compare(1, "on")) {
 				print_string("LLDP enabled\n");
 				lldp_enabled = 1;
+				trap_rma_set(RTL837X_RMA0E_CONF, RTL837X_RMA_ACT_TRAP);
 			} else {
 				print_string("LLDP disabled\n");
 				lldp_enabled = 0;
+				trap_rma_set(RTL837X_RMA0E_CONF, RTL837X_RMA_ACT_FORWARD);
 			}
 		}
 		else {
@@ -2116,7 +2155,7 @@ void execute_config(void) __banked
 				skipping = 1;
 			}
 			c = flash_buf[cfg_idx++];
-			if (c == 0 || c == '\n') {
+			if (c == 0 || c == '\n' || c == '\r') {
 				if (skipping) {
 					skipping = 0;
 				} else {
diff --git a/dhcp.c b/dhcp.c
index 079cd521..279ccc24 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -51,7 +51,7 @@ __xdata uip_ipaddr_t server;
 #define DHCP_END		255
 
 #pragma codeseg BANK3
-#pragma constseg BANK2
+#pragma constseg BANK3
 
 struct dhcp_pkt {
 	uint8_t type;
diff --git a/doc/CpuPort.md b/doc/CpuPort.md
index c10d0a15..652b1cbb 100644
--- a/doc/CpuPort.md
+++ b/doc/CpuPort.md
@@ -34,6 +34,21 @@ Next, transfer the actual packet over by repeating the SFR function with a
 pointer to the frame on the ASIC directly after the frame header and a
 length as given by the length in the frame header + 7, again divided by 8.
 
+The RX ring's inclusive last slot is configured as `0x4ff`, giving a byte
+range of `0x0000` through `0x27ff`. If the descriptor occupies the last slot
+at `0x27f8`, its payload starts at `0x0000`, not `0x2800`. The RX copy code
+normalizes that starting address before DMA. It relies on the hardware to
+wrap transfers that start inside the ring and cross its end, as observed
+on SWTGW218AS. Programming an initial address of `0x2800` does not wrap
+and can instead read zeros or stale TX data outside the RX ring.
+
+Frame lengths are checked against `UIP_CONF_BUFFER_SIZE` before copying.
+DMA works in whole eight-byte units. `UIP_CONF_BUFFER_ALLOC_SIZE` rounds
+the backing storage up to the next complete word: 1,560 bytes for the
+1,556-byte logical frame limit. This padding allows a maximum-size frame
+to be transferred directly without a separate tail copy. The logical
+frame limit and advertised MSS are unchanged.
+
 The received frame will have an RTL proprietary Ethernet frame type of
 0x8899 (RRPC) where normally the frame type 0x0800 for IPv4 would be located.
 Further 6 bytes follow describing the frame, before the normal IPv4 data
diff --git a/doc/adding-a-device.md b/doc/adding-a-device.md
new file mode 100644
index 00000000..8d45d198
--- /dev/null
+++ b/doc/adding-a-device.md
@@ -0,0 +1,196 @@
+# Adding a new device
+
+A device is supported by adding one board definition `.h` and board configuration `.c` file
+under `machine/`. 
+the build selects the definition by name, and CI compiles every file it finds.
+
+To compile for your added device, do:
+```
+make MACHINE=<NAME>
+```
+
+## What a new device consists of
+
+| File | Purpose |
+|------|---------|
+| `machine/<NAME>.c` | the `struct machine machine` board definition |
+| `machine/<NAME>.h` | `MACHINE_MODEL`, the model string shown in the UI and the CLI |
+| `doc/devices/<name>.md` + `doc/supported_devices.md` | (only if the board is verified and you want to support it publicly) user-facing documentation |
+
+`<NAME>` is the machine symbol without its `MACHINE_` prefix, so `MACHINE` is
+passed exactly as spelled on the command line: `make MACHINE=MY_BOARD_1_0`
+needs `machine/MY_BOARD_1_0.c` and `machine/MY_BOARD_1_0.h`.
+
+## Step 1: the model header
+
+`machine/<NAME>.h` only carries the product string. Use the existing files as
+the template:
+
+```c
+#ifndef _MACHINE_MY_BOARD_1_0_H_
+#define _MACHINE_MY_BOARD_1_0_H_
+
+#define MACHINE_MODEL "Brand Model V1.0"
+
+#endif
+```
+
+The device product string is what the CLI or the Web-Interface will print to identify the device; `machine.h` includes it by name.
+
+> [!NOTE]
+> `machine_name` is a `char[30]` and `MACHINE_MODEL` is copied into it at
+> compile time. A longer model string still builds, but SDCC emits
+> `warning 147: excess elements in array of chars initializer` and the name is
+> truncated in the UI. Keep it to 29 characters or less.
+
+## Step 2: the board definition
+
+`machine/<NAME>.c` starts with the shared prelude and then defines the single
+`machine` object. Copy the closest existing board and adjust it — do not start
+from a blank file, the field meanings are easier to see in a real example.
+The best choice is usually a device that has the same number and type of Ethernet
+ports and the same number of SFP+ cages.
+
+```c
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+	.led_sets = {
+		{   /* RJ45 ports */
+			LEDS_2G5 | LEDS_LINK,
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0
+		}, { /* SFP port, single green LED */
+			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0
+		}
+	},
+};
+```
+
+### Fields
+
+| Field | Meaning |
+|-------|---------|
+| `machine_name` | always `MACHINE_MODEL` |
+| `isRTL8373` | `1` for an RTL8373 SoC, `0` for RTL8372 |
+| `min_port` / `max_port` | range of logical port numbers the device has; `min_port` is `0` for RTL8373 boards and `3` for RTL8372 boards (logical ports 1–2 are the SoC's internal ports on the 8372), `max_port` is usually 8. |
+| `n_sfp` | number of SFP+ cages |
+| `n_10g` | SerDes 10G capability used by the RTL837xN init: `0` none, `1` one, `2` two 10G-capable SerDes |
+| `log_to_phys_port[9]` | logical port (0-based index) → physical front-panel port number |
+| `phys_to_log_port[9]` | the inverse, physical port 1 is index 0, unused slots are 0 |
+| `is_sfp[9]` | `0` for copper, `1` for left slot and `2` for right slot |
+| `sfp_port[2]` | per-cage wiring, `sfp_port[0]` is the leftmost cage |
+| `reset_pin` | GPIO of the reset button, `GPIO_NA` if unpopulated |
+| `high_leds` | mux/enable for the LED pins 27–29 (`LED_27`, `LED_28_SYS`, `LED_29`) |
+| `port_led_set[9]` | which LED set (0–3) each logical port uses |
+| `led_sets[4][4]` | Each port can have up to 4 GPIO output pins assigned. 4 sets of LEDs with 4 LED-conditions per set; the conditions define which GPIO pins become active for a port given a port link-state. Which LEDs are then enabled depends on the wiring of the pins to up to 3 LEDs for that port, which can make a logical combination of the 4 LED output-pins. |
+| `led_mux_custom` / `led_mux[28]` | `1` plus the 28 mux values when the stock LED muxing does not fit the board |
+| `mac_flash_offset` | flash offset of the factory MAC address, omit or `0` if the board does not store one |
+
+Each `struct sfp_port` entry holds `pin_detect`, `pin_los`, `pin_tx_disable`,
+`sds` (which SerDes drives the cage) and `i2c` (built with `I2CBUS(sda, scl)`,
+or `GPIO_NA`-based values where a cage has no such pin).
+
+`I2CBUS(...)` only accepts the pin pairs listed in `machine_defs.h`. A wrong
+pair is caught at compile time: SDCC reports
+`error 176: sizeof applied to an incomplete type` pointing at the offending
+`.i2c` line, because the macro deliberately turns an invalid bus number into an
+array of size 0.
+
+### Reusing an existing definition
+
+If the new board is electrically identical to one that already exists — same
+port mapping, same SFP wiring, same LEDs — do not copy the file. Make the new
+`.c` a symlink and keep only a distinct `.h`, so the two boards cannot drift
+apart:
+
+```
+ln -s KP_9000_6XHML_X2.c machine/MY_BOARD_1_0.c
+```
+
+The new board still needs `machine/MY_BOARD_1_0.h` (pick the version number on the PCB) with its own
+`MACHINE_MODEL`, because `MACHINE_MODEL` is what distinguishes the products.
+Existing examples: `machine/PCB_K0402WS_V3.c`, `machine/KP_9000_9XHML_X_V3_2.c`
+and the six `KP_9000_*` revision variants.
+
+Two files that differ only in whitespace or comments are duplicates and should
+be collapsed this way.
+
+## Step 3: build and verify
+
+```
+make MACHINE=MY_BOARD_1_0
+```
+
+The generated flash image appears as `output/rtlplayground-<version>-MY_BOARD_1_0.bin`. An
+unknown or empty `MACHINE` fails immediately with a message naming the expected
+file, before anything is compiled.
+
+Then run the checks CI runs:
+
+```
+make machine_check    # compiles machine/<NAME>.c and machine_init.c for every machine
+make -C test          # host-side unit tests
+```
+
+`make machine_check` discovers the definitions with
+`$(wildcard machine/*.c)`, so a new file is covered without registering it
+anywhere. CI (`.github/workflows/build.yml`) runs it on every push and pull
+request, alongside full builds for a 4+2 and an 8+1 board.
+
+A successful compile only proves the definition is syntactically valid. The
+actual behaviour — port numbering, SFP detection, LEDs — has to be confirmed on
+hardware, and the console commands (`port`, `stat`, `sfp`, `leds`) are the
+tools for that.
+
+## Step 4: documentation
+
+Once the board has been tested on hardware:
+
+1. Add a row to the table in [Supported devices](supported_devices.md).
+2. Add `doc/devices/<name>.md` describing the board, the build target
+   (`make MACHINE=MY_BOARD_1_0`), what works and what is unverified, plus
+   photos and the PCB silkscreen marking.
+3. If the board shares a PCB with other revisions, follow
+   `doc/devices/KP-9000-6XH-X2.md` and document which `MACHINE` to pick for
+   which silkscreen.
+
+### Identifying the CPU variant
+
+For RTL8373-based devices, use the read-only console command below to distinguish
+the N and non-N CPU variants:
+
+```text
+regget 4
+```
+
+| Register 0x0004 value | CPU |
+|---|---|
+| `0x83730000` | RTL8373 (non-N) |
+| `0x83737000` | RTL8373N |
+
+Record the identified CPU in the device documentation. These values identify
+only the CPU variant; document PHY and flash-chip models separately when verified.
+
diff --git a/doc/devices/2G5F4_10G2_V1.01.md b/doc/devices/2G5F4_10G2_V1.01.md
new file mode 100644
index 00000000..fc3803a2
--- /dev/null
+++ b/doc/devices/2G5F4_10G2_V1.01.md
@@ -0,0 +1,178 @@
+hongyavision HYWS-SGT0204S
+
+RTL8372-based 4×2.5G + 2×SFP+ unmanaged switch.
+
+Also marked on the PCB as `2G5F4_10G2_V1.01`.
+
+Stock firmware runs a factory test console on UART at 9600 baud 8N1 (banner
+`RTL8371B start`, prompt `RTL8371B:`). There is no management CLI and no Web
+interface.
+
+Using SPI clamp in-board is the only method for initial installation and update.
+Erase the whole chip and verify the write (`flashrom -v`) before powering the
+board, so an incomplete write is caught before the board is powered up.
+
+Stock flash chip is 512 KB (Bright Moon `T25S40`, 4 Mbit, SOP-8), which the
+RTLPlayground image fills exactly.
+
+### Label specifications
+
+Case, top / front / nameplate:
+
+<img src="photos/2G5F4_10G2_V1.01/assembled-top.jpg" width="300" />
+<img src="photos/2G5F4_10G2_V1.01/assembled-front.jpg" width="300" />
+<img src="photos/2G5F4_10G2_V1.01/assembled-bottom.jpg" width="300" />
+
+- **Manufacturer**: hongyavision (Shenzhen Hongyavision Electronic Technology
+  Co., Ltd.)
+- **Model**: HYWS-SGT0204S — the nameplate is printed in Chinese and reads
+  "10/100/1000/2500M fibre switch" and "4x 2.5G copper port + 2x 10G SFP+
+  optical port"
+- **Ports**:
+  - 4 × RJ45: 10/100/1000/2500 Mbps
+  - 2 × SFP+: 1G / 2.5G / 10G
+- **Power**: 12 V DC, 2 A
+- **Serial number**: `S/N-YYYYMMDDNNNN`, e.g. `S/N-202312010028`
+
+The top of the case only carries generic printing ("2.5G+10G High Speed Fiber
+Transceiver / 4-Port 2.5G Ethernet Switch+10G Fiber"), so the nameplate on the
+bottom is what identifies the device.
+
+### What works
+
+- All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps
+- Both SFP+ ports supporting 1G, 2.5G and 10G modules
+- Copper LEDs: white (2.5G) and blue (link/activity)
+- SFP LEDs: one single LED per port (link/activity)
+- SFP EEPROM and DDM readable on both cages, verified with a 10G module
+  (`Rate: 0x67`, module identity and DDM values via the `sfp` console command)
+- Serial console at 115200 8N1 (RTLPlayground) / 9600 8N1 (stock)
+
+### Not verified
+
+- The reset button footprint is unpopulated and the case has no opening for it,
+  so it could not be tested.
+
+### PCB overview
+
+**Board markings**
+- Top silkscreen: `2G5F4_10G2_V1.01`
+
+**Key components**
+- Main switch: RTL8372 (RTL8371B family), reported as `RTL8372` (non-N) by
+  RTLPlayground. The chip sits under a heatsink and its package marking is not
+  readable.
+- U1: SPI NOR flash, Bright Moon `T25S40`, 4 Mbit / 512 KB, SOP-8
+- A 3-hole reset button footprint is present but unpopulated, and the case has
+  no opening for it, so there is no usable reset button
+
+Top side:
+
+<img src="photos/2G5F4_10G2_V1.01/pcb_top.jpg" width="600" />
+
+Bottom:
+
+<img src="photos/2G5F4_10G2_V1.01/pcb_bottom.jpg" width="600" />
+
+The stock flash chip, Bright Moon `T25S40` (SOP-8, 4 Mbit / 512 KB):
+
+<img src="photos/2G5F4_10G2_V1.01/flash_t25s40.jpg" width="300" />
+
+### Port layout
+
+| Front panel position | Logical port | Physical port | Type    |
+|----------------------|--------------|---------------|---------|
+| SFP left             | 8            | 5             | SFP+    |
+| RJ45 1               | 4            | 1             | Copper  |
+| RJ45 2               | 5            | 2             | Copper  |
+| RJ45 3               | 6            | 3             | Copper  |
+| RJ45 4               | 7            | 4             | Copper  |
+| SFP right            | 3            | 6             | SFP+    |
+
+Copper ports 1–4 match the KP-9000-6XH-X2 (2M-PCB43-V1.1) layout, which this
+board is a sibling of. The two SFP+ cages are wired the other way round
+compared to that board: physical port 5 is on SDS1 and physical port 6 is on
+SDS0.
+
+### Serial console
+
+The board has three through-holes used as the serial console, next to the
+heatsink in the middle of the board and visible in the top side photo above (the
+silkscreen labels are printed rotated by 90°). **The silkscreen labels are
+wrong**: they are shifted relative to the actual signals.
+
+| Silkscreen label | Actual signal |
+|------------------|---------------|
+| TX               | GND           |
+| RX               | TX            |
+| GND              | RX            |
+
+Wiring (following the measured signals, not the labels):
+
+| USB-TTL adapter | Board pad            |
+|-----------------|----------------------|
+| GND             | pad labelled `TX`    |
+| RX              | pad labelled `RX`    |
+| TX              | pad labelled `GND`   |
+
+- **Settings**: 115200 baud / 8N1 / 3.3V TTL (RTLPlayground), 9600 baud for the
+  stock firmware
+- The stock firmware only prints a few bytes and a factory test menu
+  (`?`, `rst`, `f`, `r`, `10`, `100`, `g1`, `sd`, `eye`, …); it is not an
+  interactive management console
+
+### LED configuration
+
+Case silkscreen, below the RJ45 ports:
+
+```
+White : 2.5G    Blue : 1000M/2500M L/A
+```
+
+The front panel also carries a `PWR` LED and one LED per SFP cage (`SFP1`,
+`SFP2`) on the right hand side.
+
+| Port       | LED          | Linked, idle | With traffic |
+|------------|--------------|--------------|--------------|
+| Copper     | white        | 2.5G only    | same         |
+| Copper     | blue         | solid        | blinks (L/A) |
+| SFP        | single LED   | solid        | blinks (L/A) |
+
+Measured LED-ID mapping (from the RTL837x LED set registers):
+
+| LED-ID | Function                        |
+|--------|---------------------------------|
+| LED-ID0| copper blue LED                 |
+| LED-ID1| copper white LED                |
+| LED-ID2| SFP single LED                  |
+
+**Important**: `RTL837X_REG_LED_GLB_IO_EN` bit 6 must be set in
+`machine_custom_init()`. Without it the RTL837x "solid" conditions (LINK/speed)
+do not drive the LEDs at all and only `ACT` does, which makes the white LED
+glow faintly at non-2.5G speeds.
+
+### SFP GPIO assignments
+
+| SFP               | pin\_detect (ModAbs)          | pin\_los         | SerDes | I2C SDA                 | I2C SCL                  |
+|-------------------|-------------------------------|------------------|--------|-------------------------|--------------------------|
+| Left (logical 8, physical 5) | GPIO30\_ACL\_BIT3\_EN | GPIO37   | SDS1   | GPIO39\_I2C\_SDA4       | GPIO40\_I2C\_SCL3\_MDC1  |
+| Right (logical 3, physical 6)| GPIO50\_I2C\_SCL2\_UART1\_TX | GPIO10\_LED10 | SDS0 | GPIO41\_I2C\_SDA3\_MDIO1 | GPIO40\_I2C\_SCL3\_MDC1 |
+
+`pin_tx_disable` is GPIO\_NA on both ports. Both I2C buses are confirmed
+working: with the same 10G module inserted, the `sfp` console command reads its
+vendor and model from the left cage (`Slot 1`) and from the right cage
+(`Slot 2`), DDM values included. The insertion also shows which SerDes drives
+each cage - the left cage reports `sds_config sds: 01` and the right cage
+`sds: 00`, which matches the table above.
+
+### Machine target
+
+Build for this device with `make MACHINE=2G5F4_10G2_V1_01`, which selects the
+`machine/2G5F4_10G2_V1_01.c` board definition. It is derived from
+`machine/KP_9000_6XHML_X2.c` with the SFP cage order and the reset pin changed.
+The fitted T25S40 cannot be read in DIO mode on this board: an image that leaves
+DIO enabled does not come up at all, both at the default read clock divider of 4
+and at 8 (two boards tested), while the same image with single-IO boots and runs
+normally. The board definition therefore sets `flash_sio`, which makes
+`flash_init()` use `CMD_FREAD` at divider 8. Only the management plane is
+slower, the ASIC keeps forwarding in hardware.
diff --git a/doc/devices/2M-PCB23-V3_2.md b/doc/devices/2M-PCB23-V3_2.md
index 9cfe3acc..f86f8db2 100644
--- a/doc/devices/2M-PCB23-V3_2.md
+++ b/doc/devices/2M-PCB23-V3_2.md
@@ -17,8 +17,8 @@ The original web interface reports this board as hardware version V3.2
 The component placement matches [2M-PCB23-V3.1](2M-PCB23-V3_1.md): same
 positions for the flash (U8), the T7/T8/T9/T10 headers, the SFP cage and its
 LED, and the unpopulated U7/U9 footprints. Build with
-`MACHINE=KP_9000_9XHML_X_V3_2`, which uses the V3.1 machine definition and
-only differs in the reported name.
+`make MACHINE=KP_9000_9XHML_X_V3_2`, whose board file is a symlink to the V3.1
+definition and only differs in the reported name.
 
 ## Tested
 
diff --git a/doc/devices/2M-PCB43-V1.1.md b/doc/devices/2M-PCB43-V1.1.md
index 97343f02..0a11f513 100644
--- a/doc/devices/2M-PCB43-V1.1.md
+++ b/doc/devices/2M-PCB43-V1.1.md
@@ -15,7 +15,7 @@ and sold by Mokerlink.
 The device is fully supported:
 - All 4 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
 - The SFP+ port supports 1G, 2.5G and 10G modules 
-- LEDs work with the same indiciations as the OEM firmware (use KP_9000_6XHML_X2_V1_1 in machine.h if building yourself or the corresponding pre-compiled binary)
+- LEDs work with the same indiciations as the OEM firmware (build with `make MACHINE=KP_9000_6XHML_X2_V1_1` if building yourself, or use the corresponding pre-compiled binary)
 - untested due to missing Hardware: SFP+ ports equipped with 1G or 2.5G SFPs.
 
 ### Hardware overview
diff --git a/doc/devices/Hasivo-S1100P-8GT-1SX-S.md b/doc/devices/Hasivo-S1100P-8GT-1SX-S.md
new file mode 100644
index 00000000..9fc60186
--- /dev/null
+++ b/doc/devices/Hasivo-S1100P-8GT-1SX-S.md
@@ -0,0 +1,41 @@
+# Hasivo S1100P-8GT-1SX-S
+
+RTL8373N switch with 8 × 2.5G RJ45 ports and 1 × SFP port. GD25Q16 2 MiB flash.
+
+## Port mapping
+
+| Front port | ASIC MAC | Interface |
+| --- | --- | --- |
+| 1–8 | 0–7 | RJ45 |
+| 9 | 8 | SFP (SDS1) |
+
+## Board signals
+
+| Function | GPIO |
+| --- | --- |
+| SFP detect | 38 |
+| SFP LOS | 37 |
+| SFP TX disable | Not connected (`GPIO_NA`) |
+| SFP I2C SDA / SCL | 39 / 40 |
+| Reset | 54 |
+
+PoE is managed by an RTL8238B and a separate STC8H8K64U controller, not directly by the RTL8373N. RTLPlayground does not control PoE on this board.
+
+## Build
+
+`make MACHINE=HASIVO_S1100P_8GT_1SX_S CI=1`
+
+## Photos
+
+Front panel:
+
+![Front panel](photos/Hasivo-S1100P-8GT-1SX-S/front.jpg)
+
+PCB top:
+
+![PCB top](photos/Hasivo-S1100P-8GT-1SX-S/pcb_top.jpg)
+
+PCB bottom:
+
+![PCB bottom](photos/Hasivo-S1100P-8GT-1SX-S/pcb_bottom.jpg)
+
diff --git a/doc/devices/ONT-S207CW-62TS-SE.md b/doc/devices/ONT-S207CW-62TS-SE.md
index fd5558e2..660d1c30 100644
--- a/doc/devices/ONT-S207CW-62TS-SE.md
+++ b/doc/devices/ONT-S207CW-62TS-SE.md
@@ -90,6 +90,8 @@ Custom mapping for ONT-S207CW-62TS-SE:
 ## Flashing Instructions
 
 See the [README.md](../../README.md) for general flashing instructions.
+For compilation, use command `make MACHINE=ONT_S207CW_62TS_SE` to specify the machine.
+If you are using managed version of the switch, you can then also compile the installer and flash using GUI - run command `cd installer` and finally `make`.
 
 ## Stock Firmware Information
 
diff --git a/doc/devices/PCB-K0402WS-V1.0.md b/doc/devices/PCB-K0402WS-V1.0.md
new file mode 100644
index 00000000..e732a20f
--- /dev/null
+++ b/doc/devices/PCB-K0402WS-V1.0.md
@@ -0,0 +1,72 @@
+# PCB-K0402WS-V1.0
+
+This is the first revision of the PCB-K0402WS series of boards; it's very similar to 2.0 in terms of layout/wiring.
+
+The board does have footprints for a VLAN modeswitch at the front and a second flash chip on the bottom of the PCB, but these have been seen to ship unpopulated.
+
+### Brands
+
+* YuanLey YS25-0402 <sup><sub>Note: there are [multiple revisions](PCB-K0402WS-V3.0.md) of the YS25-0402. This first revision lacks the "Vlan" switch cutout on the front of the enclosure.</sub></sup>
+
+### Programming
+
+Use a SOIC-8 clamp to the flash chip (U1 on silkscreen) at the top of the board, leaving it otherwise unpowered.
+
+The board has been seen to ship with a single [BoyaMicro BY25Q16BSSIG](https://www.lcsc.com/datasheet/C382744.pdf) 16Mbit (2MiB) chip, though exact BOM may vary.
+
+<a href="photos/PCB-K0402WS-V1.0/flash.jpg"><img src="photos/PCB-K0402WS-V1.0/flash.jpg" width="300" /></a>
+
+### What works
+
+- All four 2.5GBASE-T RJ45 ports at 10/100/1000/2500 Mbps
+- Both SFP ports supporting 1G, 2.5G and 10G modules
+- LEDs (Power LED is always on)
+
+### PCB overview
+
+#### Board markings
+- Top silkscreen: PCB-K0402W-V1.0 / DIP-K0402WS-V1.0
+
+#### Key components
+- U1: SPI NOR flash, 2 MiB
+- S1: unpopulated slide switch footprint (three through-holes used as serial console)
+
+Front panel
+
+<a href="photos/PCB-K0402WS-V1.0/ports.jpg"><img src="photos/PCB-K0402WS-V1.0/ports.jpg" width="300" /></a>
+
+PCB top
+
+<a href="photos/PCB-K0402WS-V1.0/pcb-top.jpg"><img src="photos/PCB-K0402WS-V1.0/pcb-top.jpg" width="300" /></a>
+
+PCB bottom
+
+<a href="photos/PCB-K0402WS-V1.0/pcb-bottom.jpg"><img src="photos/PCB-K0402WS-V1.0/pcb-bottom.jpg" width="300" /></a>
+
+Bottom and rear
+
+<a href="photos/PCB-K0402WS-V1.0/bottom.jpg"><img src="photos/PCB-K0402WS-V1.0/bottom.jpg" width="300" /></a>
+
+### Power supply
+
+Input power is delivered via a standard DC barrel jack (5.5x2.1mm) with an included 12V 1A adapter.
+
+There is an optional grounding screw next to the DC input.
+
+### Serial console
+
+The PCB has a slide switch footprint (unpopulated) at the front right that is connected to the UART. It is labeled as "S1" on the silkscreen.
+
+Facing the top front (port) side of the board, the pinout from left to right is:
+
+| Position | Signal | GPIO              |
+|----------|--------|-------------------|
+| 1        | RX     | GPIO32\_UART0\_RX |
+| 2        | GND    | N/A               |
+| 3        | TX     | GPIO31\_UART0\_TX |
+
+Standard 0.1" / 2.54mm pin headers will not fit, so wires or clips may be used instead.
+
+The image below shows some oversized clips clumsily attached.
+
+<a href="photos/PCB-K0402WS-V1.0/uart.jpg"><img src="photos/PCB-K0402WS-V1.0/uart.jpg" width="300" /></a>
diff --git a/doc/devices/PCB-K0402WS-V3.0.md b/doc/devices/PCB-K0402WS-V3.0.md
index 0da0f0d5..6246a910 100644
--- a/doc/devices/PCB-K0402WS-V3.0.md
+++ b/doc/devices/PCB-K0402WS-V3.0.md
@@ -19,9 +19,14 @@ of the device just above the big label, might be covered by a QC sticker.
 
 <img src="photos/PCB-K0402WS-V3.0/Ztyuav_Z-QWYT0402_label.jpg" width="300" />
 
-* Siscolink SL-G0402F
+* SICSOLINK SL-G0402F
+
+<img src="photos/PCB-K0402WS-V3.0/SICSOLINK SL-G0402F.jpg" width="300"/>
+
+* YuanLey YS25-0402 <sup><sub>Note: there are [multiple revisions](PCB-K0402WS-V1.0.md) of the YS25-0402. This is the newer revision that has a "Vlan" switch on the front.</sub></sup>
+
+<img src="photos/PCB-K0402WS-V3.0/YuanLey_YS25-0402.jpg" width="300"/>
 
-<img src="photos/PCB-K0402WS-V3.0/Siscolink SL-G0402F.jpg" width="300"/>
 ### Programming
 
 Using SPI clamp in-board is the only method for initial installation.
@@ -43,7 +48,7 @@ For the initial flash (at least with flashrom), the bin file produced by the bui
 ### PCB overview
 
 **Board markings**  
-- Top silkscreen: PCB-KO4022W-V3.0 / DIP-KO4022WS-V3.0  
+- Top silkscreen: PCB-K0402W-V3.0 / DIP-K0402WS-V3.0  
 
 Top side
 
diff --git a/doc/devices/SIRIVISION_S25G2206FP_V1_1.md b/doc/devices/SIRIVISION_S25G2206FP_V1_1.md
new file mode 100644
index 00000000..529ac1fc
--- /dev/null
+++ b/doc/devices/SIRIVISION_S25G2206FP_V1_1.md
@@ -0,0 +1,32 @@
+### SIRIVISION_S25G2206FP_V1_1
+
+## Brands
+|Brand|Type|Managed|PCB|Flash|Chip RTL|
+|---|---|---|---|---|---|
+| YuanLey | YS25-0402M | Yes | SIRIVISION_S25G2206FP_V1_1 | 2M | 8372 |
+
+### Label specifications
+
+- **Name**:
+- **Ports**:
+  - 4 × RJ45: 10/100/1000/2500 Mbps
+  - 2 × SFP+: 1000 / 2500 / 10000 Mbps
+- **Power**: 12V DC, 1A  5525 connector
+
+### What works
+The device is fully supported:
+- ALL 2.5GBASE-T RJ45 ports work at 10/100/1000/2500 Mbps
+- ALL SFP+ ports support 1G, 2.5G and 10G modules
+- LEDs work with the same indiciations as the OEM firmware
+### PCB overview
+
+**Board markings**
+- Top silkscreen: SIRIVISION S25G2206FP V1.1
+
+Top side
+
+<img src="photos/SIRIVISION_S25G2206FP_V1_1/dev_pcb_top.jpg" width="300" />
+
+## Power supply
+
+Input power is delivered via barell plug, `12V 1A` adapter was provided.
diff --git a/doc/devices/SWTG018AS_A_V2_0.md b/doc/devices/SWTG018AS_A_V2_0.md
index a6f8a895..28447b85 100644
--- a/doc/devices/SWTG018AS_A_V2_0.md
+++ b/doc/devices/SWTG018AS_A_V2_0.md
@@ -4,7 +4,8 @@
 |---------|------------------|-------|------------------|-----------------|---------------|
 | Ampcom  | SWTG018AS-A V2.0 | No    | SWTG018AS-A V2.0 | 2MB             | 8273N + 8224N |
 | Horaco  | HC-SWTGW218AS-A  | Yes   | SWTG018AS-A V2.0 | 2MB(25Q16JVSIQ) | 8273N + 8224N |
-| GoodTop | GT-ST018M        | Yes   | SWTG018AS-A V2.0 | ?               | 8273N + 8224N |
+| GoodTop | GT-ST018M        | Yes   | SWTG018AS-A V2.0 | 2MB             | 8273N + 8224N |
+| MokerLink | 2G08110GSN     | No    | SWTG018AS-A V2.0 | 512KB(25Q40)    | 8273N + 8224N |
 
 
 The following is a documentation for the unmanaged switch marked as `SWTG018AS-A V2.0`.
@@ -14,7 +15,7 @@ The original software is running UART on 9600 baud rate.
 
 Using a SOIC clamp in-board is the only method for initial installation.
 
-The board has a single flash chips `BS` with 4M-bit size. The front switch, switches between the two flash chips.
+The board has a single flash chips `BS` with 2M-byte size. The front switch, switches between the two flash chips.
 These can be programed independently by using said switch - so it is e.g. possible to run the original and new firmware in parallel.
 
 ### Label specifications
diff --git a/doc/devices/SWTG024AS-A-V2.0.1_4C_2SFP.md b/doc/devices/SWTG024AS-A-V2.0.1_4C_2SFP.md
index f1fcc535..ddb3b1fc 100644
--- a/doc/devices/SWTG024AS-A-V2.0.1_4C_2SFP.md
+++ b/doc/devices/SWTG024AS-A-V2.0.1_4C_2SFP.md
@@ -2,9 +2,11 @@
 It is highly similar to SWTG024AS-V2.0, with the only difference being the GPIO configuration for the SFP port.
 
 ## Brands
-|Brand|Type|Managed|PCB|Flash|Chip RTL|
-|---|---|---|---|---|---|
-| Horaco | ZX-SG4T2 |  | PCB-SWTG024AS-A-V2.0.1_19650 | P25D40SH | ??? |
+|Brand    |Type          |Managed|PCB                           |Flash           |Chip RTL|
+|---------|--------------|-------|------------------------------|----------------|--------|
+| Horaco  | ZX-SG4T2     | No    | PCB-SWTG024AS-A-V2.0.1_19650 | 512K (P25D40SH)| 8372N  |
+| Horaco  | HC-SWTG124AS | Yes   | PCB-SWTG024AS-A-V2.0.1       | 2M   (W25Q16JV)| 8372N  |
+| GoodTop | GT-ST024M    | Yes   | PCB-SWTG024AS-A-V2.0.1       | 2M             | 8372N  |
 
 ### Label specifications
 
diff --git a/doc/devices/SWTG024AS-V2.0.md b/doc/devices/SWTG024AS-V2.0.md
index c787428b..69724577 100644
--- a/doc/devices/SWTG024AS-V2.0.md
+++ b/doc/devices/SWTG024AS-V2.0.md
@@ -46,4 +46,4 @@ Note,`R52`、`R53`may not be installed.You need to bridge them using either sold
 
 ## Power supply
 
-Input power is delivered via barell plug, `12V 1A` adapter was provided.
\ No newline at end of file
+Input power is delivered via barell plug, `12V 1A` adapter was provided.
diff --git a/doc/devices/SWTGW215AS.md b/doc/devices/SWTGW215AS.md
index 0f986986..6bfdaadc 100644
--- a/doc/devices/SWTGW215AS.md
+++ b/doc/devices/SWTGW215AS.md
@@ -9,7 +9,7 @@
 
 ## RTLPlayground target
 
-Use machine target `MACHINE_LIANGUO_ZX_SWTGW215AS` for this device.
+Build for this device with `make MACHINE=LIANGUO_ZX_SWTGW215AS`, which selects the `machine/LIANGUO_ZX_SWTGW215AS.c` board definition.
 
 Physical hardware verification: 5x RJ45 ports + 1x SFP port. 
 Port 5 RJ45 is interfaced through a RTL8221B IC.
diff --git a/doc/devices/SWTGW218AS.md b/doc/devices/SWTGW218AS.md
index 4797125b..485584f9 100644
--- a/doc/devices/SWTGW218AS.md
+++ b/doc/devices/SWTGW218AS.md
@@ -5,9 +5,15 @@
 |---|---|---|---|---|---|
 | Mokerlink | ZX-SWTGW218AS | Yes|  SWTG118AS-V2.0-16029 | 2MB (FM25Q16A)| 8273N + 8224N |
 | Sodola | | | | | |
-| Horaco | | | | | |
+| Horaco | HC-SWTGW218AS | Yes | SWTG118AS-V2.1 | 2MB | 8373 (non-N) |
 | XikeStor | SKS3200-8E1X | Yes | SWTG118AS-V2.1-17462 | 2MB (25Q16JVSIQ) | |
 
+All boards in this table use `MACHINE=SWTGW218AS`. The Horaco HC-SWTGW218AS is also sold with the
+[SWTG018AS-A V2.0](SWTG018AS_A_V2_0.md) board, which needs a different firmware. Check the marking
+on the PCB before flashing.
+
+The PHY and flash-chip models for the tested Horaco units remain unverified.
+
 
 ## Photos
 
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/assembled-bottom.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-bottom.jpg
new file mode 100644
index 00000000..8108ce66
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-bottom.jpg differ
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/assembled-front.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-front.jpg
new file mode 100644
index 00000000..2cb1782b
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-front.jpg differ
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/assembled-top.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-top.jpg
new file mode 100644
index 00000000..e3ea7733
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/assembled-top.jpg differ
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/flash_t25s40.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/flash_t25s40.jpg
new file mode 100644
index 00000000..a1af18ac
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/flash_t25s40.jpg differ
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/pcb_bottom.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/pcb_bottom.jpg
new file mode 100644
index 00000000..0c8cbabb
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/pcb_bottom.jpg differ
diff --git a/doc/devices/photos/2G5F4_10G2_V1.01/pcb_top.jpg b/doc/devices/photos/2G5F4_10G2_V1.01/pcb_top.jpg
new file mode 100644
index 00000000..421462a2
Binary files /dev/null and b/doc/devices/photos/2G5F4_10G2_V1.01/pcb_top.jpg differ
diff --git a/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/front.jpg b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/front.jpg
new file mode 100644
index 00000000..e2836b96
Binary files /dev/null and b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/front.jpg differ
diff --git a/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_bottom.jpg b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_bottom.jpg
new file mode 100644
index 00000000..3d2a6f6c
Binary files /dev/null and b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_bottom.jpg differ
diff --git a/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_top.jpg b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_top.jpg
new file mode 100644
index 00000000..06d972cd
Binary files /dev/null and b/doc/devices/photos/Hasivo-S1100P-8GT-1SX-S/pcb_top.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/bottom.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/bottom.jpg
new file mode 100644
index 00000000..3c5d2440
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/bottom.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/flash.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/flash.jpg
new file mode 100644
index 00000000..7781f009
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/flash.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/pcb-bottom.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/pcb-bottom.jpg
new file mode 100644
index 00000000..43d13a7e
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/pcb-bottom.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/pcb-top.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/pcb-top.jpg
new file mode 100644
index 00000000..0ca412d7
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/pcb-top.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/ports.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/ports.jpg
new file mode 100644
index 00000000..c6bded40
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/ports.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V1.0/uart.jpg b/doc/devices/photos/PCB-K0402WS-V1.0/uart.jpg
new file mode 100644
index 00000000..b76602a5
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V1.0/uart.jpg differ
diff --git a/doc/devices/photos/PCB-K0402WS-V3.0/Siscolink SL-G0402F.jpg b/doc/devices/photos/PCB-K0402WS-V3.0/SICSOLINK SL-G0402F.jpg
similarity index 100%
rename from doc/devices/photos/PCB-K0402WS-V3.0/Siscolink SL-G0402F.jpg
rename to doc/devices/photos/PCB-K0402WS-V3.0/SICSOLINK SL-G0402F.jpg
diff --git a/doc/devices/photos/PCB-K0402WS-V3.0/YuanLey_YS25-0402.jpg b/doc/devices/photos/PCB-K0402WS-V3.0/YuanLey_YS25-0402.jpg
new file mode 100644
index 00000000..bb403cce
Binary files /dev/null and b/doc/devices/photos/PCB-K0402WS-V3.0/YuanLey_YS25-0402.jpg differ
diff --git a/doc/devices/photos/SIRIVISION_S25G2206FP_V1_1/dev_pcb_top.jpg b/doc/devices/photos/SIRIVISION_S25G2206FP_V1_1/dev_pcb_top.jpg
new file mode 100644
index 00000000..dfa6ec8f
Binary files /dev/null and b/doc/devices/photos/SIRIVISION_S25G2206FP_V1_1/dev_pcb_top.jpg differ
diff --git a/doc/igmp.md b/doc/igmp.md
index 1584287f..b1aeda67 100644
--- a/doc/igmp.md
+++ b/doc/igmp.md
@@ -73,7 +73,8 @@ uint8_t igmp_packet_handler(void) __banked;
 void igmp_show(void) __banked;
 ```c
 `igmp_setup()` is called at boot-time and configures flooding of all IP-MC packets by
-default, as otherwise no IP-MC would be possible in the network.
+default, as otherwise no IP-MC would be possible in the network. `igmp off` calls it as
+well; groups learned while IGMP was on stay in the table, but are no longer looked up.
 
 `igmp_enable()`starts IGMP which cause IGMP packets to be handled by the CPU and forwarding
 of IP-MC packets to be limited to only subscribed ports.
@@ -85,6 +86,9 @@ for frames to 01:00:5e:xx:xx:xx and returns 0 when the frame is not a trapped IG
 so that it is passed on to the IP stack. IGMPv1/v2 reports (0x12, 0x16) join the group given
 in the IGMP header, IGMPv2 leaves (0x17) leave it, IGMPv3 reports use the first group record
 (type 4 joins, type 3 leaves). Trapped IGMP frames arrive without a VLAN tag.
+Reports for groups in 224.0.0.0/24 are ignored: the switch floods that block
+even with IGMP on, and an entry for a group such as 224.0.0.251 (mDNS) would
+otherwise limit it to the ports that reported it, as RFC 4541 warns against.
 
 `igmp_show()` prints out the IGMP configuration on the CLI.
 
diff --git a/doc/l2.md b/doc/l2.md
index 0a785a8f..ccf891cf 100644
--- a/doc/l2.md
+++ b/doc/l2.md
@@ -73,13 +73,14 @@ without being flooded to the other ports. No bridge relays these frames:
 their addresses are in the set that 802.1D-2004 clause 7.12.6 forbids a
 bridge to forward, and what travels the network is the information, with
 every bridge regenerating BPDUs of its own on its designated ports. The reserved-multicast *trap* action
-cannot do that on this hardware, because its destination is an external CPU
-attached to a physical port, which these boards do not populate. The protocol
-modules therefore leave the reserved-multicast action at *forward* and constrain
-the egress with a static L2 multicast entry instead: the lookup hits the entry's
-own port mask rather than the VLAN flood mask. Verified on a SWTGW218AS both
-ways, with the CPU bit cleared, where delivery stops, and with the CPU bit alone,
-where nothing egresses.
+does that: it delivers to the port named in `EXT_CPU_CTRL` (0x6724), which
+`trap_init()` sets to 9, the CPU port, at startup; with the reset value 0xf it
+names no port and the trapped frame is dropped. STP traps its address while it
+runs (see stp.md). Where the action is left at *forward*, the egress can be
+constrained with a static L2 multicast entry instead: the lookup hits the
+entry's own port mask rather than the VLAN flood mask. Verified on a SWTGW218AS
+both ways, with the CPU bit cleared, where delivery stops, and with the CPU bit
+alone, where nothing egresses.
 
 `port_l2mc_set()` writes one such entry. The SMI layout is the L2 multicast
 variant of the table entry:
diff --git a/doc/lacp.md b/doc/lacp.md
new file mode 100644
index 00000000..b116ef9a
--- /dev/null
+++ b/doc/lacp.md
@@ -0,0 +1,155 @@
+# LACP (Link Aggregation Control Protocol, IEEE 802.3ad)
+
+A static link aggregation group works only if both ends are configured for the
+same links, and nothing checks that they are. LACP lets the two ends agree on
+which links reach the same partner, aggregates only those, and takes a link out
+of the group when the partner stops answering.
+
+The switch runs LACP in software on the 8051. LACP frames belong to the Slow
+Protocols, with destination `01:80:C2:00:00:02` and ethertype `0x8809`; the
+subtype of LACP frames is 1. The implementation has the Receive, Selection and
+Mux machines of 802.3ad clause 43 and does not aggregate links whose partners
+differ. Up to `LACP_NUM_LAGS` (4) groups can run LACP; the others stay static.
+
+## Getting the frames to the CPU
+
+While LACP runs, the reserved multicast action for `01:80:C2:00:00:02` is
+*trap*, the same mechanism STP uses for its BPDUs, see [stp.md](stp.md). A
+trapped LACPDU has no VLAN tag after the RTL tag, and `TRAP_RX_BODY()` gives the
+offset of the LACPDU in the received frame. When the last group leaves LACP,
+the action goes back to *drop*.
+
+## What has to match across the members
+
+802.3ad requires that every link in an aggregate be full duplex and run at the
+same speed. Beyond the standard, anything that changes how a frame is treated
+has to be identical across members, because the hash picks the member per frame
+and a difference would make the behaviour depend on that choice:
+
+* must match: speed and duplex, VLAN membership and pvid, ingress filtering,
+  port isolation
+* may differ: EEE, LED configuration, counters, cable diagnostics
+
+None of this is enforced yet — `port_lag_members_set()` writes a member mask and
+a hash setting and validates nothing. See #377 for the discussion of whether a
+mismatch should be rejected or applied to the whole group.
+
+## Protocol timing
+
+The timer values are in units of the LACP timer, which steps every four ticks
+of the system clock, 50 times per second:
+
+| Constant             | Value | Time |
+|----------------------|-------|------|
+| `LACP_FAST_PERIODIC` | 50    | 1 s  |
+| `LACP_SLOW_PERIODIC` | 1500  | 30 s |
+| `LACP_SHORT_TIMEOUT` | 200   | 4 s  |
+
+802.3ad specifies a fast periodic time of 1 s with a short timeout of 3 s, and a
+slow periodic time of 30 s with a long timeout of 90 s. The switch transmits at
+the rate the partner asks for with its TIMEOUT bit. Its own timeout is always
+the short one, one second above the standard, so a partner that stops sending
+while its link stays up leaves the trunk after 4 s.
+
+The Partner block of a transmitted LACPDU repeats the partner's actor
+information as it was last received: system priority, system, key, port
+priority, port and state. A Linux partner sets our SYNC only when this block
+matches what it sent.
+
+## LACP API
+
+```
+void lacp_init(void) __banked;
+void lacp_off(void) __banked;
+void lacp_lag_set(uint8_t lag, __xdata uint16_t ports) __banked;
+void lacp_in(void) __banked;
+void lacp_timers(void) __banked;
+void lacp_show(void) __banked;
+```
+
+`lacp_init()` has to run before the startup configuration replays, because xdata
+is not zeroed and the port-to-LAG map uses `0xff` as "no LAG"; a stray zero would
+make a port look like it belongs to LAG 0.
+
+## LACP configuration on the serial console
+
+A group is put under LACP by adding `lacp` to the `lag` command:
+
+```
+lag 1 lacp 7 8      # ports 7 and 8 become LACP candidates of group 1
+lag 1 lacp off      # group 1 leaves LACP, its trunk is cleared (so does "lag 1 lacp")
+lag 1 d             # group 1 disabled, whether it ran LACP or not
+lag 1 7 8           # plain static aggregation, no protocol
+```
+
+A group put under LACP gives up the static trunk it had: the hardware trunk is
+cleared and rebuilt from the ports that converge. The other way round, `lag 1 d`
+and a static member list take the group out of LACP before they touch the
+trunk. A port named in another LACP group moves to the new one. The protocol
+starts with the first group put under LACP and stops when the last one is taken
+out; there is no separate switch for it. Two commands act on the whole engine:
+
+```
+lacp off            # every group leaves LACP, protocol stopped
+lacp show
+```
+
+`lacp show` prints the engine state, then one line per group with its candidate
+ports, the elected aggregator and the trunk members actually programmed into the
+hardware, then one line per port with the actor and partner state bytes and the
+receive-machine state.
+
+## LACP configuration via the Web Interface
+
+Each group on the LAG page has a Static/LACP mode next to its member ports;
+for an LACP group it shows the elected aggregator and the active members. Below
+the groups a table has one row per LACP port with its group, actor and partner
+state, receive state, LACPDU count and partner system. The page reads
+`/lacp.json` every three seconds while it is open. The member checkboxes of a
+static group come from the hardware registers in `/lag.json`.
+
+## A test with a Linux 802.3ad bond
+
+Two ports of the switch to two interfaces of one host:
+
+```
+ip link add bond0 type bond mode 802.3ad
+ip link set enp1s0 down && ip link set enp1s0 master bond0
+ip link set enp2s0 down && ip link set enp2s0 master bond0
+ip link set bond0 up
+```
+
+On the switch, with those two ports as the group:
+
+```
+lag 1 lacp 7 8
+```
+
+`lacp show` should then give both ports an actor state of `0x3f` (ACTIVITY,
+TIMEOUT, AGGREGATION, SYNC, COLLECTING and DISTRIBUTING), a partner state with
+SYNC set, and the partner's system MAC. `lag show` lists the trunk members as
+programmed in the hardware and should show both ports.
+
+On the host, `/proc/net/bonding/bond0` should show the same `Aggregator ID` for
+both slaves; different IDs mean that each link is in a group of its own. Both
+churn states should read `none`.
+
+Further checks:
+
+* `tcpdump -i enp1s0 ether proto 0x8809` on each slave shows the LACPDUs of the
+  switch and of that slave, never those of the other slave.
+* The host log has no `illegal loopback`.
+* The three reserved bytes after the actor state in a LACPDU from the switch
+  are zero.
+
+When one slave goes down, the group narrows to the remaining member, and the
+slave rejoins after it comes back.
+
+## Known limits
+
+* No Churn Detection machines and no Marker protocol.
+* Coupled Mux: collecting and distributing are enabled together.
+* One aggregator per group.
+* Selection compares the partner's system only, not its key: two aggregates
+  that one partner system offers on the same group land in one trunk here.
+* Member compatibility is not validated; see #377.
diff --git a/doc/link_aggregation.md b/doc/link_aggregation.md
index b725e419..90fc7637 100644
--- a/doc/link_aggregation.md
+++ b/doc/link_aggregation.md
@@ -227,3 +227,7 @@ iperf Done.
 ```
 As you can see, the total throughput was 4.71 GBit/sec which is close to the
 maximum possible with a single 5GBit link.
+
+## LACP
+
+Dynamic aggregation with LACP is described in [lacp.md](lacp.md).
diff --git a/doc/stp.md b/doc/stp.md
index 8b6780c5..96368535 100644
--- a/doc/stp.md
+++ b/doc/stp.md
@@ -35,28 +35,34 @@ BPDUs are addressed to `01:80:C2:00:00:00`, a reserved link-local group. The
 ASIC's Reserved-Multicast action for that address decides what happens to the
 frame.
 
-Forwarding to the CPU port works normally: the 8051 sits behind an ordinary
-port of the internal switch and is an ordinary member of a forwarding mask.
-The *trap* action does not deliver to it. Its destination is an external CPU
-attached to a physical port (`cpuTag_externalCpuPort_set`, `EXT_CPU_CTRL` in
-the vendor SDK), which these boards do not populate. The ACL trap and
-redirect actions do not deliver to the 8051 either.
+While STP runs, the action is *trap*. A trap delivers to the port named in
+`EXT_CPU_CTRL` (0x6724), whose reset value 0xf names no port, and with that
+value the trapped frame is dropped at ingress. `trap_init()` sets it to 9, the
+port the 8051 sits behind, once at startup. The trap needs no per-VLAN L2
+entries, so it does not depend on which VLANs exist or on the PVIDs, and turning
+STP on no longer walks the whole VLAN table. BPDUs reach the CPU on a port that
+STP holds in blocking with either action: measured on a SWTGW218AS by sending
+BPDUs into a blocked port with forward and with trap, both ports stopped being
+edge and waited out the forward delay. The chip exempts this address from the
+ingress state check; the slow-protocols address used by LACP is not exempt.
 
-Delivery therefore uses the *forward* action, constrained to the CPU port
-by a static L2 multicast entry (`port_l2mc_set()`), one per VLAN in use:
+A trapped frame reaches the CPU in the format it came in with: unlike a
+forwarded one it has no VLAN tag inserted after the RTL tag, and the RTL tag
+carries the trap reason. `stp_in()` reads the BPDU from the offset
+`TRAP_RX_BODY()` returns, which works for both.
 
-* while STP runs, the entry's member mask is the CPU port only — BPDUs reach
-  the CPU and are not flooded to other ports, as a participating bridge
-  requires;
-* with STP off, the same entries are retargeted to all ports, restoring the
-  transparency an unmanaged switch is expected to have, so a surrounding
-  spanning tree can span *through* this device.
+With STP off, the action goes back to *forward* and a static L2 multicast
+entry per VLAN in use (`port_l2mc_set()`) targets all ports, restoring the
+transparency an unmanaged switch is expected to have, so a surrounding
+spanning tree can span *through* this device.
 
-A BPDU delivered this way is an ordinary frame to the port's ingress logic
-and passes through its acceptable-frame-type filter. BPDUs are untagged, so a
-port set to admit tagged frames only (`ingress <port>t`) never delivers one
-to the CPU. `stp_setup()` prints a warning for every STP-enabled port in that
-state.
+The port's acceptable-frame-type filter treats the two actions differently.
+BPDUs are untagged, so a port set to admit tagged frames only
+(`ingress <port>t`) drops a forwarded BPDU before it reaches the CPU, while a
+trapped one passes. Both were measured on a SWTGW218AS with `ingress 3t`:
+LACPDUs, delivered by forward, stopped arriving on port 3, and BPDUs sent into
+the same port, delivered by trap, kept arriving. A port that admits tagged
+frames only therefore takes part in STP.
 
 ## Link aggregation
 
diff --git a/doc/supported_devices.md b/doc/supported_devices.md
index 52e62bcd..3d3d5ba2 100644
--- a/doc/supported_devices.md
+++ b/doc/supported_devices.md
@@ -4,44 +4,52 @@ The following devices have been tested and are fully working:
 | Brand    | Type            | Managed | PCB                                                                       | Flash | Ports |
 |----------|-----------------|---------|---------------------------------------------------------------------------|-------|-------|
 | Ampcom   | WAM902-SWTG018AS| No      | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           |       | 8 + 1 |
+| Binardat | 2G06-04210GSM   | No      | [PCB-SWTG024AS-A-2.0.1](devices/ONT-S207CW-62TS-SE.md)                    | 0.5M  | 4 + 2 |
 | Davuaz   | Da-K6501W       | No      | [PCB-K0501W-V2.0](devices/K0501W_V2_0.md)                                 |       | 5 + 1 |
 | FOXNEO   | FNS-1200P       | No      | [PCB-K0402W-U13-V2.0](devices/FNS-1200P.md)                               | 2M    | 4 + 2 |
 | Goalake  | IG108           | No      | [PB-2132](devices/PB-2132.md)                                             | 4M    | 8 + 1 |
-| GoodTop  | GT-ST018M       | Yes     | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           | ?     | 8 + 1 |
+| GoodTop  | GT-ST018M       | Yes     | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           | 2M    | 8 + 1 |
+| GoodTop  | GT-ST024M       | Yes     | [SWTG024AS-A V2.0.1](devices/SWTG024AS-A-V2.0.1_4C_2SFP.md)               | 2M    | 4 + 2 |
+| Guangnianwei | 7018-2.5G   | No      | [F7008-2.5GPOE-V1.2](devices/F7008-2.5.md)                                | 8M    | 8 + 1 |
 | Hasivo   | S1100WP_8GT_1SX_SE | Yes  | [S1100WP_8GT_1SX_SE-V1.05](devices/HASIVO_S1100WP_8GT_1SX_SE.md)          | 2M    | 8 + 1 |
-| Hisource | Hi-K0402WS      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
 | Hisource | Hi-K0402WS      | No      | [PCB-K0402WS-V2.0](devices/PCB-K0402WS-V2.0.md)                           | 2M    | 4 + 2 |
+| Hisource | Hi-K0402WS      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
 | Hisource | Hi-K0801WS      | No      | [PCB-KO801W-V2.0](devices/HI-K0801WS.md)                                  |       | 8 + 1 |
+| hongyavision | HYWS-SGT0204S | No    | [2G5F4_10G2_V1.01](devices/2G5F4_10G2_V1.01.md)                           | 0.5M  | 4 + 2 |
 | hongyavision | LG-SG5T1    | No      | [PCB-SWTG024AS-V2.0_16895](devices/SWTG024AS-V2.0.md)                     | 0.5M  | 5 + 1 |
+| Horaco   | HC-SWTG124AS    | Yes     | [SWTG024AS-A-V2.0.1](devices/SWTG024AS-A-V2.0.1_4C_2SFP.md)               | 2M    | 4 + 2 |
 | Horaco   | HC-SWTGW215AS   | Yes     | [SWTG024AS-A-V2.0.1_19650 5C 1SFP](devices/SWTG024AS-A-V2.0.1_5C_1SFP.md) | ?     | 5 + 1 |
 | Horaco   | HC-SWTGW218AS   | Yes     | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           |       | 8 + 1 |
+| Horaco   | HC-SWTGW218AS   | Yes     | [SWTG118AS-V2.1](devices/SWTGW218AS.md)                                   | 2M    | 8 + 1 |
 | Horaco   | ZX310S-4T2XH    | Yes     | [PCB-SL310S-4T1T1X-V1.0.1-24107](devices/ZX310S-4T2XH.md)                 | 2M    | 5 + 1 |
 | Horaco   | ZX310S-4T2XT    | Yes     | [PCB-SL310S-4T2XT-V1.0.0-22273](devices/ZX310S-4T2XT.md)                  | 2M    | 6     |
 | Horaco   | ZX-SG4T2        | No      | [SWTG024AS-A-V2.0.1_19650_4C_2SFP](devices/SWTG024AS-A-V2.0.1_4C_2SFP.md) | 0.5M  | 4 + 2 |
 | Horaco   | ZX-SWTG124AS    | Yes     | [SWTG024AS-v2.0](devices/SWTG024AS.md)                                    |       | 4 + 2 |
-| Keeplink | KP-9000-6XH-X2 / KP-9000-6XHML-X2 | No/Yes | [2M-PCB43-V1.2 / V2.1](devices/KP-9000-6XH-X2.md) |       | 4 + 2 |
+| keepLINK | KP-9000-6XH-X2 / KP-9000-6XHML-X2 | No/Yes | [2M-PCB43-V1.2 / V2.1](devices/KP-9000-6XH-X2.md)        |       | 4 + 2 |
 | keepLINK | KP-9000-9XHML-X | Yes     | [2M-PCB23-V2.2](devices/2M-PCB23-V2_2.md)                                 | 2M    | 8 + 1 |
 | keepLINK | KP-9000-9XHML-X | Yes     | [2M-PCB23-V3.1](devices/2M-PCB23-V3_1.md)                                 | 2M    | 8 + 1 |
 | keepLINK | KP-9000-9XHML-X | Yes     | [2M-PCB23-V3.2](devices/2M-PCB23-V3_2.md)                                 | 2M    | 8 + 1 |
+| LIANGUO  | HYWS-SGT0108S   | No      | [2G5F_20G_V1.01](devices/HYWS-SGT0108S.md)                                | 0.5M  | 8 + 1 |
 | LIANGUO  | SWTG024AS       | No      | [SWTG024AS-v2.0-17452](devices/SWTG024AS.md)                              | 0.5M  | 4 + 2 |
-| Lianguo  | ZX-SWTGW215AS   | Yes     | [PCB-SWTG115AS-V2.0 / PCB-SWTG115AS-V2.1](devices/SWTGW215AS.md)          | 2M    | 5 + 1 |
-| Lianguo  | HYWS-SGT0108S   | No      | [2G5F_20G_V1.01](devices/HYWS-SGT0108S.md)                                | 0.5M  | 8 + 1 |
-| Mokerlink| 2G040210GSM     | Yes     | [2M-PCB43-V1.1](devices/2M-PCB43-V1.1.md)                                 |       | 4 + 2 |
-| Mokerlink| ZX-SWTGW218AS   | Yes     | [SWTG118AS-V2.0-16029](devices/SWTGW218AS.md)                             | 2M    | 8 + 1 |
+| LIANGUO  | ZX-SWTGW215AS   | Yes     | [PCB-SWTG115AS-V2.0 / PCB-SWTG115AS-V2.1](devices/SWTGW215AS.md)          | 2M    | 5 + 1 |
+| MokerLink| 2G040210GSM     | Yes     | [2M-PCB43-V1.1](devices/2M-PCB43-V1.1.md)                                 |       | 4 + 2 |
 | MokerLink| POE-2G080110GS  | No      | [2M-PCB51-ML-V1.1](devices/2M-PCB51-ML-V1_1.md)                           | 4M    | 8 + 1 |
-| Binardat | 2G06-04210GSM    | No      | [PCB-SWTG024AS-A-2.0.1](devices/ONT-S207CW-62TS-SE.md)                 | 0.5M  | 4 + 2 |
-| ONT      | ONT-S207CW-62TS-SE | No   | [PCB-SWTG024AS-A-2.0.1](devices/ONT-S207CW-62TS-SE.md)                 | 0.5M  | 4 + 2 |
+| MokerLink| ZX-SWTGW218AS   | Yes     | [SWTG118AS-V2.0-16029](devices/SWTGW218AS.md)                             | 2M    | 8 + 1 |
+| MokerLink| 2G08110GSN      | No      | [SWTG018AS-A V2.0](devices/SWTG018AS_A_V2_0.md)                           | 0.5M  | 8 + 1 |
 | Netcore  | GS9             | No      | [PB-2132](devices/PB-2132.md)                                             | 4M    | 8 + 1 |
+| ONT      | ONT-S207CW-62TS-SE | No   | [PCB-SWTG024AS-A-2.0.1](devices/ONT-S207CW-62TS-SE.md)                    | 0.5M  | 4 + 2 |
 | Ruiying  | RY-4GT-2SX      | No      | [FG-4GT-2SX_V2.0](devices/FG-4GT-2SX_V2.0.md)                             | 4M    | 4 + 2 |
 | Ruiying  | RY-8GT-1SX      | No      | [FG-8GT-1SX](devices/FG-8GT-1SX.md)                                       | 1M    | 8 + 1 |
-| SiscoLink | SL-G0402F      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
+| SICSOLINK| SL-G0402F       | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
 | Sodola   | SL-SWTG124AS-D  | Yes     | [SWTG024AS-v2.0-17452](devices/SWTG024AS.md)                              | 2M    | 4 + 2 |
 | Steamemo | IG204-V1        | No      | [PB-2131](devices/STEAMEMO_IG204_V1.md)                                   |       | 4 + 2 |
-| TrendNet | TEG-S562        | No      | [TEG-S563/EU H/W: V1.0R](devices/TEG-S562.md)                             | 2M    | 4 + 2 |
-| Xikestore| SKS3200M-4GPY2XF| Yes     | [SWTG024AS-v1.0](devices/SWTG024AS.md)                                    |       | 4 + 2 |
+| TRENDnet | TEG-S562        | No      | [TEG-S563/EU H/W: V1.0R](devices/TEG-S562.md)                             | 2M    | 4 + 2 |
+| XikeStor | SKS3200M-4GPY2XF| Yes     | [SWTG024AS-v1.0](devices/SWTG024AS.md)                                    |       | 4 + 2 |
 | XikeStor | SKS3200-8E1X    | Yes     | [SWTG118AS-V2.1-17462](devices/SWTGW218AS.md)                             | 2M    | 8 + 1 |
+| YuanLey  | YS25-0402       | No      | [PCB-K0402WS-V1.0](devices/PCB-K0402WS-V1.0.md)                           | 2M    | 4 + 2 |
+| YuanLey  | YS25-0402       | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           | 2M    | 4 + 2 |
+| YuanLey | YS25-0402M       | Yes     | [SIRIVISION_S25G2206FP_V1_1](devices/SIRIVISION_S25G2206FP_V1_1.md)       | 2M    | 4 + 2 |
 | Ztyuav   | Z-QWYT0402      | No      | [PCB-K0402WS-V3.0](devices/PCB-K0402WS-V3.0.md)                           |       | 4 + 2 |
-| Guangnianwei | 7018-2.5G   | No      | [F7008-2.5GPOE-V1.2](devices/F7008-2.5.md)                                | 8M    | 8 + 1 |
 
 For KP-9000-6XH-X2 / KP-9000-6XHML-X2 / Mokerlink 2G040210GSM devices, select
 the machine target by PCB revision. The ML/non-ML or managed/unmanaged label
diff --git a/html/app.js b/html/app.js
index d737810b..1599e3f0 100644
--- a/html/app.js
+++ b/html/app.js
@@ -11,15 +11,15 @@ th_sel_light:"Selenized Light",th_sel_dark:"Selenized Dark",
 c_port:"Port",c_name:"Name",c_link:"Link",c_apply:"Apply",c_cancel:"Cancel",c_confirm:"Confirm",
 c_close:"Close",c_refresh:"Refresh",c_off:"off",c_offc:"Off",c_down:"down",c_on:"On",c_auto:"Auto",c_delete:"Delete",
 c_type:"Type",c_state:"State",c_enabled:"Enabled",c_load:"Load",c_disable:"Disable",c_sfp:"SFP",
-c_full:"full",c_half:"half",c_devices:"devices",c_yes:"yes",c_no:"no",
-d_ports:"Ports",d_ports_h:"click a port for details",d_system:"System",d_traffic:"Traffic",
+c_full:"full",c_half:"half",c_yes:"yes",c_no:"no",
+d_system:"System",d_traffic:"Traffic",
 d_traffic_h:"packets/s, live",d_txpps:"TX pps",d_rxpps:"RX pps",d_txbad:"TX bad",d_rxbad:"RX bad",
 i_host:"Hostname",i_ip:"IP address",i_mask:"Netmask",i_gw:"Gateway",i_mac:"MAC",i_fw:"Firmware",
 i_built:"Built",i_hw:"Hardware",i_temp:"Temperature",i_flash:"Flash",i_syslog:"Syslog",
 p_state:"State",p_disabled:"disabled",p_up:"up",p_txgb:"TX good / bad",p_rxgb:"RX good / bad",
 p_pkts:"pkts",p_module:"Module",p_temp:"Temperature",p_vcc:"Vcc",p_txbias:"TX bias",p_txpower:"TX power",
 p_rxpower:"RX power",p_txfault:"TX fault",p_txdis:"TX disabled",p_rxlos:"RX LOS",p_adv:"Advertising",
-pt_title:"Port configuration",pt_conn:"Connected",pt_speed:"Speed",pt_mtu:"MTU",
+pt_title:"Port configuration",pt_conn:"Devices learned",pt_speed:"Speed",pt_mtu:"MTU",
 pt_sfp_note:"SFP speed is set per slot and is not saved in the startup config.",
 pt_name_err:"Port name: 1-15 characters, no spaces",pt_mtu_err:"MTU must be 64-16383",
 stp_title:"Spanning tree",stp_h:"RSTP, 802.1w",stp_version:"Version",stp_v_stp:"STP compatible",
@@ -67,6 +67,9 @@ iso_title:"Port isolation",iso_from:"From port",iso_to:"To port",iso_all:"Allow
 iso_intro:"A frame entering a port may only leave through the ports ticked in its row. Isolation is decided before forwarding, so a port that is not ticked is unreachable directly, whatever the address table says.",
 iso_legend:"The cell of the port itself is always allowed. A port number in red marks a port that is not fully open.",
 lag_hash:"Hash:",lag_note:"A LAG needs at least one member to be saved in the startup config; applying an empty group clears it.",
+lacp_heading:"LACP (802.3ad)",lag_mode:"Mode",lag_static:"Static",lacp_neg:"negotiating",lacp_agg:"aggregator",
+lacp_members:"active members",lacp_hint:"LACP: select candidate ports and press Apply to start negotiation",
+lacp_actor:"Actor",lacp_partner:"Partner",lacp_rxstate:"RX state",lacp_rx:"LACPDUs received",lacp_psys:"Partner system",
 lag_clear_q:"Clear LAG {n}?",lag_clear_d:"All member ports return to normal operation.",
 e_title:"Energy Efficient Ethernet",e_adv:"Advertised",e_lp:"Link partner",e_active:"Active",e_enable:"Enable",
 e_note:"Advertised and link-partner flags per speed: 100M, 1G, 2.5G. SFP ports do not support EEE.",
@@ -139,15 +142,15 @@ th_sel_light:"Selenized ライト",th_sel_dark:"Selenized ダーク",
 c_port:"ポート",c_name:"名前",c_link:"リンク",c_apply:"適用",c_cancel:"キャンセル",c_confirm:"確認",
 c_close:"閉じる",c_refresh:"更新",c_off:"オフ",c_offc:"オフ",c_down:"リンクダウン",c_on:"オン",c_auto:"自動",c_delete:"削除",
 c_type:"タイプ",c_state:"状態",c_enabled:"有効",c_load:"読み込み",c_disable:"無効化",c_sfp:"SFP",
-c_full:"全二重",c_half:"半二重",c_devices:"デバイス",c_yes:"はい",c_no:"いいえ",
-d_ports:"ポート",d_ports_h:"ポートをクリックすると詳細を表示",d_system:"システム",d_traffic:"トラフィック",
+c_full:"全二重",c_half:"半二重",c_yes:"はい",c_no:"いいえ",
+d_system:"システム",d_traffic:"トラフィック",
 d_traffic_h:"パケット/秒、リアルタイム",d_txpps:"TX pps",d_rxpps:"RX pps",d_txbad:"TX 異常",d_rxbad:"RX 異常",
 i_host:"ホスト名",i_ip:"IP アドレス",i_mask:"ネットマスク",i_gw:"ゲートウェイ",i_mac:"MAC",i_fw:"ファームウェア",
 i_built:"ビルド日",i_hw:"ハードウェア",i_temp:"温度",i_flash:"フラッシュ",i_syslog:"Syslog",
 p_state:"状態",p_disabled:"無効",p_up:"アップ",p_txgb:"TX 正常 / 異常",p_rxgb:"RX 正常 / 異常",
 p_pkts:"pkts",p_module:"モジュール",p_temp:"温度",p_vcc:"電圧",p_txbias:"TX バイアス",p_txpower:"TX 電力",
 p_rxpower:"RX 電力",p_txfault:"TX 障害",p_txdis:"TX 無効",p_rxlos:"RX 信号ロス",p_adv:"アドバタイズ",
-pt_title:"ポート設定",pt_conn:"接続デバイス",pt_speed:"速度",pt_mtu:"MTU",
+pt_title:"ポート設定",pt_conn:"学習済みデバイス",pt_speed:"速度",pt_mtu:"MTU",
 pt_sfp_note:"SFP の速度はスロット単位で設定され、起動設定には保存されません。",
 pt_name_err:"ポート名: 1〜15 文字、空白不可",pt_mtu_err:"MTU は 64〜16383 の範囲で指定してください",
 stp_title:"スパニングツリー",stp_h:"RSTP, 802.1w",stp_version:"バージョン",stp_v_stp:"STP 互換",
@@ -252,15 +255,15 @@ th_sel_light:"Selenized 浅色",th_sel_dark:"Selenized 深色",
 c_port:"端口",c_name:"名称",c_link:"链路",c_apply:"应用",c_cancel:"取消",c_confirm:"确认",
 c_close:"关闭",c_refresh:"刷新",c_off:"关",c_offc:"关",c_down:"未连接",c_on:"开",c_auto:"自动",c_delete:"删除",
 c_type:"类型",c_state:"状态",c_enabled:"启用",c_load:"读取",c_disable:"禁用",c_sfp:"SFP",
-c_full:"全双工",c_half:"半双工",c_devices:"台设备",c_yes:"是",c_no:"否",
-d_ports:"端口",d_ports_h:"点击端口查看详情",d_system:"系统",d_traffic:"流量",
+c_full:"全双工",c_half:"半双工",c_yes:"是",c_no:"否",
+d_system:"系统",d_traffic:"流量",
 d_traffic_h:"包/秒，实时",d_txpps:"TX pps",d_rxpps:"RX pps",d_txbad:"TX 错误",d_rxbad:"RX 错误",
 i_host:"主机名",i_ip:"IP 地址",i_mask:"子网掩码",i_gw:"网关",i_mac:"MAC",i_fw:"固件",
 i_built:"构建日期",i_hw:"硬件",i_temp:"温度",i_flash:"Flash",i_syslog:"Syslog",
 p_state:"状态",p_disabled:"已禁用",p_up:"已连接",p_txgb:"TX 正常 / 错误",p_rxgb:"RX 正常 / 错误",
 p_pkts:"个包",p_module:"模块",p_temp:"温度",p_vcc:"供电电压",p_txbias:"TX 偏置电流",p_txpower:"TX 光功率",
 p_rxpower:"RX 光功率",p_txfault:"TX 故障",p_txdis:"TX 禁用",p_rxlos:"RX 信号丢失",p_adv:"通告能力",
-pt_title:"端口配置",pt_conn:"已连接设备",pt_speed:"速率",pt_mtu:"MTU",
+pt_title:"端口配置",pt_conn:"已学习设备",pt_speed:"速率",pt_mtu:"MTU",
 pt_sfp_note:"SFP 速率按插槽设置，不会保存到启动配置。",
 pt_name_err:"端口名称: 1-15 个字符，不能包含空格",pt_mtu_err:"MTU 范围为 64-16383",
 stp_title:"生成树",stp_h:"RSTP, 802.1w",stp_version:"版本",stp_v_stp:"STP 兼容",
@@ -365,15 +368,15 @@ th_sel_light:"Selenized claro",th_sel_dark:"Selenized oscuro",
 c_port:"Puerto",c_name:"Nombre",c_link:"Enlace",c_apply:"Aplicar",c_cancel:"Cancelar",c_confirm:"Confirmar",
 c_close:"Cerrar",c_refresh:"Actualizar",c_off:"apagado",c_offc:"Apagado",c_down:"caído",c_on:"Encendido",c_auto:"Auto",c_delete:"Eliminar",
 c_type:"Tipo",c_state:"Estado",c_enabled:"Habilitado",c_load:"Cargar",c_disable:"Deshabilitar",c_sfp:"SFP",
-c_full:"dúplex completo",c_half:"semidúplex",c_devices:"dispositivos",c_yes:"sí",c_no:"no",
-d_ports:"Puertos",d_ports_h:"pulsa un puerto para ver detalles",d_system:"Sistema",d_traffic:"Tráfico",
+c_full:"dúplex completo",c_half:"semidúplex",c_yes:"sí",c_no:"no",
+d_system:"Sistema",d_traffic:"Tráfico",
 d_traffic_h:"paquetes/s, en vivo",d_txpps:"TX pps",d_rxpps:"RX pps",d_txbad:"TX erróneos",d_rxbad:"RX erróneos",
 i_host:"Nombre de host",i_ip:"Dirección IP",i_mask:"Máscara de red",i_gw:"Puerta de enlace",i_mac:"MAC",i_fw:"Firmware",
 i_built:"Compilado",i_hw:"Hardware",i_flash:"Flash",i_syslog:"Syslog",
 p_state:"Estado",p_disabled:"deshabilitado",p_up:"activo",p_txgb:"TX correctos / erróneos",p_rxgb:"RX correctos / erróneos",
 p_pkts:"paquetes",p_module:"Módulo",p_temp:"Temperatura",p_vcc:"Vcc",p_txbias:"Polarización TX",p_txpower:"Potencia TX",
 p_rxpower:"Potencia RX",p_txfault:"Fallo TX",p_txdis:"TX deshabilitado",p_rxlos:"Pérdida RX (LOS)",p_adv:"Anunciado",
-pt_title:"Configuración de puerto",pt_conn:"Conectado",pt_speed:"Velocidad",pt_mtu:"MTU",
+pt_title:"Configuración de puerto",pt_conn:"Dispositivos aprendidos",pt_speed:"Velocidad",pt_mtu:"MTU",
 pt_sfp_note:"La velocidad del SFP se ajusta por ranura y no se guarda en la configuración de inicio.",
 pt_name_err:"Nombre de puerto: 1-15 caracteres, sin espacios",pt_mtu_err:"El MTU debe estar entre 64 y 16383",
 stp_title:"Árbol de expansión",stp_h:"RSTP, 802.1w",stp_version:"Versión",stp_v_stp:"STP compatible",
@@ -477,15 +480,15 @@ th_sel_light:"Clair (sélénisé)",th_sel_dark:"Sombre (sélénisé)",
 c_port:"Port",c_name:"Nom",c_link:"Lien",c_apply:"Appliquer",c_cancel:"Annuler",c_confirm:"Confirmer",
 c_close:"Fermer",c_refresh:"Raffraichir",c_off:"arrêt",c_offc:"Arrêt",c_down:"arrêt",c_on:"Marche",c_auto:"Auto",c_delete:"Supprimer",
 c_type:"Type",c_state:"Etat",c_enabled:"Activé",c_load:"Charger",c_disable:"Désactivé",c_sfp:"SFP",
-c_full:"full",c_half:"half",c_devices:"Equipements",c_yes:"oui",c_no:"non",
-d_ports:"Ports",d_ports_h:"Cliquez ou survollez pour plus de détails",d_system:"Système",d_traffic:"Trafic",
+c_full:"full",c_half:"half",c_yes:"oui",c_no:"non",
+d_system:"Système",d_traffic:"Trafic",
 d_traffic_h:"paquets/s (en direct)",d_txpps:"TX pps",d_rxpps:"RX pps",d_txbad:"TX KO",d_rxbad:"RX KO",
 i_host:"Nom d'hote",i_ip:"Adresse IP",i_mask:"Masque réseau",i_gw:"Passerelle",i_mac:"Adresse MAC",i_fw:"Micro logiciel",
 i_built:"Compilé le",i_hw:"Matériel",i_temp:"Température",i_flash:"Taille Flash",i_syslog:"Journal système",
 p_state:"Etat",p_disabled:"Inactif",p_up:"Actif",p_txgb:"TX bon / mauvais",p_rxgb:"RX bon / mauvais",
 p_pkts:"paquets",p_module:"Module",p_temp:"Température",p_vcc:"Vcc",p_txbias:"TX biais",p_txpower:"TX puissance",
 p_rxpower:"RX puissance",p_txfault:"TX erreur",p_txdis:"TX désactivé",p_rxlos:"RX pertes de signaux",p_adv:"Capacités",
-pt_title:"Configuration du port",pt_conn:"Connecté à",pt_speed:"Vitesse",pt_mtu:"MTU",
+pt_title:"Configuration du port",pt_conn:"Appareils appris",pt_speed:"Vitesse",pt_mtu:"MTU",
 pt_sfp_note:"La vitesse SFP est paramétrée pour le port et n'est pas enregistrée dans la configuration de démarrage.",
 pt_name_err:"Nom du port: 1 à 15 caractères, sans espaces",pt_mtu_err:"MTU doit être comrpis entre 64 et 16383",
 stp_title:"Arborescence",stp_h:"RSTP, 802.1w",stp_version:"Protocole",stp_v_stp:"Compatible STP",
@@ -585,7 +588,7 @@ fw_timeout:"Le commutateur n'est plus joignable depuis 150 s: verifiez l'aliment
 },
 de:{
 nav_dash:"Übersicht",nav_ports:"Ports",nav_stp:"Spanning Tree",nav_stats:"Statistik",
-nav_vlan:"VLANs",nav_l2:"MAC-Tabelle",nav_mirror:"Spiegelung",nav_lag:"LAG",nav_eee:"EEE",
+nav_vlan:"VLANs",nav_l2:"MAC-Tabelle",nav_mirror:"Spiegelung",nav_isolate:"Isolation",nav_lag:"LAG",nav_eee:"EEE",
 nav_bw:"Bandbreite",nav_system:"System",nav_fw:"Firmware",
 hdr_dirty:"ungespeicherte Änderungen",hdr_dirty_t:"Laufende Konfiguration weicht von der Startkonfiguration ab",
 hdr_save:"Im Flash speichern",hdr_save_t:"Laufende Konfiguration dauerhaft im Flash speichern",
@@ -594,15 +597,15 @@ th_sel_light:"Selenized Hell",th_sel_dark:"Selenized Dunkel",
 c_port:"Port",c_name:"Name",c_link:"Link",c_apply:"Übernehmen",c_cancel:"Abbrechen",c_confirm:"Bestätigen",
 c_close:"Schliessen",c_refresh:"Aktualisieren",c_off:"aus",c_offc:"Aus",c_down:"getrennt",c_on:"Ein",c_auto:"Auto",c_delete:"Löschen",
 c_type:"Typ",c_state:"Zustand",c_enabled:"Aktiviert",c_load:"Laden",c_disable:"Deaktivieren",c_sfp:"SFP",
-c_full:"voll",c_half:"halb",c_devices:"Geräte",c_yes:"ja",c_no:"nein",
-d_ports:"Ports",d_ports_h:"Port anklicken für Details",d_system:"System",d_traffic:"Datenverkehr",
+c_full:"voll",c_half:"halb",c_yes:"ja",c_no:"nein",
+d_system:"System",d_traffic:"Datenverkehr",
 d_traffic_h:"Pakete/s, live",d_txpps:"TX Pakete/s",d_rxpps:"RX Pakete/s",d_txbad:"TX fehlerhaft",d_rxbad:"RX fehlerhaft",
 i_host:"Hostname",i_ip:"IP-Adresse",i_mask:"Netzmaske",i_gw:"Gateway",i_mac:"MAC",i_fw:"Firmware",
 i_built:"Erstellt",i_hw:"Hardware",i_temp:"Temperatur",i_flash:"Flash",i_syslog:"Syslog",
 p_state:"Zustand",p_disabled:"deaktiviert",p_up:"verbunden",p_txgb:"TX gut / fehlerhaft",p_rxgb:"RX gut / fehlerhaft",
 p_pkts:"Pakete",p_module:"Modul",p_temp:"Temperatur",p_vcc:"Vcc",p_txbias:"TX-Bias",p_txpower:"Sendeleistung",
 p_rxpower:"Empfangsleistung",p_txfault:"TX-Fehler",p_txdis:"TX deaktiviert",p_rxlos:"RX LOS",p_adv:"Angeboten",
-pt_title:"Port-Konfiguration",pt_conn:"Verbunden",pt_speed:"Geschwindigkeit",pt_mtu:"MTU",
+pt_title:"Port-Konfiguration",pt_conn:"Gelernte Geräte",pt_speed:"Geschwindigkeit",pt_mtu:"MTU",
 pt_sfp_note:"Die SFP-Geschwindigkeit wird pro Steckplatz gesetzt und nicht in der Startkonfiguration gespeichert.",
 pt_name_err:"Port-Name: 1-15 Zeichen, keine Leerzeichen",pt_mtu_err:"MTU muss zwischen 64 und 16383 liegen",
 stp_title:"Spanning Tree",stp_h:"RSTP, 802.1w",stp_version:"Version",stp_v_stp:"STP-kompatibel",
@@ -623,6 +626,7 @@ stp_en_q:"Spanning Tree aktivieren?",
 stp_en_d:"Die Ports starten blockiert und brauchen bis zum doppelten Forward Delay, bis sie weiterleiten; Edge-Ports sind sofort wieder aktiv.",
 stp_dis_q:"Spanning Tree deaktivieren?",stp_dis_d:"Alle Ports leiten sofort weiter; der Schutz vor Netzwerkschleifen entfällt.",
 stp_cost_err:"Pfadkosten müssen zwischen 0 und 200000000 liegen",
+nav_lldp:"LLDP",lldp_enabled:"LLDP aktiv",lldp_title:"Dienststatus",lldp_portname:"Name",lldp_enable:"Pakete senden",
 st_title:"Port-Statistik",st_h:"Summen seit dem Start",st_txg:"TX gut",st_txb:"TX fehlerhaft",st_rxg:"RX gut",
 st_rxb:"RX fehlerhaft",st_details:"Details",st_counters:"MIB-Zähler",st_nonzero:"nur ungleich null",
 st_autoref:"automatisch aktualisieren",st_counter:"Zähler",st_value:"Wert",st_fail:"Zähler konnten nicht geladen werden",
@@ -645,8 +649,12 @@ l2_learned:"gelernt",l2_loading:"lädt...",l2_failed:"Laden fehlgeschlagen",l2_e
 l2_del_t:"Eintrag löschen",l2_flush_q:"Alle gelernten MAC-Einträge löschen?",
 m_title:"Port-Spiegelung",m_active:"aktiv",m_monitor:"Monitor-Port",m_mirror:"Spiegeln",m_both:"Beide",
 m_note:"Beide = RX und TX des Ports auf den Monitor-Port spiegeln.",m_none:"Mindestens einen zu spiegelnden Port wählen",
+iso_title:"Port-Isolation",iso_from:"Von Port",iso_to:"Zu Port",iso_all:"Alle erlauben",
+iso_intro:"Ein Paket, das über einen Port hereinkommt, darf den Switch nur über die Ports verlassen, die in seiner Zeile angehakt sind. Die Isolation wirkt vor der Weiterleitung: Ein nicht angehakter Port ist direkt nicht erreichbar, egal was in der MAC-Tabelle steht.",
+iso_legend:"Das Feld des Ports selbst ist immer erlaubt. Eine rote Portnummer markiert einen Port, der nicht ganz offen ist.",
 lag_hash:"Hash:",lag_note:"Eine LAG braucht mindestens ein Mitglied, um in der Startkonfiguration gespeichert zu werden; eine leere Gruppe zu übernehmen löscht sie.",
 lag_clear_q:"LAG {n} auflösen?",lag_clear_d:"Alle Mitglieds-Ports kehren in den Normalbetrieb zurück.",
+lacp_heading:"LACP (802.3ad)",lag_mode:"Modus",lag_static:"Statisch",lacp_neg:"wird ausgehandelt",lacp_agg:"Aggregator",lacp_members:"aktive Mitglieder",lacp_hint:"LACP: Ports auswählen und Übernehmen drücken, um die Aushandlung zu starten",lacp_actor:"Lokal",lacp_partner:"Partner",lacp_rxstate:"Empfangsstatus",lacp_rx:"Empfangene LACPDUs",lacp_psys:"Partner-System",
 e_title:"Energy Efficient Ethernet",e_adv:"Angeboten",e_lp:"Gegenstelle",e_active:"Aktiv",e_enable:"Aktivieren",
 e_note:"Angebotene und von der Gegenstelle unterstützte Stufen je Geschwindigkeit: 100M, 1G, 2.5G. SFP-Ports unterstützen kein EEE.",
 e_idle:"inaktiv",e_na:"k. A.",
@@ -669,7 +677,8 @@ sy_ip_err:"Ungültige IP / Netzmaske / Gateway",sy_host_err:"Hostname: 1-23 druc
 sy_net_q:"Netzwerkeinstellungen übernehmen?",sy_net_d:"Die Management-IP ändert sich auf {ip}: Diese Seite muss dort neu geöffnet werden.",
 sy_ip_changed:"IP geändert, neu verbinden unter http://{ip}/",sy_dhcp_q:"Auf DHCP umstellen?",
 sy_dhcp_d:"Der Switch bezieht seine Adresse per DHCP. Du musst seine neue IP herausfinden, um dich wieder zu verbinden.",
-sy_sysip_err:"Ungültige IP des Syslog-Servers",sy_sysport_err:"Syslog-Port muss zwischen 1 und 65535 liegen",
+sy_sysip_err:"Ungültige IP des Syslog-Servers",sy_dns1:"DNS-Server",sy_dns2:"Zweiter DNS-Server",sy_dns_err:"Ungültige IP des DNS-Servers",sy_dns_dhcp:"von DHCP: {ip}",sy_sysport_err:"Syslog-Port muss zwischen 1 und 65535 liegen",
+sy_time:"Uhrzeit",sy_ntp:"NTP",sy_ntpsrv:"NTP-Server",sy_ntpsrv_p:"Hostname oder IPv4-Adresse",sy_ntpint:"Abfrageintervall [min]",sy_tz:"Zeitzone",sy_dst:"Sommerzeit",sy_dst_eu:"Europa",sy_dst_us:"USA",sy_now:"Lokale Zeit",sy_sync:"Letzte Synchronisation",sy_ntpaddr:"Server-Adresse",sy_nosync:"nicht synchronisiert",sy_waiting:"warte auf den Server",sy_ago:"vor {n} min",sy_ntp_err:"Hostname oder IPv4-Adresse des NTP-Servers eingeben",sy_ntpint_err:"Abfrageintervall muss zwischen 1 und 1440 liegen",sy_time_note:"Der Switch hat keine batteriegepufferte Uhr: Die Zeit geht bei jedem Neustart verloren und wird neu vom NTP-Server bezogen, sobald das Netzwerk bereit ist. Im Flash speichern, damit die Einstellungen erhalten bleiben.",
 sy_pw_len:"Passwort: 1-20 Zeichen",sy_pw_space:"Das Passwort darf keine Leerzeichen enthalten",sy_pw_match:"Die Passwörter stimmen nicht überein",
 sy_pw_q:"Admin-Passwort ändern?",sy_pw_d:"Gilt sofort für neue Anmeldungen. Im Flash speichern, damit es erhalten bleibt.",
 sy_reboot_q:"Switch neu starten?",sy_reboot_d:"Es gibt UNGESPEICHERTE Änderungen, sie gehen verloren. Zuerst im Flash speichern, wenn du sie behalten willst.",
@@ -808,7 +817,7 @@ var CONF_CMDS=[
   /^port\s+\d{1,2}\s+lldp\s+(permit|block)+$/,
   /^eee\s+(on|off)(\s+\d{1,2})?(\s+(100m|1g|2g5))?$/,
   /^mirror(\s+\d{1,2})(\s+\d{1,2}[tr]?)+$/,/^mirror\s+off$/,
-  /^lag\s+[1-4](\s+\d{1,2})+$/,/^lag\s+[1-4]\s+d$/,/^laghash\s+[1-4](\s+\w+)+$/,
+  /^lag\s+[1-4](\s+\d{1,2})+$/,/^lag\s+[1-4]\s+d$/,/^lag\s+[1-4]\s+lacp(\s+\d{1,2})+$/,/^lag\s+[1-4]\s+lacp\s+off$/,/^laghash\s+[1-4](\s+\w+)+$/,
   /^isolate\s+\d{1,2}(\s+(off|\d{1,2}))+$/,
   /^stp\s+(on|off)$/,/^stp\s+(prio|hello|maxage|fwd|txhold)\s+\d{1,2}$/,
   /^stp\s+version\s+(rstp|stp)$/,
@@ -955,6 +964,7 @@ function pollStatus(){
   });
 }
 var statusPoller=new Poller(pollStatus,2500);
+statusPoller.start();
 function needPorts(fn){
   if(S.n)return fn();
   pollStatus().then(fn).catch(function(){});
@@ -1099,8 +1109,7 @@ function dashStatus(){
   });
 }
 tabHooks.dash={
-  enter:function(){statusPoller.start();pollInfo().catch(function(){})},
-  leave:function(){statusPoller.stop()},
+  enter:function(){pollInfo().catch(function(){})},
   status:dashStatus,
 };
 
@@ -1144,31 +1153,12 @@ function loadMtu(){
     });
   });
 }
-/* One learned MAC is the attached device; several means a switch or AP
- * sits behind the port, so only the count is shown. */
-function portsMacs(){
-  l2Load().then(function(all){
-    var by={};
-    all.forEach(function(e){
-      if(e.pport==="CPU")return;
-      var l=by[e.pport]=by[e.pport]||[];
-      if(l.indexOf(e.mac)<0)l.push(e.mac);
-    });
-    S.ports.forEach(function(p){
-      var el=$("pmac"+(p.portNum-1));
-      if(!el)return;
-      var m=by[p.portNum]||[];
-      el.textContent=!m.length?"-":(m.length===1?m[0]:m.length+" "+t("c_devices"));
-      el.title=m.join("\n");
-    });
-  }).catch(function(){});
-}
-var _macTick=0;
 function portsStatus(){
   buildPorts();
-  if(++_macTick%10===0)portsMacs();
   S.ports.forEach(function(p){
     var i=p.portNum-1,el=$("plink"+i);
+    var mc=$("pmac"+i);
+    if(mc)mc.textContent=parseInt(p.macs,16)&0x1fff;
     if(el)el.innerHTML=linkBadge(p);
     var sel=$("pspd"+i),v=p.isSFP?0:ADVSEL[parseInt(p.adv,2)];
     if(sel&&v&&document.activeElement!==sel)sel.value=v;
@@ -1196,8 +1186,7 @@ function applyPort(i){
   postCmds(cmds).then(loadMtu).catch(function(){});
 }
 tabHooks.ports={
-  enter:function(){statusPoller.start();needPorts(function(){buildPorts();portsMacs()})},
-  leave:function(){statusPoller.stop();l2Gen++},
+  enter:function(){needPorts(buildPorts)},
   status:portsStatus,
 };
 
@@ -1453,8 +1442,7 @@ function statsStatus(){
   });
 }
 tabHooks.stats={
-  enter:function(){statusPoller.start()},
-  leave:function(){statusPoller.stop();if(ctrPoll)ctrPoll.stop()},
+  leave:function(){if(ctrPoll)ctrPoll.stop()},
   status:statsStatus,
 };
 
@@ -1814,6 +1802,15 @@ function buildLag(){
   for(var g=1;g<=4;g++)(function(g){
     var card=h("div",{class:"card"});
     card.appendChild(h("h2",{text:"LAG "+g}));
+    var mr=h("div",{style:"display:flex;gap:10px;flex-wrap:wrap;align-items:center;margin-bottom:10px",class:"small"});
+    mr.appendChild(h("span",{class:"mut",text:t("lag_mode")}));
+    var ms=h("select",{class:"in",id:"lgm"+g});
+    ms.appendChild(h("option",{value:"static",text:t("lag_static")}));
+    ms.appendChild(h("option",{value:"lacp",text:"LACP"}));
+    ms.addEventListener("change",function(){$("lgs"+g).textContent=ms.value==="lacp"?t("lacp_hint"):""});
+    mr.appendChild(ms);
+    card.appendChild(mr);
+    card.appendChild(h("p",{class:"small mono",id:"lgs"+g,style:"margin-bottom:10px"}));
     var pr=h("div",{style:"display:flex;gap:10px;flex-wrap:wrap;margin-bottom:10px"});
     for(var p=1;p<=S.n;p++)pr.appendChild(h("label",null,[
       h("input",{type:"checkbox",id:"lg"+g+"p"+p}),document.createTextNode(" "+p+" "),
@@ -1826,14 +1823,34 @@ function buildLag(){
     });
     card.appendChild(hr);
     card.appendChild(h("button",{class:"ctl pri",text:t("c_apply"),onclick:function(){lagApply(g)}}));
+    card.addEventListener("change",function(){card.dataset.dirty="1"});
     w.appendChild(card);
   })(g);
 }
+var lacpCfg=[0,0,0,0,0];
+function maskPorts(m){var r=[];for(var p=1;p<=S.n;p++)if((m>>S.physToLog[p-1])&1)r.push(p);return r.length?r.join(" "):"-"}
 function lagLoad(){
-  return getJSON("/lag.json").then(function(s){
+  return getJSON("/lacp.json").then(function(c){
+    var tb=$("lacptbl").tBodies[0];
+    tb.innerHTML="";
+    c.lags.forEach(function(lg,i){
+      var g=i+1;
+      lacpCfg[g]=parseInt(lg.cfg,16);
+      if($("lgm"+g).closest(".card").dataset.dirty)return;
+      $("lgm"+g).value=lacpCfg[g]?"lacp":"static";
+      $("lgs"+g).textContent=lacpCfg[g]?"LACP: "+t("lacp_agg")+" "+(lg.aggValid?lg.agg:"("+t("lacp_neg")+")")+", "+t("lacp_members")+" "+maskPorts(parseInt(lg.members,16)):"";
+    });
+    if(c.on)c.ports.forEach(function(p){
+      if(p.lag===255)return;
+      var tr=tb.insertRow();
+      [p.p,p.lag+1,p.a,p.pt,p.rs,parseInt(p.rx,16),p.psys].forEach(function(v){tr.insertCell().textContent=v});
+    });
+    return getJSON("/lag.json");
+  }).then(function(s){
     s.forEach(function(l){
       var g=l.lagNum+1;
-      var members=parseInt(l.members,2);
+      if($("lgm"+g).closest(".card").dataset.dirty)return;
+      var members=lacpCfg[g]||parseInt(l.members,2);
       for(var p=1;p<=S.n;p++)
         $("lg"+g+"p"+p).checked=!!((members>>S.physToLog[p-1])&1);
       var hash=parseInt(l.hash,16);
@@ -1842,21 +1859,25 @@ function lagLoad(){
   });
 }
 function lagApply(g){
-  var cmd="lag "+g,n=0;
+  var lacp=$("lgm"+g).value==="lacp",cmd="lag "+g+(lacp?" lacp":""),n=0,pre=[];
+  delete $("lgm"+g).closest(".card").dataset.dirty;
   for(var p=1;p<=S.n;p++)if($("lg"+g+"p"+p).checked){cmd+=" "+p;n++;}
-  if(!n){
+  if(!lacp&&lacpCfg[g])pre.push("lag "+g+" lacp off");
+  if(lacp&&!n)cmd="lag "+g+" lacp off";
+  if(!n&&!lacp){
     confirmModal(t("lag_clear_q",{n:g}),t("lag_clear_d"),function(){
-      postCmd("lag "+g+" d").then(lagLoad).catch(function(){});
+      postCmds(pre.concat(["lag "+g+" d"])).then(lagLoad).catch(function(){});
     });
     return;
   }
   var hcmd="laghash "+g,nh=0;
   HASHF.forEach(function(f){if($("lg"+g+"h"+f).checked){hcmd+=" "+f;nh++;}});
-  var cmds=[cmd];
+  var cmds=pre.concat([cmd]);
   if(nh)cmds.push(hcmd);
   postCmds(cmds).then(lagLoad).catch(function(){});
 }
-tabHooks.lag={enter:function(){needPorts(function(){buildLag();lagLoad().catch(function(){})})}};
+var lagPoller=new Poller(function(){return lagLoad().catch(function(){})},3000);
+tabHooks.lag={enter:function(){needPorts(function(){buildLag();lagPoller.start()})},leave:function(){lagPoller.stop()}};
 
 
 function lldpLoad(){
@@ -2245,6 +2266,7 @@ function mergeConf(base,texts){
         else drop(/^eee /);
         conf.push(line);return;
       }
+      if((m=line.match(/^lag (\d) lacp off$/))){drop(new RegExp("^lag "+m[1]+" lacp( |$)"));return;}
       if(line==="mirror off"){drop(/^mirror /);return;}
       if(!isConfCmd(line))return;
       if((m=line.match(/^ingress (.+)$/))){
diff --git a/html/index.html b/html/index.html
index f896dd13..f95c8219 100644
--- a/html/index.html
+++ b/html/index.html
@@ -55,11 +55,11 @@ a{color:var(--ac);text-decoration:none}
 #navfoot{padding:10px 16px;border-top:1px solid var(--bd);font-size:12px;color:var(--fg2)}
 #wrap{flex:1;min-width:0;display:flex;flex-direction:column}
 #top{
-  display:flex;align-items:center;gap:10px;padding:10px 20px;
+  display:flex;align-items:center;flex-wrap:wrap;gap:10px;padding:8px 20px;
   background:var(--panel);border-bottom:1px solid var(--bd);position:sticky;top:0;z-index:5;
 }
 #burger{display:none;background:none;border:0;cursor:pointer;padding:4px}
-#ttitle{font-size:16px;font-weight:650;flex:1}
+#ttitle{font-size:16px;font-weight:650;min-width:120px}
 #dirty{
   display:none;font-size:12px;font-weight:600;color:var(--warn);
   border:1px solid var(--warn);border-radius:20px;padding:2px 10px;
@@ -112,19 +112,21 @@ label.row span.lb{width:110px;flex:none;color:var(--fg2);font-size:13px}
 }
 .switch input:checked+i{background:var(--ok)}
 .switch input:checked+i:before{transform:translateX(15px)}
-#strip{display:flex;gap:8px;flex-wrap:wrap;padding:4px 0 2px}
+#strip{display:flex;gap:6px;flex:1;min-width:0;overflow-x:auto;scrollbar-width:thin}
+.port:first-child{margin-left:auto}
+.port:last-child{margin-right:auto}
 .port{
-  width:46px;border:2px solid var(--bd);border-radius:7px;padding:5px 0 3px;
+  width:40px;border:2px solid var(--bd);border-radius:7px;padding:3px 0 2px;
   text-align:center;cursor:pointer;background:var(--panel2);position:relative;
 }
-.port.sfp{width:56px}
-.port .pn{font-weight:650;font-size:13px}
-.port .ps{font-size:10px;color:var(--fg2);display:block;line-height:1.2}
+.port.sfp{width:50px}
+.port .pn{font-weight:650;font-size:12px}
+.port .ps{font-size:9px;color:var(--fg2);display:block;line-height:1.2}
 .port .jack{
-  display:block;width:18px;height:12px;margin:3px auto 2px;border-radius:2px;
-  border:2px solid var(--fg2);border-top-width:5px;opacity:.55;
+  display:block;width:16px;height:10px;margin:2px auto 1px;border-radius:2px;
+  border:2px solid var(--fg2);border-top-width:4px;opacity:.55;
 }
-.port.sfp .jack{width:28px;height:10px;border-top-width:3px}
+.port.sfp .jack{width:24px;height:9px;border-top-width:3px}
 .port.up{border-color:var(--pc);background:color-mix(in srgb,var(--pc) 10%,var(--panel2))}
 .port.up .jack{border-color:var(--pc);opacity:1}
 .port.up .ps{color:var(--pc);font-weight:600}
@@ -183,6 +185,10 @@ button.danger{background:var(--bad);color:#fff;border-color:transparent}
   #ttitle{font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
   #dirty{padding:2px 7px}
 }
+@media (max-width:720px){
+  #ttitle{flex:1}
+  #strip{order:3;flex-basis:100%}
+}
 </style>
 <script>
 (function(){
@@ -215,15 +221,13 @@ button.danger{background:var(--bad);color:#fff;border-color:transparent}
       <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--fg)" stroke-width="2"><path d="M4 6h16M4 12h16M4 18h16"/></svg>
     </button>
     <span id="ttitle"></span>
+    <div id="strip"></div>
     <span id="dirty" data-i18n="hdr_dirty" data-i18n-t="hdr_dirty_t">unsaved changes</span>
     <button class="ctl pri" id="saveBtn" data-i18n="hdr_save" data-i18n-t="hdr_save_t">Save to flash</button>
   </header>
 
   <main>
     <section class="tab act" id="tab-dash">
-      <div class="card"><h2><span data-i18n="d_ports">Ports</span> <span class="hint" data-i18n="d_ports_h">click a port for details</span></h2>
-        <div id="strip"></div>
-      </div>
       <div class="grid2">
         <div class="card"><h2 data-i18n="d_system">System</h2><table class="t" id="sysinfo"></table></div>
         <div class="card"><h2><span data-i18n="d_traffic">Traffic</span> <span class="hint" data-i18n="d_traffic_h">packets/s, live</span></h2>
@@ -237,7 +241,7 @@ button.danger{background:var(--bad);color:#fff;border-color:transparent}
     <section class="tab" id="tab-ports">
       <div class="card"><h2 data-i18n="pt_title">Port configuration</h2>
         <div class="scrollx"><table class="t" id="ptable">
-          <thead><tr><th data-i18n="c_port">Port</th><th data-i18n="c_name">Name</th><th data-i18n="c_link">Link</th><th data-i18n="pt_conn">Connected</th><th data-i18n="pt_speed">Speed</th><th data-i18n="c_enabled">Enabled</th><th data-i18n="pt_mtu">MTU</th><th></th></tr></thead>
+          <thead><tr><th data-i18n="c_port">Port</th><th data-i18n="c_name">Name</th><th data-i18n="c_link">Link</th><th data-i18n="pt_conn">Devices learned</th><th data-i18n="pt_speed">Speed</th><th data-i18n="c_enabled">Enabled</th><th data-i18n="pt_mtu">MTU</th><th></th></tr></thead>
           <tbody></tbody></table></div>
         <p class="small mut" style="margin-top:8px" data-i18n="pt_sfp_note">SFP speed is set per slot and is not saved in the startup config.</p>
       </div>
@@ -356,6 +360,11 @@ button.danger{background:var(--bad);color:#fff;border-color:transparent}
 
     <section class="tab" id="tab-lag">
       <div id="lagwrap" class="grid2"></div>
+      <div class="card" style="margin-top:14px"><h2 data-i18n="lacp_heading">LACP (802.3ad)</h2>
+        <div class="scrollx"><table class="t" id="lacptbl">
+          <thead><tr><th data-i18n="c_port">Port</th><th>LAG</th><th data-i18n="lacp_actor">Actor</th><th data-i18n="lacp_partner">Partner</th><th data-i18n="lacp_rxstate">RX state</th><th data-i18n="lacp_rx">LACPDUs received</th><th data-i18n="lacp_psys">Partner system</th></tr></thead>
+          <tbody></tbody></table></div>
+      </div>
       <p class="small mut" style="margin-top:10px" data-i18n="lag_note">A LAG needs at least one member to be saved in the startup config; applying an empty group clears it.</p>
     </section>
 
diff --git a/httpd/httpd.c b/httpd/httpd.c
index aec2eaf1..f2ca2d36 100644
--- a/httpd/httpd.c
+++ b/httpd/httpd.c
@@ -1036,6 +1036,8 @@ void httpd_appcall(void)
 				send_stp();
 			} else if (is_word(q, "/lldp.json")) {
 				send_lldp();
+			} else if (is_word(q, "/lacp.json")) {
+				send_lacp();
 			} else if (is_word(q, "/vlanlist")) {
 				send_vlanlist();
 			} else if (is_word(q, "/config")) {
diff --git a/httpd/page_impl.c b/httpd/page_impl.c
index 2d58457e..006d2dbe 100644
--- a/httpd/page_impl.c
+++ b/httpd/page_impl.c
@@ -14,6 +14,7 @@
 #include "version.h"
 #include "machine.h"
 #include "rtl837x_stp.h"
+#include "rtl837x_lacp.h"
 #include "page_impl.h"
 #include "syslog.h"
 
@@ -736,6 +737,53 @@ void send_stp(void)
 	slen += strtox(outbuf + slen, "]}");
 }
 
+void send_lacp(void)
+{
+	dbg_string("send_lacp called\n");
+	slen = strtox(outbuf, HTTP_RESPONCE_JSON);
+
+	slen += strtox(outbuf + slen, "{\"on\":");
+	bool_to_html(lacpEnabled);
+	slen += strtox(outbuf + slen, ",\"lags\":[");
+	for (uint8_t l = 0; l < LACP_NUM_LAGS; l++) {
+		slen += strtox(outbuf + slen, "{\"cfg\":\"");
+		byte_to_html(lacp_lag_ports[l] >> 8);
+		byte_to_html(lacp_lag_ports[l]);
+		slen += strtox(outbuf + slen, "\",\"aggValid\":");
+		bool_to_html(lacp_agg_valid[l]);
+		slen += strtox(outbuf + slen, ",\"agg\":\"");
+		for (uint8_t j = 0; j < MAC_ADDR_LEN; j++)
+			byte_to_html(lacp_agg_sys[l][j]);
+		slen += strtox(outbuf + slen, "\",\"members\":\"");
+		byte_to_html(lacp_members_last[l] >> 8);
+		byte_to_html(lacp_members_last[l]);
+		slen += strtox(outbuf + slen, "\"},");
+	}
+	slen -= 1; // remove comma
+	slen += strtox(outbuf + slen, "],\"ports\":[");
+	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+		slen += strtox(outbuf + slen, "{\"p\":");
+		itoa_html(machine.log_to_phys_port[i]);
+		slen += strtox(outbuf + slen, ",\"lag\":");
+		itoa_html(lacp_port_lag[i]);
+		slen += strtox(outbuf + slen, ",\"a\":\"");
+		byte_to_html(lacp_actor_state[i]);
+		slen += strtox(outbuf + slen, "\",\"pt\":\"");
+		byte_to_html(lacp_partner_state[i]);
+		slen += strtox(outbuf + slen, "\",\"rs\":");
+		itoa_html(lacp_rx_state[i]);
+		slen += strtox(outbuf + slen, ",\"rx\":\"");
+		byte_to_html(lacp_rx_count[i] >> 8);
+		byte_to_html(lacp_rx_count[i]);
+		slen += strtox(outbuf + slen, "\",\"psys\":\"");
+		for (uint8_t j = 0; j < MAC_ADDR_LEN; j++)
+			byte_to_html(lacp_partner_sys[i][j]);
+		slen += strtox(outbuf + slen, "\"},");
+	}
+	slen -= 1; // remove comma
+	slen += strtox(outbuf + slen, "]}");
+}
+
 void send_lldp(void)
 {
 	dbg_string("send_lldp called\n");
@@ -1063,6 +1111,9 @@ void send_status(void)
 		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, "\",\"macs\":\"0x");
+		reg_to_html(RTL837X_L2_LRN_PORT_CONSTRT_CNT + (i << 2));
 		slen += strtox(outbuf + slen, "\"}");
 		if (i < machine.max_port)
 			char_to_html(',');
diff --git a/httpd/page_impl.h b/httpd/page_impl.h
index fd51c8c6..5133d2eb 100644
--- a/httpd/page_impl.h
+++ b/httpd/page_impl.h
@@ -24,6 +24,7 @@ void send_cmd_log(void);
 void send_lag(void);
 void send_stp(void);
 void send_lldp(void);
+void send_lacp(void);
 void send_vlanlist(void);
 
 /*  Convert only the lower nibble to ascii HEX char.
diff --git a/machine.c b/machine.c
deleted file mode 100644
index af79d920..00000000
--- a/machine.c
+++ /dev/null
@@ -1,1469 +0,0 @@
-#include "machine.h"
-#include "rtl837x_pins.h"
-#include "rtl837x_leds.h"
-#include "rtl837x_sfr.h"
-#include "rtl837x_regs.h"
-#include "rtl837x_common.h"
-
-#define I2CBUS_INVALID (7)
-// This is a MACRO to check if I2C_BUS_FROM_SDA_PIN or I2C_BUS_FROM_SCL_PIN don't return I2CBUS_INVALID.
-// When I2CBUS_INVALID is returned, compiler stops with "machine.c:<line>: error 176: sizeof applied to an incomplete type"
-#define I2CBUS_VALID(bus) (0 * sizeof(char[(bus) != I2CBUS_INVALID ? 1 : 0]))
-#define I2CBUS(sda, scl) \
-	((uint8_t)((I2C_BUS_FROM_SCL_PIN(scl) << RTL837X_REG_I2C_SCL_SHIFT) | \
-		   (I2C_BUS_FROM_SDA_PIN(sda) << RTL837X_REG_I2C_SDA_SHIFT) | \
-		   I2CBUS_VALID(I2C_BUS_FROM_SCL_PIN(scl)) | \
-		   I2CBUS_VALID(I2C_BUS_FROM_SDA_PIN(sda))))
-
-#define I2C_BUS_FROM_SDA_PIN(sda_pin) \
-	((sda_pin) == GPIO47_I2C_SDA0 ? 0 : \
-	 (sda_pin) == GPIO49_I2C_SDA1 ? 1 : \
-	 (sda_pin) == GPIO51_I2C_SDA2_UART1_RX ? 2 : \
-	 (sda_pin) == GPIO41_I2C_SDA3_MDIO1 ? 3 : \
-	 (sda_pin) == GPIO39_I2C_SDA4 ? 4 : I2CBUS_INVALID)
-
-#define I2C_BUS_FROM_SCL_PIN(scl_pin) \
-	((scl_pin) == GPIO46_I2C_SCL0 ? 0 : \
-	 (scl_pin) == GPIO48_I2C_SCL1 ? 1 : \
-	 (scl_pin) == GPIO50_I2C_SCL2_UART1_TX ? 2 : \
-	 (scl_pin) == GPIO40_I2C_SCL3_MDC1 ? 3 : I2CBUS_INVALID)
-
-#if defined(MACHINE_KP_9000_6XHML_X2) || \
-	defined(MACHINE_KP_9000_6XH_X2_V1_1) || \
-	defined(MACHINE_KP_9000_6XHML_X2_V1_1) || \
-	defined(MACHINE_KP_9000_6XH_X2_V1_2) || \
-	defined(MACHINE_KP_9000_6XHML_X2_V1_2)
-__code const struct machine machine = {
-#if defined(MACHINE_KP_9000_6XH_X2_V1_1)
-	.machine_name = "keepLink KP-9000-6XH V1.1",
-#elif defined(MACHINE_KP_9000_6XHML_X2_V1_1)
-	.machine_name = "keepLink KP-9000-6XHML V1.1",
-#elif defined(MACHINE_KP_9000_6XH_X2_V1_2)
-	.machine_name = "keepLink KP-9000-6XH V1.2",
-#elif defined(MACHINE_KP_9000_6XHML_X2_V1_2)
-	.machine_name = "keepLink KP-9000-6XHML V1.2",
-#else
-	.machine_name = "keepLink KP-9000-6XHML-X2",
-#endif
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
-	// Left SFP port (5)
-	.sfp_port[0].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
-	.sfp_port[0].pin_los = GPIO10_LED10,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 0,
-	.sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-	// Right SFP port (6)
-	.sfp_port[1].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[1].pin_los = GPIO37,
-	.sfp_port[1].pin_tx_disable = GPIO_NA,
-	.sfp_port[1].sds = 1,
-	.sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	/* Conditions for LED on:
-	 * dual led orange: ledset_0 & ledset_2
-	 * dual led green: ledset_2 & !ledset_0
-	 * single right led green: ledset_0 & !ledset_1
-	*/
-	.led_sets = { { LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			LEDS_2G5 | LEDS_LINK | LEDS_10G,
-			LEDS_1G | LEDS_LINK,
-			0 },
-		    },
-};
-
-#elif defined MACHINE_KP_9000_6XH_X
-__code const struct machine machine = {
-	.machine_name = "keepLink KP-9000-6XH-X",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	/* Conditions for LED on:
-	 * dual led orange: ledset_0 & ledset_2
-	 * dual led green: ledset_2 & !ledset_0
-	 * single right led green: ledset_0 & !ledset_1
-	*/
-	.led_sets = { { LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			LEDS_2G5 | LEDS_LINK | LEDS_10G,
-			LEDS_1G | LEDS_LINK,
-			0 },
-		    },
-};
-
-#elif defined(MACHINE_KP_9000_6XH_X2) || defined(MACHINE_KP_9000_6XH_X2_V2_1) || defined(MACHINE_KP_9000_6XHML_X2_V2_1)
-__code const struct machine machine = {
-#if defined(MACHINE_KP_9000_6XHML_X2_V2_1)
-	.machine_name = "keepLink KP-9000-6XHML V2.1",
-#elif defined(MACHINE_KP_9000_6XH_X2_V2_1)
-	.machine_name = "keepLink KP-9000-6XH-X2 V2.1",
-#else
-	.machine_name = "keepLink KP-9000-6XH-X2",
-#endif
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-
-	// Left SFP port
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-	// Right SFP port
-	.sfp_port[1].pin_detect = GPIO37,
-	.sfp_port[1].pin_los = GPIO_NA,
-	.sfp_port[1].sds = 0,
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-	.reset_pin = GPIO48_I2C_SCL1,   // Button-Switch is unpopulated on PCB, but can be added manually (hole in case is already there)
-	.high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = {
-			{
-				LEDS_2G5 | LEDS_LINK,												// Left LED (Amber)
-				LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,   // Right LED (Green)
-				0,
-				0
-			},
-			{
-				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-				0,
-				0,
-				0
-			},
-	 },
-	.led_mux_custom = 1,
-	.led_mux = {
-				0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,
-				0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,
-				0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-		},
-	};
-
-#elif defined MACHINE_KP_9000_9XH_X_EU
-__code const struct machine machine = {
-	.machine_name = "keepLink KP-9000-9XH-X-EU",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	.led_sets = { { LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-			LEDS_2G5 | LEDS_LINK,
-			LEDS_1G | LEDS_LINK, 
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
-		    },
-};
-
-#elif defined MACHINE_KP_9000_9XHML_X_V2_2
-__code const struct machine machine = {
-	.machine_name = "keepLink KP-9000-9XHML-X V2.2",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
-	.phys_to_log_port = { 0, 1, 2, 3, 4, 5, 6, 7, 8 },
-	.is_sfp = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
-	.led_sets = {
-		{   /* Set 0 for RJ45 connectors */
-			/* LED0: Right Green */
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			/* LED1: Left Orange */
-			LEDS_2G5 | LEDS_LINK,
-			/* LED2: Left Green */
-			LEDS_1G | LEDS_LINK,
-			/* LED3: None */
-			0,
-		}, { /* Set 1 for SFP port */
-			/* LED0: Single Green "9" LED */
-			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-			/* LED1: D23 LED on PCB */
-			LEDS_1G | LEDS_LINK,
-			/* LED2: D22 LED on PCB */
-			LEDS_2G5 | LEDS_LINK,
-			/* LED3: Unused */
-			LEDS_COL | LEDS_DUPLEX,
-		}, { /* Set 2: Unused, but set to same things as stock firmware for consistency */
-			LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			LEDS_1G | LEDS_LINK | LEDS_ACT,
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT | LEDS_5G,
-			LEDS_10G | LEDS_ACT | LEDS_LINK,
-		}, { /* Set 3: Unused, but set to same things as stock firmware for consistency */
-			LEDS_TX,
-			LEDS_RX,
-			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-		},
-	},
-};
-
-#elif defined(MACHINE_KP_9000_9XHML_X_V3_1) || defined(MACHINE_KP_9000_9XHML_X_V3_2)
-// 2M-PCB23-V3.2 is wired like V3.1 (SFP detection, LEDs, factory MAC location)
-__code const struct machine machine = {
-#if defined(MACHINE_KP_9000_9XHML_X_V3_2)
-	.machine_name = "keepLink KP-9000-9XHML-X V3.2",
-#else
-	.machine_name = "keepLink KP-9000-9XHML-X V3.1",
-#endif
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO48_I2C_SCL1,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{   /* RJ45: First LED, yellow, second LED: green */
-			LEDS_2G5 | LEDS_LINK,
-            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-		}, { /* SFP PORT, SINGLE GREEN LED */
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			0,
-			0,
-			0,
-		}},
-	.led_mux_custom = 1,
-	.led_mux = {0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x09, 0x0d, 0x10,
-				0x11, 0x0e, 0x14, 0x11, 0x12, 0x15, 0x15, 0x16, 0x18, 0x19,
-				0x1a, 0x19, 0x1d, 0x1e, 0x1c, 0x1d, 0x20, 0x21},
-	.mac_flash_offset = 0x1FC000,
-};
-
-#elif defined MACHINE_SWGT024_V2_0_MANAGED
-__code const struct machine machine = {
-	.machine_name = "SWGT024 V2.0 Managed",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp= {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	// Left SFP port (J4)
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 39 */
-	// Right SFP port (J2)
-	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
-	.sfp_port[1].pin_los = GPIO_NA,
-	.sfp_port[1].pin_tx_disable = GPIO_NA,
-	.sfp_port[1].sds = 0,
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 40 */
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{ /* RJ45: Green LED */
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			0,
-			/* Amber LED */
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			0
-		}, { /* SFP PORT: SINGLE GREEN LED */
-			LEDS_10M | LEDS_100M | LEDS_1G | LEDS_2G5 | LEDS_10G | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-			0,
-		},
-	},
-};
-
-#elif defined MACHINE_SWGT024_V2_0_UNMANAGED
-__code const struct machine machine = {
-	.machine_name = "SWGT024 V2.0 Unmanaged",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp= {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	// Left SFP port (J4)
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 39 */
-	// Right SFP port (J2)
-	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
-	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
-	.sfp_port[1].pin_tx_disable = GPIO_NA,
-	.sfp_port[1].sds = 0,
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 40 */
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{ /* RJ45: Green LED */
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			0,
-			/* Amber LED */
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			0
-		}, { /* SFP PORT: SINGLE GREEN LED */
-			LEDS_10M | LEDS_100M | LEDS_1G | LEDS_2G5 | LEDS_10G | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-			0,
-		},
-	},
-};
-
-#elif defined MACHINE_SWTG018AS_A_V_2_0
-__code const struct machine machine = {
-	.machine_name = "SWTG018AS-A V2.0",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO48_I2C_SCL1,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{   /* RJ45: First LED, yellow, second LED: green */
-			LEDS_2G5 | LEDS_LINK,
-            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-		}, { /* SFP PORT, SINGLE GREEN LED */
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			0,
-			0,
-			0,
-		}},
-	.led_mux_custom = 1,
-	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
-		     0x09, 0x0c, 0x09, 0x0d, 0x10, // 65e4
-		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
-		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
-		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
-		     0x1d, 0x20, 0x21 },
-};
-
-#elif defined MACHINE_HG0402XG_V1_1
-__code const struct machine machine = {
-	.machine_name = "HG0402XG V1.1",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = 50,
-	.sfp_port[0].pin_los = 10,
-	.sfp_port[0].pin_tx_disable = 0xFF,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-	.sfp_port[1].pin_detect = 30,
-	.sfp_port[1].pin_los = 51,
-	.sfp_port[1].pin_tx_disable = 0xFF,
-	.sfp_port[1].sds = 0,
-	.sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 , .enable = LED_27 | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	/* The Ethernet ports have 1 amber LED (left) and 1 green LED (right)
-	 * The SFP ports have also 1 amber LED and 1 green LED
-	 * Ethernet ports use LED-set 0, SFP ports use LED-set 1
-	 */
-	.led_sets = { { LEDS_10M | LEDS_LINK | LEDS_ACT,
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			0 },
-			{ LEDS_100M | LEDS_10M | LEDS_LINK,
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			LEDS_10G | LEDS_LINK,
-			0 },
-		    },
-};
-
-#elif defined MACHINE_SWTGW218AS
-
-__code const struct machine machine = {
-	.machine_name = "SWTGW218AS 8+1 Managed Switch",
-	.isRTL8373 = 1,
-	.mac_flash_offset = 0x1FC000,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green LED (right)
-					0, // unused
-					LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber LED (left)
-					0
-				  }, // unused
-				  { LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED
-					0, // unused
-					0, // unused
-					0
-				  }, // unused		    	},
-				},
-};
-
-#elif defined MACHINE_PCB_SWTG018AS_V2_1_0 // Sold as Sodola SL902 / Horaco "SWTGW218AS"; the SWTGW218AS label also covers other PCBs with different SFP and LED wiring (see MACHINE_SWTGW218AS)
-
-__code const struct machine machine = {
-	.machine_name = "SWTGW218AS (SWTG018AS-V2.1.0)",
-	.isRTL8373 = 1,
-	.mac_flash_offset = 0x1FC000,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,   // pulled low on module insert
-	.sfp_port[0].pin_los = GPIO_NA,     // no LOS pin wired
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	// LED wiring matches the SWTG018AS-A V2.0 (same PCB family)
-	.led_sets = {
-		{   /* RJ45: First LED, yellow, second LED: green */
-			LEDS_2G5 | LEDS_LINK,
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-		}, { /* SFP set (superseded by the raw register override in machine_custom_init) */
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-			0,
-			0,
-			0,
-		}},
-	.led_mux_custom = 1,
-	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
-		     0x09, 0x0c, 0x09, 0x0d, 0x10, // 65e4
-		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
-		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
-		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
-		     0x1d, 0x20, 0x21 },
-};
-
-#elif defined MACHINE_LIANGUO_ZX_SWTGW215AS // Has PCB branded PCB-SWTG115AS-V2.0 but is labeled and reports as a ZX-SWTGW215AS, seems to be identical to the "real" ZX-SWTGW215AS except for the LEDs
-__code const struct machine machine = {
-	.machine_name = "Lianguo ZX-SWTGW215AS",
-	.isRTL8373 = 0,
-	.mac_flash_offset = 0x1FC000,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green LED (right)
-					0, // unused
-					LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber LED (left)
-					0
-				  }, // unused
-				  { LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED
-					0, // unused
-					0, // unused
-					0
-				  }, // unused		    	},
-				},
-	.led_mux_custom = 0,
-};
-
-#elif defined MACHINE_DEFAULT_8C_1SFP
-__code const struct machine machine = {
-	.machine_name = "8+1 SFP Port Switch",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	.led_sets = { { LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-			LEDS_2G5 | LEDS_LINK,
-			LEDS_1G | LEDS_LINK,
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
-		    },
-};
-
-#elif defined MACHINE_TRENDNET_TEG_S562
-__code const struct machine machine = {
-	.machine_name = "Trendnet TEG-S562",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO50_I2C_SCL2_UART1_TX,
-	.sfp_port[0].pin_tx_disable = GPIO54_ACL_BIT2_EN,
-	.sfp_port[0].sds = 0,
-	.sfp_port[0].i2c = I2CBUS( GPIO47_I2C_SDA0, GPIO46_I2C_SCL0 ),
-	.sfp_port[1].pin_detect = GPIO36_PWM_OUT,
-	.sfp_port[1].pin_los = GPIO37,
-	.sfp_port[1].pin_tx_disable = GPIO51_I2C_SDA2_UART1_RX,
-	.sfp_port[1].sds = 1,
-	.sfp_port[1].i2c = I2CBUS( GPIO49_I2C_SDA1, GPIO48_I2C_SCL1 ),
-	.reset_pin = GPIO_NA,
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{
-			0, // Unused
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber
-			0 // Unused
-		},
-		{
-			0, // Unused
-			0, // Unused
-			LEDS_10G | LEDS_1G | LEDS_LINK | LEDS_ACT, // Green
-			0, // Unused
-		},
-	},
-
-};
-
-#elif defined(MACHINE_PCB_K0402WS_V3) || defined(MACHINE_HI_K0402WS)  // Sold as a variety of devices, see doc/
-__code const struct machine machine = {
-	.machine_name = "PCB-K0402WS-V3.0",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	
-	// Left SFP port
-	.sfp_port[0].pin_detect = GPIO38, 
-	.sfp_port[0].pin_los = GPIO_NA, 
-	.sfp_port[0].sds = 1, 
-	.sfp_port[0].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-	// Right SFP port
-	.sfp_port[1].pin_detect = GPIO37,
-	.sfp_port[1].pin_los = GPIO_NA, 
-	.sfp_port[1].sds = 0, 
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = { 
-			{
-				LEDS_2G5 | LEDS_LINK | LEDS_10M | LEDS_ACT,
-				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
-				LEDS_1G | LEDS_LINK, 
-				0 
-			},
-			{  
-				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK,
-				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_ACT,
-				0,
-				0
-			},
-	 },
-	.led_mux_custom = 1,
-	.led_mux = {
-				0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-		},
-	};
-
-#elif defined MACHINE_K0501W_V2_0
-__code const struct machine machine = {
-	.machine_name = "K0501W V2.0",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-	.reset_pin = GPIO_NA,
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			0,
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0
-		},
-		{
-			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-			0
-		},
-	 },
-};
-
-#elif defined MACHINE_ZX310S_4T2XH
-__code const struct machine machine = {
-	.machine_name = "ZX310S-4T2XH",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 1,
-	.n_10g = 1,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO48_I2C_SCL1,
-	.high_leds = { .mux =  LED_28_SYS, .enable = LED_27 | LED_28_SYS | LED_29 },
-	.led_mux_custom = 1,
-	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
-		     0x09, 0x0c, 0x3f, 0x0d, 0x10, // 65e4
-		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
-		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
-		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
-		     0x1d, 0x20, 0x21 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	/* Ports 1-4: Orange: 2.5GBit, Green: 10/100/1000MBit
-	 * Port 5: Blue: 10GBit, Green: 10Mbit-5GBit
-	 * SFP-port: Blue: 10GBit, Green 100MBit-5GBit
-	 */
-	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			LEDS_DUPLEX,
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
-		      {
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT | LEDS_5G,
-			LEDS_LINK | LEDS_ACT | LEDS_10G,
-			LEDS_2G5 | LEDS_LINK,
-			LEDS_COL | LEDS_DUPLEX
-		      }
-		    },
-};
-
-#elif defined MACHINE_STEAMEMO_IG204_V1
-__code const struct machine machine = {
-	.machine_name = "Steamemo IG204 V1",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	// Left SFP port (5)
-	// LED pin 9
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	// Right SFP port (6)
-	// LED pin 24
-	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
-	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
-	.sfp_port[1].pin_tx_disable = GPIO_NA,
-	.sfp_port[1].sds = 0,
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux =  LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	.led_sets = {
-			{
-				// RJ45 Amber LED (left)
-				LEDS_2G5 | LEDS_LINK,
-				// RJ45 Green LED (Right)
-				LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-				0,
-				0,
-			},
-			{
-				// SFP LED
-				LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-				0, // unused
-				0, // unused
-				0
-			},
-		},
-	.led_mux_custom = 1,
-	.led_mux = {
-		0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x0f, 0x20, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x15, 0x16, 0x18, 0x19, 0x1a, 0x1c, 0x1d, 0x1e, 0x0c, 0x21, 0x22, 0x23
-	},
-};
-
-#elif defined MACHINE_HI_K0801WS
-__code const struct machine machine = {
-    .machine_name = "Hi-Source HI-k0801WS",
-    .isRTL8373 = 1,
-    .min_port = 0,
-    .max_port = 8,
-    .n_sfp = 1,
-    .log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-    .phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-
-    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-    .sfp_port[0].pin_los = GPIO37,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 1,
-    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-    .reset_pin = GPIO_NA,
-
-    .high_leds = {
-        .mux = LED_27 | LED_29,
-        .enable = LED_28_SYS | LED_29
-    },
-
-    /* Ports 1-8 use set 0, port 9 SFP uses set 1 */
-    .port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-
-    .led_sets = {
-        {   /* Set 0: RJ45 copper ports
-             * Amber = 2.5G
-             * Green = 1G/100M/10M with activity
-             */
-            LEDS_2G5 | LEDS_LINK | LEDS_ACT, /* Amber */
-            0,
-            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, /* Green */
-            0
-        },
-        {   /* Set 1: SFP port, single green LED for all valid speeds */
-            LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-            0,
-            0,
-            0
-        },
-    },
-};
-
-#elif defined(MACHINE_PCB_K0402WS_V2) || defined(MACHINE_FNS1200P)
-__code const struct machine machine = {
-#if defined(MACHINE_PCB_K0402WS_V2)
-	.machine_name = "PCB-K0402WS-V2.0",
-#else
-    .machine_name = "FNS-1200P",
-#endif
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 2,
-    .log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-    .phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-
-    /* Left SFP (logical 8, SDS1): GPIO30=ModAbs, GPIO37=RX_LOS */
-    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-    .sfp_port[0].pin_los = GPIO37,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 1,
-    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    /* Right SFP (logical 3, SDS0): GPIO50=ModAbs, GPIO51=RX_LOS */
-    .sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
-    .sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
-    .sfp_port[1].pin_tx_disable = GPIO_NA,
-    .sfp_port[1].sds = 0,
-    .sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-
-    .high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-
-    /* Copper ports use SET0; SFP ports use SET1 */
-    .port_led_set = {0, 0, 0, 1, 0, 0, 0, 0, 1},
-
-    .led_sets = {
-        {   /* SET0: copper — LED0=amber (2.5G), LED2=green (1G/100M/10M) */
-            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-            0,
-            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-            0
-        },
-        {   /* SET1: SFP — all speeds link/act */
-            LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-            0,
-            0, 0
-        },
-    },
-
-    .led_mux_custom = 1,
-    .led_mux = {
-        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,  /* GPIO0-7: unused */
-        0x0f, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x12,          /* GPIO8-14 */
-        0x14, 0x15, 0x16, 0x18, 0x19, 0x1a,                 /* GPIO15-20 */
-        0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x23            /* GPIO21-27 */
-    },
-};
-
-
-#elif defined MACHINE_PCB_SWTG024AS_A_2_0_1
-__code const struct machine machine = {
-    .machine_name = "PCB-SWTG024AS-A-2.0.1",
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 2,
-    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
-
-    // SFP port on SDS0 / logical port 3
-    .sfp_port[0].pin_detect = GPIO37,
-    .sfp_port[0].pin_los = GPIO_NA,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 0,
-    .sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-    // SFP port on SDS1 / logical port 8
-    .sfp_port[1].pin_detect = GPIO38,
-    .sfp_port[1].pin_los = GPIO_NA,
-    .sfp_port[1].pin_tx_disable = GPIO_NA,
-    .sfp_port[1].sds = 1,
-    .sfp_port[1].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-    .port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-    .led_sets = {
-                    {
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-                            LEDS_DUPLEX,
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
-                    },
-                    {
-                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-                            LEDS_10G | LEDS_LINK | LEDS_ACT,
-                            LEDS_2G5 | LEDS_LINK,
-                            LEDS_COL | LEDS_DUPLEX
-                    },
-     },
-    .led_mux_custom = 1,
-    .led_mux = {
-                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-            },
-    };
-
-#elif defined MACHINE_ONT_S207CW_62TS_SE
-
-__code const struct machine machine = {
-    .machine_name = "ONT-S207CW-62TS-SE / Binardat 2G06-04210GSM / Binardat 2G06-04210GS",
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 2,
-    .log_to_phys_port = {0, 0, 0, 5, 4, 3, 2, 1, 6},
-    .phys_to_log_port = {7, 6, 5, 4, 3, 8, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
-
-    // SFP port on SDS0 / logical port 3
-    .sfp_port[0].pin_detect = GPIO37,
-    .sfp_port[0].pin_los = GPIO_NA,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 0,
-    .sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-    // SFP port on SDS1 / logical port 8
-    .sfp_port[1].pin_detect = GPIO38,
-    .sfp_port[1].pin_los = GPIO_NA,
-    .sfp_port[1].pin_tx_disable = GPIO_NA,
-    .sfp_port[1].sds = 1,
-    .sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-    .port_led_set = { 0, 0, 0, 3, 0, 0, 2, 2, 3},
-    .mac_flash_offset = 0x1FC000,
-    .led_sets = {
-        { // RJ45 Ports 3-4 (normal wiring)
-            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-            0,
-            0
-        },
-        { // Unused
-            0,
-            0,
-            0,
-            0
-        },
-        { // RJ45 Ports 1-2 (reversed wiring)
-            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-            0,
-            0
-        },
-        { // SFP Ports 5-6
-            LEDS_10G | LEDS_LINK | LEDS_ACT,
-            LEDS_2G5 | LEDS_1G | LEDS_LINK | LEDS_ACT,
-            0,
-            0
-        },
-    },
-    .led_mux_custom = 1,
-    .led_mux = {
-        0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-    },
-};
-
-#elif defined MACHINE_SWTG024AS_A_2_0_1_5C_1SFP
-__code const struct machine machine = {
-    .machine_name = "SWTG024AS-A-V2.0.1-5C-1SFP",
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 1,
-    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,
-    .sfp_port[0].pin_los = GPIO_NA,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 1,
-    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-    .port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	/* Ports 1-5 RJ45 use set 0, port 9 SFP uses set 1 
-	 * Ports 1-5: Green: 2.5GBit, Amber: 10/100/1000MBit
-	 * SFP-port: Blue: 10GBit, Green: 100MBit-2.5GBit
-	 */
-    .led_sets = {
-                    {
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-                            LEDS_DUPLEX,
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
-                    },
-                    {
-                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-                            LEDS_10G | LEDS_LINK | LEDS_ACT,
-                            LEDS_2G5 | LEDS_LINK,
-                            LEDS_COL | LEDS_DUPLEX
-                    },
-     },
-    .led_mux_custom = 1,
-    .led_mux = {
-                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-            },
-    };
-
-#elif defined MACHINE_SWTG024AS_V2_0
-__code const struct machine machine = {
-    .machine_name = "SWTG024AS-V2.0",
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 1,
-    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-    .sfp_port[0].pin_los = GPIO37,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 1,
-    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-    .port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	/* Ports 1-5 RJ45 use set 0, port 9 SFP uses set 1 
-	 * Ports 1-5: Green: 2.5GBit, Amber: 10/100/1000MBit
-	 * SFP-port: Blue: 10GBit, Amber: 100MBit-2.5GBit
-	 */
-    .led_sets = {
-                    {
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-                            LEDS_DUPLEX,
-                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
-                    },
-                    {
-                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-                            LEDS_10G | LEDS_LINK | LEDS_ACT,
-                            LEDS_2G5 | LEDS_LINK,
-                            LEDS_COL | LEDS_DUPLEX
-                    },
-     },
-    .led_mux_custom = 1,
-    .led_mux = {
-                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
-            },
-    };
-
-#elif defined MACHINE_ZX310S_4T2XT
-__code const struct machine machine = {
-	.machine_name = "ZX310S_4T2XT",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 0,
-	.n_10g = 2,
-	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 0},
-	.reset_pin = GPIO48_I2C_SCL1,
-	.high_leds = { .mux = LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
-	.led_mux_custom = 1,
-	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
-		     0x09, 0x0c, 0x3f, 0x0d, 0x10, // 65e4
-		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
-		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
-		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
-		     0x1d, 0x20, 0x21 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	/* Ports 1-4: Green: 2.5GBit, Orange: 10/100/1000MBit
-	 * Ports 5-6: Green: 10GBit, Orange: <= 5GBit
-	 */
-	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			LEDS_DUPLEX,
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
-		      {
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-			LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_5G,
-			LEDS_2G5 | LEDS_LINK,
-			LEDS_COL | LEDS_DUPLEX
-		      }
-		    },
-};
-
-#elif defined MACHINE_FG_4GT_2SX_V2_0
-__code const struct machine machine = {
-	.machine_name = "FG-4GT-2SX_V2.0",
-	.isRTL8373 = 0,
-	.min_port = 3,
-	.max_port = 8,
-	.n_sfp = 2,
-	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
-	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
-	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
-	
-	// Left SFP port
-	.sfp_port[0].pin_detect = GPIO38, 
-	.sfp_port[0].pin_los = GPIO_NA, 
-	.sfp_port[0].sds = 1, 
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-	// Right SFP port
-	.sfp_port[1].pin_detect = GPIO37,
-	.sfp_port[1].pin_los = GPIO_NA, 
-	.sfp_port[1].sds = 0, 
-	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
-
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
-	/* Ports 1-4 RJ45 use set 0, port 5-6 SFP uses set 1 
-	 * Ports 1-4: Green: 2.5GBit, Amber: 10/100/1000MBit
-	 * Ports 5-6: Green: 100MBit-10GBit
-	 */
-	.led_sets = { 
-			{
-				LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-				0,
-				LEDS_2G5 | LEDS_LINK | LEDS_ACT
-			},
-			{  
-				LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-				LEDS_10G | LEDS_LINK,
-				0,
-				LEDS_COL | LEDS_DUPLEX
-			},
-			{
-				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-				LEDS_2G5 | LEDS_1G | LEDS_LINK,
-				LEDS_5G | LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-				LEDS_10G | LEDS_LINK | LEDS_ACT
-			},
-			{
-				LEDS_TX,
-				LEDS_RX,
-				LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5 |
-					LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_ACT,
-				LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5 |
-					LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK
-			},
-	 },
-	.led_mux_custom = 1,
-	.led_mux = {
-				0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x3f, 0x15, 0x16,
-				0x18, 0x0e, 0x19, 0x11, 0x12, 0x1a, 0x15, 0x16, 0x1c, 0x19,
-				0x1a, 0x1d, 0x1d, 0x1e, 0x1e, 0x20, 0x21, 0x22
-		},
-	};
-
-#elif defined MACHINE_FG_8GT_1SX
-__code const struct machine machine = {
-	.machine_name = "FG-8GT-1SX",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO38,
-	.sfp_port[0].pin_los = GPIO_NA,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		/*
-			Ports 1-8: Left Amber 10/100/1000MBit (Vendor no 10M, but we add it)
-					   Right Green 2.5GBit
-			SFP-port: Any speed
-		*/
-		{
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-		},
-		{
-			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-			0,
-		},
-	},
-	.led_mux_custom = 1,
-	.led_mux = {
-		0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x09, 0x0d, 0x10,
-		0x11, 0x0e, 0x14, 0x11, 0x12, 0x15, 0x15, 0x16, 0x18, 0x19,
-		0x1a, 0x19, 0x1d, 0x1e, 0x1c, 0x1d, 0x20, 0x21,
-	},
-};
-
-#elif defined MACHINE_LIANGUO_HYWS_SGT0108S
-__code const struct machine machine = {
-    .machine_name = "Lianguo HYWS-SGT0108S",
-    .isRTL8373 = 1,
-    .min_port = 0,
-    .max_port = 8,
-    .n_sfp = 1,
-    .log_to_phys_port = {2, 1, 4, 3, 5, 6, 7, 8, 9},
-    .phys_to_log_port = {1, 0, 3, 2, 4, 5, 6, 7, 8},
-    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-
-    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-    .sfp_port[0].pin_los = GPIO37,
-    .sfp_port[0].pin_tx_disable = GPIO_NA,
-    .sfp_port[0].sds = 1,
-    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-    .reset_pin = GPIO_NA,
-	.high_leds = { .mux = 0, .enable = 0 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
-	.led_sets = { 
-		{ 
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // RJ45 Blue LEDs
-			LEDS_2G5 | LEDS_LINK, // RJ45 White LEDs
-			0,
-			0
-		},
-		{ 
-			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // SFP blue LED?
-			0,
-			0,
-			0
-		},
-	},
-};
-#elif defined MACHINE_POE_2G080110GS
-__code const struct machine machine = {
-	.machine_name = "MokerLink POE-2G080110GS",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{
-			/* SET0: RJ45  2.5G = amber, 1G/100M/10M = green */
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT, /* amber */
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, /* green */
-			0,
-			0
-		},
-		{
-			/* SET1: SFP+ port = green */
-			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M |
-				LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
-			0,
-			0,
-			0
-		}
-	},
-	.led_mux_custom = 1,
-	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08,
-			0x09, 0x0c, 0x09, 0x0d, 0x10,
-			0x11, 0x0e, 0x14, 0x11, 0x12,
-			0x15, 0x15, 0x16, 0x18, 0x19,
-			0x1a, 0x19, 0x1d, 0x1e, 0x1c,
-			0x1d, 0x20, 0x21 },
-};
-#elif defined MACHINE_PB_2132
-__code const struct machine machine = {
-	.machine_name = "PB-2132",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-
-	.reset_pin = GPIO_NA,
-
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-
-	.led_sets = {
-		{
-			/* LED0 = RJ45: Amber LED: 2.5G */
-			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
-			/* LED1 = RJ45: Green LED: 10M / 100M / 1000M */
-			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
-			0,
-			0
-		},
-		{
-			/* SFP+ single Green LED. */
-			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-			0
-		},
-	},
- };
-
-#elif defined MACHINE_HASIVO_S600W_4GT_2XGT_SE
-__code const struct machine machine = {
-    .machine_name = "Hasivo S600W-4GT-2XGT-SE",
-    .isRTL8373 = 0,
-    .min_port = 3,
-    .max_port = 8,
-    .n_sfp = 0,
-    .n_10g = 2,
-    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
-    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
-    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 0},
-    .reset_pin = GPIO54_ACL_BIT2_EN,
-    .high_leds = { .mux = LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-    .port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1 },
-    /* Ports 1-4: Green: 2.5GBit, Orange: 10/100/1000MBit
-     * Ports 5-6: Green: 10GBit, Orange: 5/2.5GBit, None: 10/100/1000MBit
-     */
-    .led_sets = {
-        {
-            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Yellow
-            LEDS_2G5 | LEDS_LINK, // Green
-            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK, // Orange
-            0, // Unused
-        },
-        {
-            LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Yellow
-            LEDS_10G | LEDS_LINK, // Green
-            LEDS_5G | LEDS_2G5 | LEDS_LINK, // Orange
-            0, // Unused
-        },
-    },
-    .led_mux_custom = 1,
-    .led_mux = {
-        0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
-        0x3f, 0x3f, 0x3f, 0x0f, 0x20,
-        0x21, 0x22, 0x10, 0x11, 0x12,
-        0x14, 0x15, 0x16, 0x18, 0x19,
-        0x1a, 0x1c, 0x1d, 0x1e, 0x0c,
-        0x0d, 0x0e, 0x23
-    },
-
-};
-#elif defined MACHINE_HASIVO_S1100WP_8GT_1SX_SE
-__code const struct machine machine = {
-	.machine_name = "Hasivo S1100WP-8GT-1SX-SE",
-	.isRTL8373 = 1,
-	.mac_flash_offset = 0x1FC000,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO54_ACL_BIT2_EN,
-	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green LED (right)
-					0,
-					LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber LED (left)
-					0
-				  },
-				  { LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED
-					0, 
-					0,
-					0
-				  },
-				},
-};
-#elif defined MACHINE_F7008_2_5
-__code const struct machine machine = {
-	.machine_name = "F7008-2.5 8+1 SFP Port Switch",
-	.isRTL8373 = 1,
-	.min_port = 0,
-	.max_port = 8,
-	.n_sfp = 1,
-	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
-	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
-	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
-	.sfp_port[0].pin_los = GPIO37,
-	.sfp_port[0].pin_tx_disable = GPIO_NA,
-	.sfp_port[0].sds = 1,
-	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
-	.reset_pin = GPIO_NA,
-	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
-	.port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
-	.led_sets = {
-		{	/* SET0 */
-			LEDS_2G5 | LEDS_LINK,				/* LEDID0 - green: 2.5G link */
-			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,	/* LEDID1 - yellow: traffic */
-			0,
-			0,
-		},
-		{	/* SET1 - SFP+ */
-			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_LINK,
-			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_LINK | LEDS_ACT,
-			0,
-			0,
-		},
-	},
-	.led_mux_custom = 1,
-	.led_mux = {
-		0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x02,
-		0x0d, 0x10, 0x11, 0x02, 0x14, 0x02, 0x02, 0x15,
-		0x02, 0x02, 0x18, 0x02, 0x02, 0x19, 0x02, 0x02,
-		0x1c, 0x1d, 0x02, 0x02,
-	},
-};
-
-#else
-	#error "Please select a machine type in machine.h"
-#endif
diff --git a/machine.h b/machine.h
index 30575781..c0e10cd5 100644
--- a/machine.h
+++ b/machine.h
@@ -3,55 +3,19 @@
 
 #include <stdint.h>
 
-/*
- * Select your machine type below
- */
-// Legacy KP-9000 4+2 targets. Prefer the PCB-revision-specific targets below.
-// #define MACHINE_KP_9000_6XHML_X2
-// #define MACHINE_KP_9000_6XH_X2
+#define MACHINE_STR_HELPER(x)  #x
+#define MACHINE_STR(x) MACHINE_STR_HELPER(x)
 
-// KP-9000 4+2 targets by PCB silkscreen revision.
-// #define MACHINE_KP_9000_6XH_X2_V1_1
-// #define MACHINE_KP_9000_6XHML_X2_V1_1
-// #define MACHINE_KP_9000_6XH_X2_V1_2
-// #define MACHINE_KP_9000_6XHML_X2_V1_2
-// #define MACHINE_KP_9000_6XH_X2_V2_1
-// #define MACHINE_KP_9000_6XHML_X2_V2_1
 
-// #define MACHINE_KP_9000_6XH_X
-// #define MACHINE_KP_9000_9XH_X_EU
-// #define MACHINE_KP_9000_9XHML_X_V2_2
-// #define MACHINE_KP_9000_9XHML_X_V3_1
-// #define MACHINE_KP_9000_9XHML_X_V3_2
-// #define MACHINE_SWGT024_V2_0_MANAGED
-// #define MACHINE_SWGT024_V2_0_UNMANAGED
-// #define MACHINE_TRENDNET_TEG_S562
-// #define MACHINE_HG0402XG_V1_1
-// #define MACHINE_SWTG018AS_A_V_2_0
-// #define MACHINE_SWTGW218AS
-// #define MACHINE_PCB_SWTG018AS_V2_1_0
-// #define MACHINE_PCB_K0402WS_V3
-// #define MACHINE_PCB_K0402WS_V2
-// #define MACHINE_K0501W_V2_0
-// #define MACHINE_LIANGUO_ZX_SWTGW215AS
-// #define MACHINE_ZX310S_4T2XH
-// #define MACHINE_ZX310S_4T2XT
-// #define MACHINE_STEAMEMO_IG204_V1
-// #define MACHINE_DEFAULT_8C_1SFP
-// #define MACHINE_HI_K0801WS
-// #define MACHINE_FNS1200P
-// #define MACHINE_PCB_SWTG024AS_A_2_0_1
-// #define MACHINE_ONT_S207CW_62TS_SE
-// #define MACHINE_SWTG024AS_A_2_0_1_5C_1SFP
-// #define MACHINE_SWTG024AS_V2_0
-// #define MACHINE_FG_4GT_2SX_V2_0
-// #define MACHINE_FG_8GT_1SX
-// #define MACHINE_LIANGUO_HYWS_SGT0108S
-// #define MACHINE_POE_2G080110GS
-// #define MACHINE_PB_2132
-// #define MACHINE_HASIVO_S600W_4GT_2XGT_SE
-// #define MACHINE_HASIVO_S1100WP_8GT_1SX_SE
-// #define MACHINE_F7008_2_5
+#define MACHINE_DEF_DIR machine
+
+#ifndef MACHINE_NAME
+	#define MACHINE_NAME default_machine
+#endif
+
+#define MACHINE_INC(dir,file) MACHINE_STR(dir/file)
+
+#include  MACHINE_INC(MACHINE_DEF_DIR,MACHINE_NAME.h)
 
 #define LED_27 1
 // SYSTEM LED
@@ -100,6 +64,12 @@ struct machine {
 	uint8_t led_mux_custom;
 	uint8_t led_mux[28];
 	uint32_t mac_flash_offset;
+	// Read the flash with single-IO (CMD_FREAD) instead of DIO for MMIO/code
+	// fetch. Set for boards whose flash chip is not usable in DIO mode, which
+	// shows up as a board that does not boot at all, garbled console output or
+	// random resets. Costs management-plane speed only, the ASIC keeps
+	// forwarding in hardware.
+	uint8_t flash_sio;
 };
 
 struct machine_runtime
diff --git a/machine/2G08110GSN.c b/machine/2G08110GSN.c
new file mode 120000
index 00000000..c46221ee
--- /dev/null
+++ b/machine/2G08110GSN.c
@@ -0,0 +1 @@
+SWTG018AS_A_V_2_0.c
\ No newline at end of file
diff --git a/machine/2G08110GSN.h b/machine/2G08110GSN.h
new file mode 100644
index 00000000..f54133d0
--- /dev/null
+++ b/machine/2G08110GSN.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_2G08110GSN_H_
+#define _MACHINE_2G08110GSN_H_
+
+#define MACHINE_MODEL "MokerLink 2G08110GSN"
+
+#endif
diff --git a/machine/2G5F4_10G2_V1_01.c b/machine/2G5F4_10G2_V1_01.c
new file mode 100644
index 00000000..9a08e19f
--- /dev/null
+++ b/machine/2G5F4_10G2_V1_01.c
@@ -0,0 +1,54 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	/* Same 2M-PCB43-V1.1 board family as the KP-9000-6XH-X2 (see
+	 * machine/KP_9000_6XHML_X2.c), but the two SFP+ cages (physical ports 5 and
+	 * 6) are wired the other way round: physical 5 is on SDS1, physical 6 on
+	 * SDS0. Copper ports 1-4 match the KP-9000 layout. */
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	// Left SFP cage (physical port 5) = SDS1
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	// Right SFP cage (physical port 6) = SDS0
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO10_LED10,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+	/* The board has a 3-hole reset button footprint, but it is unpopulated and
+	 * the case has no opening for it, so reset_pin stays GPIO_NA. GPIO54, the
+	 * reset pin on the KP-9000 layout, reads as permanently pressed here. */
+	.reset_pin = GPIO_NA,
+	/* The fitted T25S40 does not work in DIO mode on this board, so read the flash
+	 * with single-IO; see doc/devices/2G5F4_10G2_V1.01.md. */
+	.flash_sio = 1,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	/* Conditions for LED on:
+	 * dual led orange: ledset_0 & ledset_2
+	 * dual led green: ledset_2 & !ledset_0
+	 * single right led green: ledset_0 & !ledset_1
+	 *
+	 * Measured on this board: LED-ID0 is the copper blue LED, LED-ID1 the
+	 * copper white one (setting LED-ID0 to 0 killed blue while leaving white on
+	 * at 2.5G only) and LED-ID2 carries the SFP single LED. The "solid"
+	 * conditions (LINK/speed) barely drive the LEDs here and ACT is what
+	 * actually lights them, which is why the white LED used to glow faintly at
+	 * non-2.5G speeds; the fix for that is LED_GLB_IO_EN bit 6, set in
+	 * machine_init.c. */
+	.led_sets = { { LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			LEDS_2G5 | LEDS_LINK | LEDS_10G,
+			LEDS_1G | LEDS_LINK,
+			0 },
+		    },
+};
diff --git a/machine/2G5F4_10G2_V1_01.h b/machine/2G5F4_10G2_V1_01.h
new file mode 100644
index 00000000..d372b58a
--- /dev/null
+++ b/machine/2G5F4_10G2_V1_01.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_2G5F4_10G2_V1_01_H_
+#define _MACHINE_2G5F4_10G2_V1_01_H_
+
+#define MACHINE_MODEL "2G5F4_10G2_V1.01 / SGT0204S"
+
+#endif
diff --git a/machine/DEFAULT_8C_1SFP.c b/machine/DEFAULT_8C_1SFP.c
new file mode 120000
index 00000000..f00039af
--- /dev/null
+++ b/machine/DEFAULT_8C_1SFP.c
@@ -0,0 +1 @@
+KP_9000_9XH_X_EU.c
\ No newline at end of file
diff --git a/machine/DEFAULT_8C_1SFP.h b/machine/DEFAULT_8C_1SFP.h
new file mode 100644
index 00000000..2b802a30
--- /dev/null
+++ b/machine/DEFAULT_8C_1SFP.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_DEFAULT_8C_1SFP_H_
+#define _MACHINE_DEFAULT_8C_1SFP_H_
+
+#define MACHINE_MODEL "8+1 SFP Port Switch"
+
+#endif
diff --git a/machine/F7008_2_5.c b/machine/F7008_2_5.c
new file mode 100644
index 00000000..e2d08e61
--- /dev/null
+++ b/machine/F7008_2_5.c
@@ -0,0 +1,41 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{	/* SET0 */
+			LEDS_2G5 | LEDS_LINK,				/* LEDID0 - green: 2.5G link */
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,	/* LEDID1 - yellow: traffic */
+			0,
+			0,
+		},
+		{	/* SET1 - SFP+ */
+			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_LINK,
+			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+		},
+	},
+	.led_mux_custom = 1,
+	.led_mux = {
+		0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x02,
+		0x0d, 0x10, 0x11, 0x02, 0x14, 0x02, 0x02, 0x15,
+		0x02, 0x02, 0x18, 0x02, 0x02, 0x19, 0x02, 0x02,
+		0x1c, 0x1d, 0x02, 0x02,
+	},
+};
diff --git a/machine/F7008_2_5.h b/machine/F7008_2_5.h
new file mode 100644
index 00000000..c3b0cbbf
--- /dev/null
+++ b/machine/F7008_2_5.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_F7008_2_5_H_
+#define _MACHINE_F7008_2_5_H_
+
+#define MACHINE_MODEL "F7008-2.5 8+1 SFP Port Switch"
+
+#endif
diff --git a/machine/FG_4GT_2SX_V2_0.c b/machine/FG_4GT_2SX_V2_0.c
new file mode 100644
index 00000000..9590c6f0
--- /dev/null
+++ b/machine/FG_4GT_2SX_V2_0.c
@@ -0,0 +1,66 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	
+	// Left SFP port
+	.sfp_port[0].pin_detect = GPIO38, 
+	.sfp_port[0].pin_los = GPIO_NA, 
+	.sfp_port[0].sds = 1, 
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	// Right SFP port
+	.sfp_port[1].pin_detect = GPIO37,
+	.sfp_port[1].pin_los = GPIO_NA, 
+	.sfp_port[1].sds = 0, 
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	/* Ports 1-4 RJ45 use set 0, port 5-6 SFP uses set 1 
+	 * Ports 1-4: Green: 2.5GBit, Amber: 10/100/1000MBit
+	 * Ports 5-6: Green: 100MBit-10GBit
+	 */
+	.led_sets = { 
+			{
+				LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+				0,
+				LEDS_2G5 | LEDS_LINK | LEDS_ACT
+			},
+			{  
+				LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+				LEDS_10G | LEDS_LINK,
+				0,
+				LEDS_COL | LEDS_DUPLEX
+			},
+			{
+				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+				LEDS_2G5 | LEDS_1G | LEDS_LINK,
+				LEDS_5G | LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+				LEDS_10G | LEDS_LINK | LEDS_ACT
+			},
+			{
+				LEDS_TX,
+				LEDS_RX,
+				LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5 |
+					LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_ACT,
+				LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5 |
+					LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK
+			},
+	 },
+	.led_mux_custom = 1,
+	.led_mux = {
+				0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x3f, 0x15, 0x16,
+				0x18, 0x0e, 0x19, 0x11, 0x12, 0x1a, 0x15, 0x16, 0x1c, 0x19,
+				0x1a, 0x1d, 0x1d, 0x1e, 0x1e, 0x20, 0x21, 0x22
+		},
+	};
diff --git a/machine/FG_4GT_2SX_V2_0.h b/machine/FG_4GT_2SX_V2_0.h
new file mode 100644
index 00000000..8f9697e7
--- /dev/null
+++ b/machine/FG_4GT_2SX_V2_0.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_FG_4GT_2SX_V2_0_H_
+#define _MACHINE_FG_4GT_2SX_V2_0_H_
+
+#define MACHINE_MODEL "FG-4GT-2SX_V2.0"
+
+#endif
diff --git a/machine/FG_8GT_1SX.c b/machine/FG_8GT_1SX.c
new file mode 100644
index 00000000..0fd3dee0
--- /dev/null
+++ b/machine/FG_8GT_1SX.c
@@ -0,0 +1,45 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		/*
+			Ports 1-8: Left Amber 10/100/1000MBit (Vendor no 10M, but we add it)
+					   Right Green 2.5GBit
+			SFP-port: Any speed
+		*/
+		{
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+		},
+		{
+			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0,
+		},
+	},
+	.led_mux_custom = 1,
+	.led_mux = {
+		0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x09, 0x0d, 0x10,
+		0x11, 0x0e, 0x14, 0x11, 0x12, 0x15, 0x15, 0x16, 0x18, 0x19,
+		0x1a, 0x19, 0x1d, 0x1e, 0x1c, 0x1d, 0x20, 0x21,
+	},
+};
diff --git a/machine/FG_8GT_1SX.h b/machine/FG_8GT_1SX.h
new file mode 100644
index 00000000..e75a9946
--- /dev/null
+++ b/machine/FG_8GT_1SX.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_FG_8GT_1SX_H_
+#define _MACHINE_FG_8GT_1SX_H_
+
+#define MACHINE_MODEL "FG-8GT-1SX"
+
+#endif
diff --git a/machine/FNS1200P.c b/machine/FNS1200P.c
new file mode 120000
index 00000000..c836c871
--- /dev/null
+++ b/machine/FNS1200P.c
@@ -0,0 +1 @@
+PCB_K0402WS_V2.c
\ No newline at end of file
diff --git a/machine/FNS1200P.h b/machine/FNS1200P.h
new file mode 100644
index 00000000..e5691b48
--- /dev/null
+++ b/machine/FNS1200P.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_FNS1200P_H_
+#define _MACHINE_FNS1200P_H_
+
+#define MACHINE_MODEL "FNS-1200P"
+
+#endif
diff --git a/machine/GT_ST018M.c b/machine/GT_ST018M.c
new file mode 120000
index 00000000..c46221ee
--- /dev/null
+++ b/machine/GT_ST018M.c
@@ -0,0 +1 @@
+SWTG018AS_A_V_2_0.c
\ No newline at end of file
diff --git a/machine/GT_ST018M.h b/machine/GT_ST018M.h
new file mode 100644
index 00000000..c4550c26
--- /dev/null
+++ b/machine/GT_ST018M.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_GT_ST018M_H_
+#define _MACHINE_GT_ST018M_H_
+
+#define MACHINE_MODEL "GoodTop GT-ST018M"
+
+#endif
diff --git a/machine/GT_ST024M.c b/machine/GT_ST024M.c
new file mode 120000
index 00000000..f0f8441d
--- /dev/null
+++ b/machine/GT_ST024M.c
@@ -0,0 +1 @@
+PCB_SWTG024AS_A_2_0_1.c
\ No newline at end of file
diff --git a/machine/GT_ST024M.h b/machine/GT_ST024M.h
new file mode 100644
index 00000000..be57f788
--- /dev/null
+++ b/machine/GT_ST024M.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_GT_ST024M_H_
+#define _MACHINE_GT_ST024M_H_
+
+#define MACHINE_MODEL "GoodTop GT-ST024M"
+
+#endif
diff --git a/machine/HASIVO_S1100P_8GT_1SX_S.c b/machine/HASIVO_S1100P_8GT_1SX_S.c
new file mode 100644
index 00000000..4db8de17
--- /dev/null
+++ b/machine/HASIVO_S1100P_8GT_1SX_S.c
@@ -0,0 +1,40 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.mac_flash_offset = 0x1FC000,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // LED0: orange
+			0,
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT, // LED2: green
+			0
+		},
+		{
+			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED0: green (both SFP LEDs are green)
+			0, 0, 0
+		}
+	},
+	.led_mux_custom = 1,
+	.led_mux = {
+		0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x09,
+		0x0e, 0x10, 0x12, 0x0e, 0x14, 0x11, 0x12, 0x16,
+		0x15, 0x16, 0x18, 0x19, 0x1a, 0x1a, 0x1d, 0x1e,
+		0x1c, 0x1e, 0x20, 0x21
+	},
+};
diff --git a/machine/HASIVO_S1100P_8GT_1SX_S.h b/machine/HASIVO_S1100P_8GT_1SX_S.h
new file mode 100644
index 00000000..b34d03ef
--- /dev/null
+++ b/machine/HASIVO_S1100P_8GT_1SX_S.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HASIVO_S1100P_8GT_1SX_S_H_
+#define _MACHINE_HASIVO_S1100P_8GT_1SX_S_H_
+
+#define MACHINE_MODEL "Hasivo S1100P-8GT-1SX-S"
+
+#endif
diff --git a/machine/HASIVO_S1100WP_8GT_1SX_SE.c b/machine/HASIVO_S1100WP_8GT_1SX_SE.c
new file mode 120000
index 00000000..1fc0cdb2
--- /dev/null
+++ b/machine/HASIVO_S1100WP_8GT_1SX_SE.c
@@ -0,0 +1 @@
+SWTGW218AS.c
\ No newline at end of file
diff --git a/machine/HASIVO_S1100WP_8GT_1SX_SE.h b/machine/HASIVO_S1100WP_8GT_1SX_SE.h
new file mode 100644
index 00000000..d50dfc22
--- /dev/null
+++ b/machine/HASIVO_S1100WP_8GT_1SX_SE.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HASIVO_S1100WP_8GT_1SX_SE_H_
+#define _MACHINE_HASIVO_S1100WP_8GT_1SX_SE_H_
+
+#define MACHINE_MODEL "Hasivo S1100WP-8GT-1SX-SE"
+
+#endif
diff --git a/machine/HASIVO_S600W_4GT_2XGT_SE.c b/machine/HASIVO_S600W_4GT_2XGT_SE.c
new file mode 100644
index 00000000..e43477d8
--- /dev/null
+++ b/machine/HASIVO_S600W_4GT_2XGT_SE.c
@@ -0,0 +1,43 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 0,
+    .n_10g = 2,
+    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 0},
+    .reset_pin = GPIO54_ACL_BIT2_EN,
+    .high_leds = { .mux = LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+    .port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1 },
+    /* Ports 1-4: Green: 2.5GBit, Orange: 10/100/1000MBit
+     * Ports 5-6: Green: 10GBit, Orange: 5/2.5GBit, None: 10/100/1000MBit
+     */
+    .led_sets = {
+        {
+            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Yellow
+            LEDS_2G5 | LEDS_LINK, // Green
+            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK, // Orange
+            0, // Unused
+        },
+        {
+            LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Yellow
+            LEDS_10G | LEDS_LINK, // Green
+            LEDS_5G | LEDS_2G5 | LEDS_LINK, // Orange
+            0, // Unused
+        },
+    },
+    .led_mux_custom = 1,
+    .led_mux = {
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+        0x3f, 0x3f, 0x3f, 0x0f, 0x20,
+        0x21, 0x22, 0x10, 0x11, 0x12,
+        0x14, 0x15, 0x16, 0x18, 0x19,
+        0x1a, 0x1c, 0x1d, 0x1e, 0x0c,
+        0x0d, 0x0e, 0x23
+    },
+
+};
diff --git a/machine/HASIVO_S600W_4GT_2XGT_SE.h b/machine/HASIVO_S600W_4GT_2XGT_SE.h
new file mode 100644
index 00000000..97beb686
--- /dev/null
+++ b/machine/HASIVO_S600W_4GT_2XGT_SE.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HASIVO_S600W_4GT_2XGT_SE_H_
+#define _MACHINE_HASIVO_S600W_4GT_2XGT_SE_H_
+
+#define MACHINE_MODEL "Hasivo S600W-4GT-2XGT-SE"
+
+#endif
diff --git a/machine/HC_SWTG124AS.c b/machine/HC_SWTG124AS.c
new file mode 120000
index 00000000..f0f8441d
--- /dev/null
+++ b/machine/HC_SWTG124AS.c
@@ -0,0 +1 @@
+PCB_SWTG024AS_A_2_0_1.c
\ No newline at end of file
diff --git a/machine/HC_SWTG124AS.h b/machine/HC_SWTG124AS.h
new file mode 100644
index 00000000..8d4dd648
--- /dev/null
+++ b/machine/HC_SWTG124AS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HC_SWTG124AS_H_
+#define _MACHINE_HC_SWTG124AS_H_
+
+#define MACHINE_MODEL "Horaco HC-SWTG124AS"
+
+#endif
diff --git a/machine/HG0402XG_V1_1.c b/machine/HG0402XG_V1_1.c
new file mode 100644
index 00000000..5d7be1e9
--- /dev/null
+++ b/machine/HG0402XG_V1_1.c
@@ -0,0 +1,38 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = 50,
+	.sfp_port[0].pin_los = 10,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+	.sfp_port[1].pin_detect = 30,
+	.sfp_port[1].pin_los = 51,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 , .enable = LED_27 | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	/* The Ethernet ports have 1 amber LED (left) and 1 green LED (right)
+	 * The SFP ports have also 1 amber LED and 1 green LED
+	 * Ethernet ports use LED-set 0, SFP ports use LED-set 1
+	 */
+	.led_sets = { { LEDS_10M | LEDS_LINK | LEDS_ACT,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0 },
+			{ LEDS_100M | LEDS_10M | LEDS_LINK,
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			LEDS_10G | LEDS_LINK,
+			0 },
+		    },
+};
diff --git a/machine/HG0402XG_V1_1.h b/machine/HG0402XG_V1_1.h
new file mode 100644
index 00000000..628dc168
--- /dev/null
+++ b/machine/HG0402XG_V1_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HG0402XG_V1_1_H_
+#define _MACHINE_HG0402XG_V1_1_H_
+
+#define MACHINE_MODEL "HG0402XG V1.1"
+
+#endif
diff --git a/machine/HI_K0402WS.c b/machine/HI_K0402WS.c
new file mode 100644
index 00000000..3ad7b241
--- /dev/null
+++ b/machine/HI_K0402WS.c
@@ -0,0 +1,46 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	
+	// Left SFP port
+	.sfp_port[0].pin_detect = GPIO38, 
+	.sfp_port[0].pin_los = GPIO_NA, 
+	.sfp_port[0].sds = 1, 
+	.sfp_port[0].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	// Right SFP port
+	.sfp_port[1].pin_detect = GPIO37,
+	.sfp_port[1].pin_los = GPIO_NA, 
+	.sfp_port[1].sds = 0, 
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = { 
+			{
+				LEDS_2G5 | LEDS_LINK | LEDS_10M | LEDS_ACT,
+				LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+				LEDS_1G | LEDS_LINK, 
+				0 
+			},
+			{  
+				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK,
+				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_ACT,
+				0,
+				0
+			},
+	 },
+	.led_mux_custom = 1,
+	.led_mux = {
+				0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+		},
+	};
diff --git a/machine/HI_K0402WS.h b/machine/HI_K0402WS.h
new file mode 100644
index 00000000..d930fce9
--- /dev/null
+++ b/machine/HI_K0402WS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HI_K0402WS_H_
+#define _MACHINE_HI_K0402WS_H_
+
+#define MACHINE_MODEL "PCB-K0402WS-V3.0"
+
+#endif
diff --git a/machine/HI_K0801WS.c b/machine/HI_K0801WS.c
new file mode 100644
index 00000000..8fba5e82
--- /dev/null
+++ b/machine/HI_K0801WS.c
@@ -0,0 +1,45 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 1,
+    .min_port = 0,
+    .max_port = 8,
+    .n_sfp = 1,
+    .log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+    .phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+    .sfp_port[0].pin_los = GPIO37,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 1,
+    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+    .reset_pin = GPIO_NA,
+
+    .high_leds = {
+        .mux = LED_27 | LED_29,
+        .enable = LED_28_SYS | LED_29
+    },
+
+    /* Ports 1-8 use set 0, port 9 SFP uses set 1 */
+    .port_led_set = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+    .led_sets = {
+        {   /* Set 0: RJ45 copper ports
+             * Amber = 2.5G
+             * Green = 1G/100M/10M with activity
+             */
+            LEDS_2G5 | LEDS_LINK | LEDS_ACT, /* Amber */
+            0,
+            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, /* Green */
+            0
+        },
+        {   /* Set 1: SFP port, single green LED for all valid speeds */
+            LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+            0,
+            0,
+            0
+        },
+    },
+};
diff --git a/machine/HI_K0801WS.h b/machine/HI_K0801WS.h
new file mode 100644
index 00000000..4321d0fe
--- /dev/null
+++ b/machine/HI_K0801WS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_HI_K0801WS_H_
+#define _MACHINE_HI_K0801WS_H_
+
+#define MACHINE_MODEL "Hi-Source HI-k0801WS"
+
+#endif
diff --git a/machine/K0501W_V2_0.c b/machine/K0501W_V2_0.c
new file mode 100644
index 00000000..75f36c6b
--- /dev/null
+++ b/machine/K0501W_V2_0.c
@@ -0,0 +1,34 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO_NA,
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0
+		},
+		{
+			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0
+		},
+	 },
+};
diff --git a/machine/K0501W_V2_0.h b/machine/K0501W_V2_0.h
new file mode 100644
index 00000000..dbe10df6
--- /dev/null
+++ b/machine/K0501W_V2_0.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_K0501W_V2_0_H_
+#define _MACHINE_K0501W_V2_0_H_
+
+#define MACHINE_MODEL "K0501W V2.0"
+
+#endif
diff --git a/machine/KP_9000_6XHML_X2.c b/machine/KP_9000_6XHML_X2.c
new file mode 100644
index 00000000..a6520f01
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2.c
@@ -0,0 +1,37 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
+	// Left SFP port (5)
+	.sfp_port[0].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[0].pin_los = GPIO10_LED10,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 0,
+	.sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+	// Right SFP port (6)
+	.sfp_port[1].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[1].pin_los = GPIO37,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 1,
+	.sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	/* Conditions for LED on:
+	 * dual led orange: ledset_0 & ledset_2
+	 * dual led green: ledset_2 & !ledset_0
+	 * single right led green: ledset_0 & !ledset_1
+	*/
+	.led_sets = { { LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			LEDS_2G5 | LEDS_LINK | LEDS_10G,
+			LEDS_1G | LEDS_LINK,
+			0 },
+		    },
+};
diff --git a/machine/KP_9000_6XHML_X2.h b/machine/KP_9000_6XHML_X2.h
new file mode 100644
index 00000000..da850ae4
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XHML_X2_H_
+#define _MACHINE_KP_9000_6XHML_X2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XHML-X2"
+
+#endif
diff --git a/machine/KP_9000_6XHML_X2_V1_1.c b/machine/KP_9000_6XHML_X2_V1_1.c
new file mode 120000
index 00000000..f9ce2cc7
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V1_1.c
@@ -0,0 +1 @@
+KP_9000_6XHML_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XHML_X2_V1_1.h b/machine/KP_9000_6XHML_X2_V1_1.h
new file mode 100644
index 00000000..1e8b2c49
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V1_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XHML_X2_V1_1_H_
+#define _MACHINE_KP_9000_6XHML_X2_V1_1_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XHML V1.1"
+
+#endif
diff --git a/machine/KP_9000_6XHML_X2_V1_2.c b/machine/KP_9000_6XHML_X2_V1_2.c
new file mode 120000
index 00000000..f9ce2cc7
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V1_2.c
@@ -0,0 +1 @@
+KP_9000_6XHML_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XHML_X2_V1_2.h b/machine/KP_9000_6XHML_X2_V1_2.h
new file mode 100644
index 00000000..484ff3e2
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V1_2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XHML_X2_V1_2_H_
+#define _MACHINE_KP_9000_6XHML_X2_V1_2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XHML V1.2"
+
+#endif
diff --git a/machine/KP_9000_6XHML_X2_V2_1.c b/machine/KP_9000_6XHML_X2_V2_1.c
new file mode 120000
index 00000000..5ebcb090
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V2_1.c
@@ -0,0 +1 @@
+KP_9000_6XH_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XHML_X2_V2_1.h b/machine/KP_9000_6XHML_X2_V2_1.h
new file mode 100644
index 00000000..4cea1de7
--- /dev/null
+++ b/machine/KP_9000_6XHML_X2_V2_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XHML_X2_V2_1_H_
+#define _MACHINE_KP_9000_6XHML_X2_V2_1_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XHML V2.1"
+
+#endif
diff --git a/machine/KP_9000_6XH_X.c b/machine/KP_9000_6XH_X.c
new file mode 100644
index 00000000..50dcc10b
--- /dev/null
+++ b/machine/KP_9000_6XH_X.c
@@ -0,0 +1,28 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	/* Conditions for LED on:
+	 * dual led orange: ledset_0 & ledset_2
+	 * dual led green: ledset_2 & !ledset_0
+	 * single right led green: ledset_0 & !ledset_1
+	*/
+	.led_sets = { { LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			LEDS_2G5 | LEDS_LINK | LEDS_10G,
+			LEDS_1G | LEDS_LINK,
+			0 },
+		    },
+};
diff --git a/machine/KP_9000_6XH_X.h b/machine/KP_9000_6XH_X.h
new file mode 100644
index 00000000..f52d0ad6
--- /dev/null
+++ b/machine/KP_9000_6XH_X.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XH_X_H_
+#define _MACHINE_KP_9000_6XH_X_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XH-X"
+
+#endif
diff --git a/machine/KP_9000_6XH_X2.c b/machine/KP_9000_6XH_X2.c
new file mode 100644
index 00000000..aa6a2655
--- /dev/null
+++ b/machine/KP_9000_6XH_X2.c
@@ -0,0 +1,48 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+
+	// Left SFP port
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	// Right SFP port
+	.sfp_port[1].pin_detect = GPIO37,
+	.sfp_port[1].pin_los = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO48_I2C_SCL1,   // Button-Switch is unpopulated on PCB, but can be added manually (hole in case is already there)
+	.high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+			{
+				LEDS_2G5 | LEDS_LINK,												// Left LED (Amber)
+				LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,   // Right LED (Green)
+				0,
+				0
+			},
+			{
+				LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+				0,
+				0,
+				0
+			},
+	 },
+	.led_mux_custom = 1,
+	.led_mux = {
+				0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,
+				0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,
+				0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+		},
+	};
diff --git a/machine/KP_9000_6XH_X2.h b/machine/KP_9000_6XH_X2.h
new file mode 100644
index 00000000..5493dc79
--- /dev/null
+++ b/machine/KP_9000_6XH_X2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XH_X2_H_
+#define _MACHINE_KP_9000_6XH_X2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XH-X2"
+
+#endif
diff --git a/machine/KP_9000_6XH_X2_V1_1.c b/machine/KP_9000_6XH_X2_V1_1.c
new file mode 120000
index 00000000..f9ce2cc7
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V1_1.c
@@ -0,0 +1 @@
+KP_9000_6XHML_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XH_X2_V1_1.h b/machine/KP_9000_6XH_X2_V1_1.h
new file mode 100644
index 00000000..183cc276
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V1_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XH_X2_V1_1_H_
+#define _MACHINE_KP_9000_6XH_X2_V1_1_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XH V1.1"
+
+#endif
diff --git a/machine/KP_9000_6XH_X2_V1_2.c b/machine/KP_9000_6XH_X2_V1_2.c
new file mode 120000
index 00000000..f9ce2cc7
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V1_2.c
@@ -0,0 +1 @@
+KP_9000_6XHML_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XH_X2_V1_2.h b/machine/KP_9000_6XH_X2_V1_2.h
new file mode 100644
index 00000000..4fcd94af
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V1_2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XH_X2_V1_2_H_
+#define _MACHINE_KP_9000_6XH_X2_V1_2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XH V1.2"
+
+#endif
diff --git a/machine/KP_9000_6XH_X2_V2_1.c b/machine/KP_9000_6XH_X2_V2_1.c
new file mode 120000
index 00000000..5ebcb090
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V2_1.c
@@ -0,0 +1 @@
+KP_9000_6XH_X2.c
\ No newline at end of file
diff --git a/machine/KP_9000_6XH_X2_V2_1.h b/machine/KP_9000_6XH_X2_V2_1.h
new file mode 100644
index 00000000..a144dc96
--- /dev/null
+++ b/machine/KP_9000_6XH_X2_V2_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_6XH_X2_V2_1_H_
+#define _MACHINE_KP_9000_6XH_X2_V2_1_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-6XH-X2 V2.1"
+
+#endif
diff --git a/machine/KP_9000_9XHML_X_V2_2.c b/machine/KP_9000_9XHML_X_V2_2.c
new file mode 100644
index 00000000..e73a7514
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V2_2.c
@@ -0,0 +1,51 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = { 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+	.phys_to_log_port = { 0, 1, 2, 3, 4, 5, 6, 7, 8 },
+	.is_sfp = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+	.led_sets = {
+		{   /* Set 0 for RJ45 connectors */
+			/* LED0: Right Green */
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			/* LED1: Left Orange */
+			LEDS_2G5 | LEDS_LINK,
+			/* LED2: Left Green */
+			LEDS_1G | LEDS_LINK,
+			/* LED3: None */
+			0,
+		}, { /* Set 1 for SFP port */
+			/* LED0: Single Green "9" LED */
+			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
+			/* LED1: D23 LED on PCB */
+			LEDS_1G | LEDS_LINK,
+			/* LED2: D22 LED on PCB */
+			LEDS_2G5 | LEDS_LINK,
+			/* LED3: Unused */
+			LEDS_COL | LEDS_DUPLEX,
+		}, { /* Set 2: Unused, but set to same things as stock firmware for consistency */
+			LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			LEDS_1G | LEDS_LINK | LEDS_ACT,
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT | LEDS_5G,
+			LEDS_10G | LEDS_ACT | LEDS_LINK,
+		}, { /* Set 3: Unused, but set to same things as stock firmware for consistency */
+			LEDS_TX,
+			LEDS_RX,
+			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
+			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
+		},
+	},
+};
diff --git a/machine/KP_9000_9XHML_X_V2_2.h b/machine/KP_9000_9XHML_X_V2_2.h
new file mode 100644
index 00000000..2d6d0a7f
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V2_2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_9XHML_X_V2_2_H_
+#define _MACHINE_KP_9000_9XHML_X_V2_2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-9XHML-X V2.2"
+
+#endif
diff --git a/machine/KP_9000_9XHML_X_V3_1.c b/machine/KP_9000_9XHML_X_V3_1.c
new file mode 100644
index 00000000..26ea751f
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V3_1.c
@@ -0,0 +1,37 @@
+#include "machine_defs.h"
+
+// 2M-PCB23-V3.2 is wired like V3.1 (SFP detection, LEDs, factory MAC location)
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO48_I2C_SCL1,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{   /* RJ45: First LED, yellow, second LED: green */
+			LEDS_2G5 | LEDS_LINK,
+            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+		}, { /* SFP PORT, SINGLE GREEN LED */
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			0,
+			0,
+		}},
+	.led_mux_custom = 1,
+	.led_mux = {0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x09, 0x0d, 0x10,
+				0x11, 0x0e, 0x14, 0x11, 0x12, 0x15, 0x15, 0x16, 0x18, 0x19,
+				0x1a, 0x19, 0x1d, 0x1e, 0x1c, 0x1d, 0x20, 0x21},
+	.mac_flash_offset = 0x1FC000,
+};
diff --git a/machine/KP_9000_9XHML_X_V3_1.h b/machine/KP_9000_9XHML_X_V3_1.h
new file mode 100644
index 00000000..c100b5f8
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V3_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_9XHML_X_V3_1_H_
+#define _MACHINE_KP_9000_9XHML_X_V3_1_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-9XHML-X V3.1"
+
+#endif
diff --git a/machine/KP_9000_9XHML_X_V3_2.c b/machine/KP_9000_9XHML_X_V3_2.c
new file mode 120000
index 00000000..3e9156ac
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V3_2.c
@@ -0,0 +1 @@
+KP_9000_9XHML_X_V3_1.c
\ No newline at end of file
diff --git a/machine/KP_9000_9XHML_X_V3_2.h b/machine/KP_9000_9XHML_X_V3_2.h
new file mode 100644
index 00000000..e3b4eec2
--- /dev/null
+++ b/machine/KP_9000_9XHML_X_V3_2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_9XHML_X_V3_2_H_
+#define _MACHINE_KP_9000_9XHML_X_V3_2_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-9XHML-X V3.2"
+
+#endif
diff --git a/machine/KP_9000_9XH_X_EU.c b/machine/KP_9000_9XH_X_EU.c
new file mode 100644
index 00000000..7209e82b
--- /dev/null
+++ b/machine/KP_9000_9XH_X_EU.c
@@ -0,0 +1,25 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	.led_sets = { { LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
+			LEDS_2G5 | LEDS_LINK,
+			LEDS_1G | LEDS_LINK, 
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
+		    },
+};
diff --git a/machine/KP_9000_9XH_X_EU.h b/machine/KP_9000_9XH_X_EU.h
new file mode 100644
index 00000000..2269b8fb
--- /dev/null
+++ b/machine/KP_9000_9XH_X_EU.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_KP_9000_9XH_X_EU_H_
+#define _MACHINE_KP_9000_9XH_X_EU_H_
+
+#define MACHINE_MODEL "keepLink KP-9000-9XH-X-EU"
+
+#endif
diff --git a/machine/LIANGUO_HYWS_SGT0108S.c b/machine/LIANGUO_HYWS_SGT0108S.c
new file mode 100644
index 00000000..aff1713c
--- /dev/null
+++ b/machine/LIANGUO_HYWS_SGT0108S.c
@@ -0,0 +1,36 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 1,
+    .min_port = 0,
+    .max_port = 8,
+    .n_sfp = 1,
+    .log_to_phys_port = {2, 1, 4, 3, 5, 6, 7, 8, 9},
+    .phys_to_log_port = {1, 0, 3, 2, 4, 5, 6, 7, 8},
+    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+    .sfp_port[0].pin_los = GPIO37,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 1,
+    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+	.high_leds = { .mux = 0, .enable = 0 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+	.led_sets = { 
+		{ 
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // RJ45 Blue LEDs
+			LEDS_2G5 | LEDS_LINK, // RJ45 White LEDs
+			0,
+			0
+		},
+		{ 
+			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // SFP blue LED?
+			0,
+			0,
+			0
+		},
+	},
+};
diff --git a/machine/LIANGUO_HYWS_SGT0108S.h b/machine/LIANGUO_HYWS_SGT0108S.h
new file mode 100644
index 00000000..f82bd128
--- /dev/null
+++ b/machine/LIANGUO_HYWS_SGT0108S.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_LIANGUO_HYWS_SGT0108S_H_
+#define _MACHINE_LIANGUO_HYWS_SGT0108S_H_
+
+#define MACHINE_MODEL "Lianguo HYWS-SGT0108S"
+
+#endif
diff --git a/machine/LIANGUO_ZX_SWTGW215AS.c b/machine/LIANGUO_ZX_SWTGW215AS.c
new file mode 100644
index 00000000..70414eca
--- /dev/null
+++ b/machine/LIANGUO_ZX_SWTGW215AS.c
@@ -0,0 +1,33 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.mac_flash_offset = 0x1FC000,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green LED (right)
+					0, // unused
+					LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber LED (left)
+					0
+				  }, // unused
+				  { LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED
+					0, // unused
+					0, // unused
+					0
+				  }, // unused		    	},
+				},
+	.led_mux_custom = 0,
+};
diff --git a/machine/LIANGUO_ZX_SWTGW215AS.h b/machine/LIANGUO_ZX_SWTGW215AS.h
new file mode 100644
index 00000000..6c4e2210
--- /dev/null
+++ b/machine/LIANGUO_ZX_SWTGW215AS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_LIANGUO_ZX_SWTGW215AS_H_
+#define _MACHINE_LIANGUO_ZX_SWTGW215AS_H_
+
+#define MACHINE_MODEL "Lianguo ZX-SWTGW215AS"
+
+#endif
diff --git a/machine/ONT_S207CW_62TS_SE.c b/machine/ONT_S207CW_62TS_SE.c
new file mode 100644
index 00000000..6ba60778
--- /dev/null
+++ b/machine/ONT_S207CW_62TS_SE.c
@@ -0,0 +1,61 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 2,
+    .log_to_phys_port = {0, 0, 0, 5, 4, 3, 2, 1, 6},
+    .phys_to_log_port = {7, 6, 5, 4, 3, 8, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
+
+    // SFP port on SDS0 / logical port 3
+    .sfp_port[0].pin_detect = GPIO37,
+    .sfp_port[0].pin_los = GPIO_NA,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 0,
+    .sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+    // SFP port on SDS1 / logical port 8
+    .sfp_port[1].pin_detect = GPIO38,
+    .sfp_port[1].pin_los = GPIO_NA,
+    .sfp_port[1].pin_tx_disable = GPIO_NA,
+    .sfp_port[1].sds = 1,
+    .sfp_port[1].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+    .port_led_set = { 0, 0, 0, 3, 0, 0, 2, 2, 3},
+    .mac_flash_offset = 0x1FC000,
+    .led_sets = {
+        { // RJ45 Ports 3-4 (normal wiring)
+            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+            0,
+            0
+        },
+        { // Unused
+            0,
+            0,
+            0,
+            0
+        },
+        { // RJ45 Ports 1-2 (reversed wiring)
+            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+            0,
+            0
+        },
+        { // SFP Ports 5-6
+            LEDS_10G | LEDS_LINK | LEDS_ACT,
+            LEDS_2G5 | LEDS_1G | LEDS_LINK | LEDS_ACT,
+            0,
+            0
+        },
+    },
+    .led_mux_custom = 1,
+    .led_mux = {
+        0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+    },
+};
diff --git a/machine/ONT_S207CW_62TS_SE.h b/machine/ONT_S207CW_62TS_SE.h
new file mode 100644
index 00000000..9938b004
--- /dev/null
+++ b/machine/ONT_S207CW_62TS_SE.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_ONT_S207CW_62TS_SE_H_
+#define _MACHINE_ONT_S207CW_62TS_SE_H_
+
+#define MACHINE_MODEL "ONT-S207CW-62TS-SE / Binardat 2G06-04210GSM / Binardat 2G06-04210GS"
+
+#endif
diff --git a/machine/PB_2132.c b/machine/PB_2132.c
new file mode 100644
index 00000000..8822c066
--- /dev/null
+++ b/machine/PB_2132.c
@@ -0,0 +1,41 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO_NA,
+
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+
+	.led_sets = {
+		{
+			/* LED0 = RJ45: Amber LED: 2.5G */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			/* LED1 = RJ45: Green LED: 10M / 100M / 1000M */
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0
+		},
+		{
+			/* SFP+ single Green LED. */
+			LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0
+		},
+	},
+ };
diff --git a/machine/PB_2132.h b/machine/PB_2132.h
new file mode 100644
index 00000000..a3668767
--- /dev/null
+++ b/machine/PB_2132.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PB_2132_H_
+#define _MACHINE_PB_2132_H_
+
+#define MACHINE_MODEL "PB-2132"
+
+#endif
diff --git a/machine/PCB_K0402WS_V1.c b/machine/PCB_K0402WS_V1.c
new file mode 100644
index 00000000..0f365025
--- /dev/null
+++ b/machine/PCB_K0402WS_V1.c
@@ -0,0 +1,57 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+
+	/* Left SFP (logical 8, SDS1): GPIO30=ModAbs, GPIO37=RX_LOS */
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+	/* Right SFP (logical 3, SDS0): GPIO50=ModAbs, GPIO51=RX_LOS */
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+	.reset_pin = GPIO_NA,
+
+	/* These don't appear to be populated / wired-up; the power LED is always on */
+	.high_leds = { 0 },
+
+	/* Copper ports use SET0; SFP ports use SET1 */
+	.port_led_set = {0, 0, 0, 1, 0, 0, 0, 0, 1},
+
+	.led_sets = {
+		{	/* SET0: copper — LED0=amber (2.5G), LED2=green (1G/100M/10M) */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0
+		},
+		{	/* SET1: SFP — all speeds link/act */
+			LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0
+		},
+	},
+
+	.led_mux_custom = 1,
+	.led_mux = {
+		0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,  /* GPIO0-7: unused */
+		0x0f, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x12,        /* GPIO8-14 */
+		0x14, 0x15, 0x16, 0x18, 0x19, 0x1a,              /* GPIO15-20 */
+		0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x23         /* GPIO21-27 */
+	},
+};
diff --git a/machine/PCB_K0402WS_V1.h b/machine/PCB_K0402WS_V1.h
new file mode 100644
index 00000000..d1170aa7
--- /dev/null
+++ b/machine/PCB_K0402WS_V1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PCB_K0402WS_V1_H_
+#define _MACHINE_PCB_K0402WS_V1_H_
+
+#define MACHINE_MODEL "PCB-K0402WS-V1.0"
+
+#endif
diff --git a/machine/PCB_K0402WS_V2.c b/machine/PCB_K0402WS_V2.c
new file mode 100644
index 00000000..71334029
--- /dev/null
+++ b/machine/PCB_K0402WS_V2.c
@@ -0,0 +1,55 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 2,
+    .log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+    .phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+
+    /* Left SFP (logical 8, SDS1): GPIO30=ModAbs, GPIO37=RX_LOS */
+    .sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+    .sfp_port[0].pin_los = GPIO37,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 1,
+    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    /* Right SFP (logical 3, SDS0): GPIO50=ModAbs, GPIO51=RX_LOS */
+    .sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+    .sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
+    .sfp_port[1].pin_tx_disable = GPIO_NA,
+    .sfp_port[1].sds = 0,
+    .sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+
+    .high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+
+    /* Copper ports use SET0; SFP ports use SET1 */
+    .port_led_set = {0, 0, 0, 1, 0, 0, 0, 0, 1},
+
+    .led_sets = {
+        {   /* SET0: copper — LED0=amber (2.5G), LED2=green (1G/100M/10M) */
+            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+            0,
+            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+            0
+        },
+        {   /* SET1: SFP — all speeds link/act */
+            LEDS_10G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+            0,
+            0, 0
+        },
+    },
+
+    .led_mux_custom = 1,
+    .led_mux = {
+        0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,  /* GPIO0-7: unused */
+        0x0f, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x12,          /* GPIO8-14 */
+        0x14, 0x15, 0x16, 0x18, 0x19, 0x1a,                 /* GPIO15-20 */
+        0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x23            /* GPIO21-27 */
+    },
+};
diff --git a/machine/PCB_K0402WS_V2.h b/machine/PCB_K0402WS_V2.h
new file mode 100644
index 00000000..eb5337ab
--- /dev/null
+++ b/machine/PCB_K0402WS_V2.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PCB_K0402WS_V2_H_
+#define _MACHINE_PCB_K0402WS_V2_H_
+
+#define MACHINE_MODEL "PCB-K0402WS-V2.0"
+
+#endif
diff --git a/machine/PCB_K0402WS_V3.c b/machine/PCB_K0402WS_V3.c
new file mode 120000
index 00000000..1e9dcd82
--- /dev/null
+++ b/machine/PCB_K0402WS_V3.c
@@ -0,0 +1 @@
+HI_K0402WS.c
\ No newline at end of file
diff --git a/machine/PCB_K0402WS_V3.h b/machine/PCB_K0402WS_V3.h
new file mode 100644
index 00000000..f206079d
--- /dev/null
+++ b/machine/PCB_K0402WS_V3.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PCB_K0402WS_V3_H_
+#define _MACHINE_PCB_K0402WS_V3_H_
+
+#define MACHINE_MODEL "PCB-K0402WS-V3.0"
+
+#endif
diff --git a/machine/PCB_SWTG018AS_V2_1_0.c b/machine/PCB_SWTG018AS_V2_1_0.c
new file mode 100644
index 00000000..1501de45
--- /dev/null
+++ b/machine/PCB_SWTG018AS_V2_1_0.c
@@ -0,0 +1,42 @@
+#include "machine_defs.h"
+
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.mac_flash_offset = 0x1FC000,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,   // pulled low on module insert
+	.sfp_port[0].pin_los = GPIO_NA,     // no LOS pin wired
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	// LED wiring matches the SWTG018AS-A V2.0 (same PCB family)
+	.led_sets = {
+		{   /* RJ45: First LED, yellow, second LED: green */
+			LEDS_2G5 | LEDS_LINK,
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+		}, { /* SFP set (superseded by the raw register override in machine_custom_init) */
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			0,
+			0,
+		}},
+	.led_mux_custom = 1,
+	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
+		     0x09, 0x0c, 0x09, 0x0d, 0x10, // 65e4
+		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
+		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
+		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
+		     0x1d, 0x20, 0x21 },
+};
diff --git a/machine/PCB_SWTG018AS_V2_1_0.h b/machine/PCB_SWTG018AS_V2_1_0.h
new file mode 100644
index 00000000..fce78470
--- /dev/null
+++ b/machine/PCB_SWTG018AS_V2_1_0.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PCB_SWTG018AS_V2_1_0_H_
+#define _MACHINE_PCB_SWTG018AS_V2_1_0_H_
+
+#define MACHINE_MODEL "SWTGW218AS (SWTG018AS-V2.1.0)"
+
+#endif
diff --git a/machine/PCB_SWTG024AS_A_2_0_1.c b/machine/PCB_SWTG024AS_A_2_0_1.c
new file mode 100644
index 00000000..169e479a
--- /dev/null
+++ b/machine/PCB_SWTG024AS_A_2_0_1.c
@@ -0,0 +1,48 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 2,
+    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
+
+    // SFP port on SDS0 / logical port 3
+    .sfp_port[0].pin_detect = GPIO37,
+    .sfp_port[0].pin_los = GPIO_NA,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 0,
+    .sfp_port[0].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+
+    // SFP port on SDS1 / logical port 8
+    .sfp_port[1].pin_detect = GPIO38,
+    .sfp_port[1].pin_los = GPIO_NA,
+    .sfp_port[1].pin_tx_disable = GPIO_NA,
+    .sfp_port[1].sds = 1,
+    .sfp_port[1].i2c =  I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+    .port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+    .led_sets = {
+                    {
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+                            LEDS_DUPLEX,
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
+                    },
+                    {
+                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+                            LEDS_10G | LEDS_LINK | LEDS_ACT,
+                            LEDS_2G5 | LEDS_LINK,
+                            LEDS_COL | LEDS_DUPLEX
+                    },
+     },
+    .led_mux_custom = 1,
+    .led_mux = {
+                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+            },
+    };
diff --git a/machine/PCB_SWTG024AS_A_2_0_1.h b/machine/PCB_SWTG024AS_A_2_0_1.h
new file mode 100644
index 00000000..2d3b5c22
--- /dev/null
+++ b/machine/PCB_SWTG024AS_A_2_0_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_PCB_SWTG024AS_A_2_0_1_H_
+#define _MACHINE_PCB_SWTG024AS_A_2_0_1_H_
+
+#define MACHINE_MODEL "PCB-SWTG024AS-A-2.0.1"
+
+#endif
diff --git a/machine/POE_2G080110GS.c b/machine/POE_2G080110GS.c
new file mode 100644
index 00000000..73f6dc8c
--- /dev/null
+++ b/machine/POE_2G080110GS.c
@@ -0,0 +1,44 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{
+			/* SET0: RJ45  2.5G = amber, 1G/100M/10M = green */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT, /* amber */
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, /* green */
+			0,
+			0
+		},
+		{
+			/* SET1: SFP+ port = green */
+			LEDS_2G5 | LEDS_TWO_PAIR_1G | LEDS_1G | LEDS_500M | LEDS_100M | LEDS_10M |
+				LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_TWO_PAIR_5G | LEDS_5G | LEDS_TWO_PAIR_2G5,
+			0,
+			0,
+			0
+		}
+	},
+	.led_mux_custom = 1,
+	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08,
+			0x09, 0x0c, 0x09, 0x0d, 0x10,
+			0x11, 0x0e, 0x14, 0x11, 0x12,
+			0x15, 0x15, 0x16, 0x18, 0x19,
+			0x1a, 0x19, 0x1d, 0x1e, 0x1c,
+			0x1d, 0x20, 0x21 },
+};
diff --git a/machine/POE_2G080110GS.h b/machine/POE_2G080110GS.h
new file mode 100644
index 00000000..40ce3415
--- /dev/null
+++ b/machine/POE_2G080110GS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_POE_2G080110GS_H_
+#define _MACHINE_POE_2G080110GS_H_
+
+#define MACHINE_MODEL "MokerLink POE-2G080110GS"
+
+#endif
diff --git a/machine/SIRIVISION_S25G2206FP_V1_1.c b/machine/SIRIVISION_S25G2206FP_V1_1.c
new file mode 100644
index 00000000..fde745b5
--- /dev/null
+++ b/machine/SIRIVISION_S25G2206FP_V1_1.c
@@ -0,0 +1,41 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp= {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	// Left SFP port (J4)
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 39 */
+	// Right SFP port (J2)
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 40 */
+	.reset_pin = GPIO36_PWM_OUT,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{ /* RJ45: Green LED */
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			/* Amber LED */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0
+		}, { /* SFP PORT: SINGLE GREEN LED */
+			LEDS_10M | LEDS_100M | LEDS_1G | LEDS_2G5 | LEDS_10G | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0,
+		},
+	},
+};
diff --git a/machine/SIRIVISION_S25G2206FP_V1_1.h b/machine/SIRIVISION_S25G2206FP_V1_1.h
new file mode 100644
index 00000000..6dbb7c71
--- /dev/null
+++ b/machine/SIRIVISION_S25G2206FP_V1_1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SIRIVISION_S25G2206FP_V1_1_H_
+#define _MACHINE_SIRIVISION_S25G2206FP_V1_1_H_
+
+#define MACHINE_MODEL "SIRIVISION S25G2206FP V1.1"
+
+#endif
diff --git a/machine/SKS3200_8E1X.c b/machine/SKS3200_8E1X.c
new file mode 120000
index 00000000..2eb54be2
--- /dev/null
+++ b/machine/SKS3200_8E1X.c
@@ -0,0 +1 @@
+PCB_SWTG018AS_V2_1_0.c
\ No newline at end of file
diff --git a/machine/SKS3200_8E1X.h b/machine/SKS3200_8E1X.h
new file mode 100644
index 00000000..e644baf4
--- /dev/null
+++ b/machine/SKS3200_8E1X.h
@@ -0,0 +1,7 @@
+#ifndef _MACHINE_SKS3200_8E1X_H_
+#define _MACHINE_SKS3200_8E1X_H_
+
+#define MACHINE_MODEL "XikeStor SKS3200-8E1X"
+
+#endif
+
diff --git a/machine/STEAMEMO_IG204_V1.c b/machine/STEAMEMO_IG204_V1.c
new file mode 100644
index 00000000..23d876a7
--- /dev/null
+++ b/machine/STEAMEMO_IG204_V1.c
@@ -0,0 +1,50 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	// Left SFP port (5)
+	// LED pin 9
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	// Right SFP port (6)
+	// LED pin 24
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux =  LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+			{
+				// RJ45 Amber LED (left)
+				LEDS_2G5 | LEDS_LINK,
+				// RJ45 Green LED (Right)
+				LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+				0,
+				0,
+			},
+			{
+				// SFP LED
+				LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+				0, // unused
+				0, // unused
+				0
+			},
+		},
+	.led_mux_custom = 1,
+	.led_mux = {
+		0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x0f, 0x20, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x15, 0x16, 0x18, 0x19, 0x1a, 0x1c, 0x1d, 0x1e, 0x0c, 0x21, 0x22, 0x23
+	},
+};
diff --git a/machine/STEAMEMO_IG204_V1.h b/machine/STEAMEMO_IG204_V1.h
new file mode 100644
index 00000000..170840d7
--- /dev/null
+++ b/machine/STEAMEMO_IG204_V1.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_STEAMEMO_IG204_V1_H_
+#define _MACHINE_STEAMEMO_IG204_V1_H_
+
+#define MACHINE_MODEL "Steamemo IG204 V1"
+
+#endif
diff --git a/machine/SWGT024_V2_0_MANAGED.c b/machine/SWGT024_V2_0_MANAGED.c
new file mode 100644
index 00000000..ad52bc5b
--- /dev/null
+++ b/machine/SWGT024_V2_0_MANAGED.c
@@ -0,0 +1,42 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp= {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	// Left SFP port (J4)
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 39 */
+	// Right SFP port (J2)
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO_NA,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 40 */
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{ /* RJ45: Green LED */
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			/* Amber LED */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0
+		}, { /* SFP PORT: SINGLE GREEN LED */
+			LEDS_10M | LEDS_100M | LEDS_1G | LEDS_2G5 | LEDS_10G | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0,
+		},
+	},
+	.mac_flash_offset = 0x1FC000,
+};
diff --git a/machine/SWGT024_V2_0_MANAGED.h b/machine/SWGT024_V2_0_MANAGED.h
new file mode 100644
index 00000000..c5f95a04
--- /dev/null
+++ b/machine/SWGT024_V2_0_MANAGED.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWGT024_V2_0_MANAGED_H_
+#define _MACHINE_SWGT024_V2_0_MANAGED_H_
+
+#define MACHINE_MODEL "SWGT024 V2.0 Managed"
+
+#endif
diff --git a/machine/SWGT024_V2_0_UNMANAGED.c b/machine/SWGT024_V2_0_UNMANAGED.c
new file mode 100644
index 00000000..9008bb4b
--- /dev/null
+++ b/machine/SWGT024_V2_0_UNMANAGED.c
@@ -0,0 +1,41 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp= {0, 0, 0, 2, 0, 0, 0, 0, 1},
+	// Left SFP port (J4)
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 39 */
+	// Right SFP port (J2)
+	.sfp_port[1].pin_detect = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[1].pin_los = GPIO51_I2C_SDA2_UART1_RX,
+	.sfp_port[1].pin_tx_disable = GPIO_NA,
+	.sfp_port[1].sds = 0,
+	.sfp_port[1].i2c = I2CBUS( GPIO41_I2C_SDA3_MDIO1, GPIO40_I2C_SCL3_MDC1 ), /* GPIO 40 */
+	.reset_pin = GPIO_NA,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{ /* RJ45: Green LED */
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			/* Amber LED */
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			0
+		}, { /* SFP PORT: SINGLE GREEN LED */
+			LEDS_10M | LEDS_100M | LEDS_1G | LEDS_2G5 | LEDS_10G | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+			0,
+		},
+	},
+};
diff --git a/machine/SWGT024_V2_0_UNMANAGED.h b/machine/SWGT024_V2_0_UNMANAGED.h
new file mode 100644
index 00000000..8391b42a
--- /dev/null
+++ b/machine/SWGT024_V2_0_UNMANAGED.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWGT024_V2_0_UNMANAGED_H_
+#define _MACHINE_SWGT024_V2_0_UNMANAGED_H_
+
+#define MACHINE_MODEL "SWGT024 V2.0 Unmanaged"
+
+#endif
diff --git a/machine/SWTG018AS_A_V_2_0.c b/machine/SWTG018AS_A_V_2_0.c
new file mode 100644
index 00000000..8304bf7e
--- /dev/null
+++ b/machine/SWTG018AS_A_V_2_0.c
@@ -0,0 +1,39 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO48_I2C_SCL1,
+	.high_leds = { .mux = LED_27 | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{   /* RJ45: First LED, yellow, second LED: green */
+			LEDS_2G5 | LEDS_LINK,
+            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			0,
+			0,
+		}, { /* SFP PORT, SINGLE GREEN LED */
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT | LEDS_10G,
+			0,
+			0,
+			0,
+		}},
+	.led_mux_custom = 1,
+	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
+		     0x09, 0x0c, 0x09, 0x0d, 0x10, // 65e4
+		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
+		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
+		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
+		     0x1d, 0x20, 0x21 },
+};
diff --git a/machine/SWTG018AS_A_V_2_0.h b/machine/SWTG018AS_A_V_2_0.h
new file mode 100644
index 00000000..82b7f632
--- /dev/null
+++ b/machine/SWTG018AS_A_V_2_0.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWTG018AS_A_V_2_0_H_
+#define _MACHINE_SWTG018AS_A_V_2_0_H_
+
+#define MACHINE_MODEL "SWTG018AS-A V2.0"
+
+#endif
diff --git a/machine/SWTG024AS_A_2_0_1_5C_1SFP.c b/machine/SWTG024AS_A_2_0_1_5C_1SFP.c
new file mode 100644
index 00000000..2a3ad97b
--- /dev/null
+++ b/machine/SWTG024AS_A_2_0_1_5C_1SFP.c
@@ -0,0 +1,43 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 1,
+    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+    .sfp_port[0].pin_los = GPIO_NA,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 1,
+    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+    .port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	/* Ports 1-5 RJ45 use set 0, port 9 SFP uses set 1 
+	 * Ports 1-5: Green: 2.5GBit, Amber: 10/100/1000MBit
+	 * SFP-port: Blue: 10GBit, Green: 100MBit-2.5GBit
+	 */
+    .led_sets = {
+                    {
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+                            LEDS_DUPLEX,
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
+                    },
+                    {
+                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+                            LEDS_10G | LEDS_LINK | LEDS_ACT,
+                            LEDS_2G5 | LEDS_LINK,
+                            LEDS_COL | LEDS_DUPLEX
+                    },
+     },
+    .led_mux_custom = 1,
+    .led_mux = {
+                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+            },
+    };
diff --git a/machine/SWTG024AS_A_2_0_1_5C_1SFP.h b/machine/SWTG024AS_A_2_0_1_5C_1SFP.h
new file mode 100644
index 00000000..f492765f
--- /dev/null
+++ b/machine/SWTG024AS_A_2_0_1_5C_1SFP.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWTG024AS_A_2_0_1_5C_1SFP_H_
+#define _MACHINE_SWTG024AS_A_2_0_1_5C_1SFP_H_
+
+#define MACHINE_MODEL "SWTG024AS-A-V2.0.1-5C-1SFP"
+
+#endif
diff --git a/machine/SWTG024AS_V2_0.c b/machine/SWTG024AS_V2_0.c
new file mode 100644
index 00000000..eb0652e2
--- /dev/null
+++ b/machine/SWTG024AS_V2_0.c
@@ -0,0 +1,43 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+    .machine_name = MACHINE_MODEL,
+    .isRTL8373 = 0,
+    .min_port = 3,
+    .max_port = 8,
+    .n_sfp = 1,
+    .log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+    .phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+    .is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+    .sfp_port[0].pin_los = GPIO37,
+    .sfp_port[0].pin_tx_disable = GPIO_NA,
+    .sfp_port[0].sds = 1,
+    .sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+
+    .reset_pin = GPIO_NA,
+    .high_leds = { .mux =  LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+    .port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	/* Ports 1-5 RJ45 use set 0, port 9 SFP uses set 1 
+	 * Ports 1-5: Green: 2.5GBit, Amber: 10/100/1000MBit
+	 * SFP-port: Blue: 10GBit, Amber: 100MBit-2.5GBit
+	 */
+    .led_sets = {
+                    {
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+                            LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+                            LEDS_DUPLEX,
+                            LEDS_2G5 | LEDS_LINK | LEDS_ACT
+                    },
+                    {
+                            LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+                            LEDS_10G | LEDS_LINK | LEDS_ACT,
+                            LEDS_2G5 | LEDS_LINK,
+                            LEDS_COL | LEDS_DUPLEX
+                    },
+     },
+    .led_mux_custom = 1,
+    .led_mux = {
+                            0x00,0x01,0x04,0x05,0x08,0x09,0x0c,0x3f,0x0d,0x10,0x11,0x0e,0x14,0x11,0x12,0x15,0x15,0x16,0x18,0x19,0x1a,0x19,0x1d,0x1e,0x1c,0x1d,0x20,0x21
+            },
+    };
diff --git a/machine/SWTG024AS_V2_0.h b/machine/SWTG024AS_V2_0.h
new file mode 100644
index 00000000..bd37eece
--- /dev/null
+++ b/machine/SWTG024AS_V2_0.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWTG024AS_V2_0_H_
+#define _MACHINE_SWTG024AS_V2_0_H_
+
+#define MACHINE_MODEL "SWTG024AS-V2.0"
+
+#endif
diff --git a/machine/SWTGW218AS.c b/machine/SWTGW218AS.c
new file mode 100644
index 00000000..cbb2a2f0
--- /dev/null
+++ b/machine/SWTGW218AS.c
@@ -0,0 +1,33 @@
+#include "machine_defs.h"
+
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 1,
+	.mac_flash_offset = 0x1FC000,
+	.min_port = 0,
+	.max_port = 8,
+	.n_sfp = 1,
+	.log_to_phys_port = {1, 2, 3, 4, 5, 6, 7, 8, 9},
+	.phys_to_log_port = {0, 1, 2, 3, 4, 5, 6, 7, 8},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO30_ACL_BIT3_EN,
+	.sfp_port[0].pin_los = GPIO37,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO54_ACL_BIT2_EN,
+	.high_leds = { .mux = LED_27 | LED_28_SYS | LED_29, .enable = LED_28_SYS | LED_29 },
+	.port_led_set = { 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green LED (right)
+					0, // unused
+					LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber LED (left)
+					0
+				  }, // unused
+				  { LEDS_10G | LEDS_5G | LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT, // SFP LED
+					0, // unused
+					0, // unused
+					0
+				  }, // unused		    	},
+				},
+};
diff --git a/machine/SWTGW218AS.h b/machine/SWTGW218AS.h
new file mode 100644
index 00000000..ed9c9e54
--- /dev/null
+++ b/machine/SWTGW218AS.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_SWTGW218AS_H_
+#define _MACHINE_SWTGW218AS_H_
+
+#define MACHINE_MODEL "SWTGW218AS 8+1 Managed Switch"
+
+#endif
diff --git a/machine/TRENDNET_TEG_S562.c b/machine/TRENDNET_TEG_S562.c
new file mode 100644
index 00000000..3cfc12c5
--- /dev/null
+++ b/machine/TRENDNET_TEG_S562.c
@@ -0,0 +1,39 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 2,
+	.log_to_phys_port = {0, 0, 0, 6, 1, 2, 3, 4, 5},
+	.phys_to_log_port = {4, 5, 6, 7, 8, 3, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 1, 0, 0, 0, 0, 2},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO50_I2C_SCL2_UART1_TX,
+	.sfp_port[0].pin_tx_disable = GPIO54_ACL_BIT2_EN,
+	.sfp_port[0].sds = 0,
+	.sfp_port[0].i2c = I2CBUS( GPIO47_I2C_SDA0, GPIO46_I2C_SCL0 ),
+	.sfp_port[1].pin_detect = GPIO36_PWM_OUT,
+	.sfp_port[1].pin_los = GPIO37,
+	.sfp_port[1].pin_tx_disable = GPIO51_I2C_SDA2_UART1_RX,
+	.sfp_port[1].sds = 1,
+	.sfp_port[1].i2c = I2CBUS( GPIO49_I2C_SDA1, GPIO48_I2C_SCL1 ),
+	.reset_pin = GPIO_NA,
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	.led_sets = {
+		{
+			0, // Unused
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT, // Green
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT, // Amber
+			0 // Unused
+		},
+		{
+			0, // Unused
+			0, // Unused
+			LEDS_10G | LEDS_1G | LEDS_LINK | LEDS_ACT, // Green
+			0, // Unused
+		},
+	},
+
+};
diff --git a/machine/TRENDNET_TEG_S562.h b/machine/TRENDNET_TEG_S562.h
new file mode 100644
index 00000000..c08ae7a9
--- /dev/null
+++ b/machine/TRENDNET_TEG_S562.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_TRENDNET_TEG_S562_H_
+#define _MACHINE_TRENDNET_TEG_S562_H_
+
+#define MACHINE_MODEL "Trendnet TEG-S562"
+
+#endif
diff --git a/machine/YS25_0402M.c b/machine/YS25_0402M.c
new file mode 120000
index 00000000..ebd3a9a3
--- /dev/null
+++ b/machine/YS25_0402M.c
@@ -0,0 +1 @@
+SIRIVISION_S25G2206FP_V1_1.c
\ No newline at end of file
diff --git a/machine/YS25_0402M.h b/machine/YS25_0402M.h
new file mode 100644
index 00000000..1df79241
--- /dev/null
+++ b/machine/YS25_0402M.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_YS25_0402M_H_
+#define _MACHINE_YS25_0402M_H_
+
+#define MACHINE_MODEL "YuanLey YS25-0402M"
+
+#endif
diff --git a/machine/ZX310S_4T2XH.c b/machine/ZX310S_4T2XH.c
new file mode 100644
index 00000000..f5313e02
--- /dev/null
+++ b/machine/ZX310S_4T2XH.c
@@ -0,0 +1,43 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 1,
+	.n_10g = 1,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 1},
+	.sfp_port[0].pin_detect = GPIO38,
+	.sfp_port[0].pin_los = GPIO_NA,
+	.sfp_port[0].pin_tx_disable = GPIO_NA,
+	.sfp_port[0].sds = 1,
+	.sfp_port[0].i2c = I2CBUS( GPIO39_I2C_SDA4, GPIO40_I2C_SCL3_MDC1 ),
+	.reset_pin = GPIO48_I2C_SCL1,
+	.high_leds = { .mux =  LED_28_SYS, .enable = LED_27 | LED_28_SYS | LED_29 },
+	.led_mux_custom = 1,
+	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
+		     0x09, 0x0c, 0x3f, 0x0d, 0x10, // 65e4
+		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
+		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
+		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
+		     0x1d, 0x20, 0x21 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	/* Ports 1-4: Orange: 2.5GBit, Green: 10/100/1000MBit
+	 * Port 5: Blue: 10GBit, Green: 10Mbit-5GBit
+	 * SFP-port: Blue: 10GBit, Green 100MBit-5GBit
+	 */
+	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			LEDS_DUPLEX,
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
+		      {
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT | LEDS_5G,
+			LEDS_LINK | LEDS_ACT | LEDS_10G,
+			LEDS_2G5 | LEDS_LINK,
+			LEDS_COL | LEDS_DUPLEX
+		      }
+		    },
+};
diff --git a/machine/ZX310S_4T2XH.h b/machine/ZX310S_4T2XH.h
new file mode 100644
index 00000000..f0873be3
--- /dev/null
+++ b/machine/ZX310S_4T2XH.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_ZX310S_4T2XH_H_
+#define _MACHINE_ZX310S_4T2XH_H_
+
+#define MACHINE_MODEL "ZX310S-4T2XH"
+
+#endif
diff --git a/machine/ZX310S_4T2XT.c b/machine/ZX310S_4T2XT.c
new file mode 100644
index 00000000..c7ec95b9
--- /dev/null
+++ b/machine/ZX310S_4T2XT.c
@@ -0,0 +1,37 @@
+#include "machine_defs.h"
+
+__code const struct machine machine = {
+	.machine_name = MACHINE_MODEL,
+	.isRTL8373 = 0,
+	.min_port = 3,
+	.max_port = 8,
+	.n_sfp = 0,
+	.n_10g = 2,
+	.log_to_phys_port = {0, 0, 0, 5, 1, 2, 3, 4, 6},
+	.phys_to_log_port = {4, 5, 6, 7, 3, 8, 0, 0, 0},
+	.is_sfp = {0, 0, 0, 0, 0, 0, 0, 0, 0},
+	.reset_pin = GPIO48_I2C_SCL1,
+	.high_leds = { .mux = LED_28_SYS | LED_29, .enable = LED_27 | LED_28_SYS | LED_29 },
+	.led_mux_custom = 1,
+	.led_mux = { 0x00, 0x01, 0x04, 0x05, 0x08, // 65e0
+		     0x09, 0x0c, 0x3f, 0x0d, 0x10, // 65e4
+		     0x11, 0x0e, 0x14, 0x11, 0x12, // 65e8
+		     0x15, 0x15, 0x16, 0x18, 0x19, // 65ec
+		     0x1a, 0x19, 0x1d, 0x1e, 0x1c, // 65f0
+		     0x1d, 0x20, 0x21 },
+	.port_led_set = { 0, 0, 0, 1, 0, 0, 0, 0, 1},
+	/* Ports 1-4: Green: 2.5GBit, Orange: 10/100/1000MBit
+	 * Ports 5-6: Green: 10GBit, Orange: <= 5GBit
+	 */
+	.led_sets = { { LEDS_2G5 | LEDS_LINK | LEDS_ACT,
+			LEDS_1G | LEDS_100M | LEDS_10M | LEDS_LINK | LEDS_ACT,
+			LEDS_DUPLEX,
+			LEDS_2G5 | LEDS_LINK | LEDS_ACT },
+		      {
+			LEDS_2G5 | LEDS_1G | LEDS_100M | LEDS_LINK | LEDS_ACT,
+			LEDS_LINK | LEDS_ACT | LEDS_10G | LEDS_5G,
+			LEDS_2G5 | LEDS_LINK,
+			LEDS_COL | LEDS_DUPLEX
+		      }
+		    },
+};
diff --git a/machine/ZX310S_4T2XT.h b/machine/ZX310S_4T2XT.h
new file mode 100644
index 00000000..15b76217
--- /dev/null
+++ b/machine/ZX310S_4T2XT.h
@@ -0,0 +1,6 @@
+#ifndef _MACHINE_ZX310S_4T2XT_H_
+#define _MACHINE_ZX310S_4T2XT_H_
+
+#define MACHINE_MODEL "ZX310S_4T2XT"
+
+#endif
diff --git a/machine/default_machine.h b/machine/default_machine.h
new file mode 100644
index 00000000..0919674f
--- /dev/null
+++ b/machine/default_machine.h
@@ -0,0 +1,17 @@
+#ifndef _MACHINE_DEFAULT_H_
+#define _MACHINE_DEFAULT_H_
+
+/*
+ * Fallback selected by machine.h when MACHINE_NAME is not defined on the
+ * command line. Firmware builds always pass -DMACHINE_NAME=<MACHINE>, so this
+ * is used by translation units that only need the machine.h declarations --
+ * notably the host-side tests under test/, which define their own `machine`
+ * object.
+ *
+ * MACHINE_MODEL is deliberately not defined here: a build that reaches this
+ * header must not silently pick up some default model string. Any code that
+ * needs MACHINE_MODEL therefore fails to compile unless a real machine is
+ * selected.
+ */
+
+#endif
diff --git a/machine/machine_defs.h b/machine/machine_defs.h
new file mode 100644
index 00000000..94b989c4
--- /dev/null
+++ b/machine/machine_defs.h
@@ -0,0 +1,44 @@
+#ifndef _MACHINE_DEFS_H_
+#define _MACHINE_DEFS_H_
+
+/*
+ * Shared prelude for the per-machine board definitions in this directory.
+ *
+ * Each .c file in this directory defines exactly one board's
+ * `__code const struct machine machine`, and is named after the MACHINE_* symbol
+ * it belongs to. The Makefile picks the file matching $(MACHINE), so no #if/#elif
+ * selection happens here.
+ */
+
+#include "machine.h"
+#include "rtl837x_pins.h"
+#include "rtl837x_leds.h"
+#include "rtl837x_sfr.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_common.h"
+
+#define I2CBUS_INVALID (7)
+// This is a MACRO to check if I2C_BUS_FROM_SDA_PIN or I2C_BUS_FROM_SCL_PIN don't return I2CBUS_INVALID.
+// When I2CBUS_INVALID is returned, the compiler stops with
+// "error 176: sizeof applied to an incomplete type" pointing at the offending .i2c line.
+#define I2CBUS_VALID(bus) (0 * sizeof(char[(bus) != I2CBUS_INVALID ? 1 : 0]))
+#define I2CBUS(sda, scl) \
+	((uint8_t)((I2C_BUS_FROM_SCL_PIN(scl) << RTL837X_REG_I2C_SCL_SHIFT) | \
+		   (I2C_BUS_FROM_SDA_PIN(sda) << RTL837X_REG_I2C_SDA_SHIFT) | \
+		   I2CBUS_VALID(I2C_BUS_FROM_SCL_PIN(scl)) | \
+		   I2CBUS_VALID(I2C_BUS_FROM_SDA_PIN(sda))))
+
+#define I2C_BUS_FROM_SDA_PIN(sda_pin) \
+	((sda_pin) == GPIO47_I2C_SDA0 ? 0 : \
+	 (sda_pin) == GPIO49_I2C_SDA1 ? 1 : \
+	 (sda_pin) == GPIO51_I2C_SDA2_UART1_RX ? 2 : \
+	 (sda_pin) == GPIO41_I2C_SDA3_MDIO1 ? 3 : \
+	 (sda_pin) == GPIO39_I2C_SDA4 ? 4 : I2CBUS_INVALID)
+
+#define I2C_BUS_FROM_SCL_PIN(scl_pin) \
+	((scl_pin) == GPIO46_I2C_SCL0 ? 0 : \
+	 (scl_pin) == GPIO48_I2C_SCL1 ? 1 : \
+	 (scl_pin) == GPIO50_I2C_SCL2_UART1_TX ? 2 : \
+	 (scl_pin) == GPIO40_I2C_SCL3_MDC1 ? 3 : I2CBUS_INVALID)
+
+#endif
diff --git a/machine_init.c b/machine_init.c
index 0e88002a..efb16e61 100644
--- a/machine_init.c
+++ b/machine_init.c
@@ -19,6 +19,7 @@
 	defined(MACHINE_HI_K0402WS) || \
 	defined(MACHINE_PCB_K0402WS_V2) || \
 	defined(MACHINE_PCB_K0402WS_V3) || \
+	defined(MACHINE_2G5F4_10G2_V1_01) || \
 	defined(MACHINE_FNS1200P)
 void machine_custom_init(void) __banked
 {
diff --git a/rtl837x_cabletest.c b/rtl837x_cabletest.c
new file mode 100644
index 00000000..120e87fa
--- /dev/null
+++ b/rtl837x_cabletest.c
@@ -0,0 +1,216 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include "rtl837x_common.h"
+#include "rtl837x_sfr.h"
+#include "rtl837x_cabletest.h"
+#include "rtl837x_phy.h"
+#include "phy.h"
+#include "machine.h"
+
+#pragma codeseg BANK3
+#pragma constseg BANK3
+
+#define RTCT_CTRL		0xa422
+#define RTCT_CTRL_START		0x00f1
+#define RTCT_CTRL_DONE		0x8000
+#define RTCT_SRAM_ADDR		0xa436
+#define RTCT_SRAM_DATA		0xa438
+#define RTCT_SRAM_STATUS	0x8026
+#define RTCT_SRAM_LEN		0x8028
+
+#define RTCT_ST_BUSY		0x01
+#define RTCT_ST_MISMATCH	0x06
+#define RTCT_ST_OPEN		0x08
+#define RTCT_ST_SHORT		0x10
+#define RTCT_ST_OK		0x20
+#define RTCT_ST_DONE		0x40
+#define RTCT_ST_CROSS_SHORT	0x80
+
+#define RTCT_LEN_ZERO		150
+#define RTCT_LEN_PER_50CM	43
+
+#define PHY_POWER		0xa610
+#define PHY_POWER_OFF		0x0800
+
+#define BMCR_PDOWN_1G_FULL	0x0940
+#define BMCR_1G_FULL		0x0140
+#define BMCR_ANRESTART		0x0200
+
+#define CT_IDLE			0
+#define CT_SILENCE		1
+#define CT_RUN			2
+#define CT_POLL_TICKS		(SYS_TICK_HZ / 20)
+#define CT_POLLS		100
+
+extern volatile __xdata uint32_t ticks;
+extern __code const struct machine machine;
+extern __xdata struct machine_runtime machine_detected;
+
+__xdata uint8_t ct_state = CT_IDLE;
+__xdata uint8_t ct_port;
+__xdata uint8_t ct_last;
+__xdata uint8_t ct_polls;
+__xdata uint8_t ct_valid;
+__xdata uint8_t ct_have = 0;
+__xdata uint8_t ct_pair;
+__xdata uint8_t ct_flags;
+__xdata uint16_t ct_bmcr;
+__xdata uint8_t ct_result[4];
+__xdata uint16_t ct_len[4];
+
+void rtl_phy_cable_test_start(uint8_t port) __banked
+{
+	phy_write(port, PHY_MMD31, PHY_MMD31_FEDCR, BMCR_1G_FULL);
+	phy_write(port, PHY_MMD31, RTCT_CTRL, RTCT_CTRL_START);
+}
+
+bool rtl_phy_cable_test_get_status(uint8_t port) __banked
+{
+	phy_read(port, PHY_MMD31, RTCT_CTRL);
+	if (!(SFR_DATA_U16 & RTCT_CTRL_DONE))
+		return false;
+
+	for (ct_pair = 0; ct_pair < 4; ct_pair++) {
+		// The flags are the low byte of the word, not the high one.
+		phy_write(port, PHY_MMD31, RTCT_SRAM_ADDR, RTCT_SRAM_STATUS + (ct_pair << 2));
+		phy_read(port, PHY_MMD31, RTCT_SRAM_DATA);
+		ct_flags = SFR_DATA_U16;
+		if (!(ct_flags & RTCT_ST_DONE))
+			return false;
+		if (ct_flags & RTCT_ST_OK)
+			ct_result[ct_pair] = CABLE_RESULT_OK;
+		else if (ct_flags & RTCT_ST_OPEN)
+			ct_result[ct_pair] = CABLE_RESULT_OPEN;
+		else if (ct_flags & RTCT_ST_SHORT)
+			ct_result[ct_pair] = CABLE_RESULT_SAME_SHORT;
+		else if (ct_flags & RTCT_ST_BUSY)
+			ct_result[ct_pair] = CABLE_RESULT_UNSPEC;
+		else if (ct_flags & RTCT_ST_CROSS_SHORT)
+			ct_result[ct_pair] = CABLE_RESULT_CROSS_SHORT;
+		else if (ct_flags & RTCT_ST_MISMATCH)
+			ct_result[ct_pair] = CABLE_RESULT_MISMATCH;
+		else
+			ct_result[ct_pair] = CABLE_RESULT_UNSPEC;
+
+		phy_write(port, PHY_MMD31, RTCT_SRAM_ADDR, RTCT_SRAM_LEN + (ct_pair << 2));
+		phy_read(port, PHY_MMD31, RTCT_SRAM_DATA);
+		ct_len[ct_pair] = SFR_DATA_U16;
+		ct_len[ct_pair] = ct_len[ct_pair] > RTCT_LEN_ZERO ? ct_len[ct_pair] - RTCT_LEN_ZERO : 0;
+		ct_len[ct_pair] = ct_len[ct_pair] * 5 / RTCT_LEN_PER_50CM;
+	}
+	return true;
+}
+
+static void cabletest_print(void)
+{
+	print_string("Cable test port ");
+	print_phys_port(ct_port);
+	if (!ct_valid) {
+		print_string(": timed out\n");
+		return;
+	}
+	write_char('\n');
+	for (ct_pair = 0; ct_pair < 4; ct_pair++) {
+		print_string("Pair ");
+		write_char('A' + ct_pair);
+		switch (ct_result[ct_pair]) {
+		case CABLE_RESULT_OK:
+			print_string(": ok\n");
+			continue;
+		case CABLE_RESULT_OPEN:
+			print_string(": open at ");
+			break;
+		case CABLE_RESULT_SAME_SHORT:
+			print_string(": short at ");
+			break;
+		case CABLE_RESULT_CROSS_SHORT:
+			print_string(": short to another pair at ");
+			break;
+		case CABLE_RESULT_MISMATCH:
+			print_string(": impedance mismatch at ");
+			break;
+		default:
+			print_string(": unknown\n");
+			continue;
+		}
+		itoa_short(ct_len[ct_pair] / 10);
+		write_char('.');
+		write_char('0' + ct_len[ct_pair] % 10);
+		print_string(" m\n");
+	}
+}
+
+void cabletest_run(void) __banked
+{
+	if (ct_state) {
+		print_string("Cable test running on port ");
+		print_phys_port(ct_port);
+		write_char('\n');
+		return;
+	}
+	if (!machine_detected.isRTL8373 && (phy_settings.port < 4 || phy_settings.port > 7)) {
+		print_string("No cable test on this PHY\n");
+		return;
+	}
+
+	// A test started on a port that is off never ends and blocks the PHY until reset.
+	phy_read(phy_settings.port, PHY_MMD31, PHY_POWER);
+	if (SFR_DATA_U16 & PHY_POWER_OFF) {
+		print_string("Port is off\n");
+		return;
+	}
+
+	ct_port = phy_settings.port;
+	phy_read(ct_port, PHY_MMD31, PHY_MMD31_FEDCR);
+	ct_bmcr = SFR_DATA_U16;
+
+	// Forcing the speed leaves the link up; only a power-down silences the partner.
+	phy_write(ct_port, PHY_MMD31, PHY_MMD31_FEDCR, BMCR_PDOWN_1G_FULL);
+	ct_last = ticks;
+	ct_have = 0;
+	ct_state = CT_SILENCE;
+	print_string("Cable test started\n");
+}
+
+void cabletest_show(void) __banked
+{
+	if (ct_state)
+		print_string("Cable test running\n");
+	else if (ct_port != phy_settings.port || !ct_have)
+		print_string("No cable test result\n");
+	else
+		cabletest_print();
+}
+
+void cabletest_tick(void) __banked
+{
+	if (ct_state == CT_SILENCE) {
+		if (!TICKS_DUE(ct_last, SYS_TICK_HZ))
+			return;
+		phy_read(ct_port, PHY_MMD31, PHY_POWER);
+		if (SFR_DATA_U16 & PHY_POWER_OFF) {
+			phy_write(ct_port, PHY_MMD31, PHY_MMD31_FEDCR, ct_bmcr);
+			ct_state = CT_IDLE;
+			print_string("Cable test aborted, port is off\n");
+			return;
+		}
+		rtl_phy_cable_test_start(ct_port);
+		ct_polls = CT_POLLS;
+		ct_last = ticks;
+		ct_state = CT_RUN;
+		return;
+	}
+	if (ct_state != CT_RUN || !TICKS_DUE(ct_last, CT_POLL_TICKS))
+		return;
+	ct_last = ticks;
+
+	ct_valid = rtl_phy_cable_test_get_status(ct_port);
+	if (!ct_valid && --ct_polls)
+		return;
+
+	phy_write(ct_port, PHY_MMD31, RTCT_CTRL, 0);
+	phy_write(ct_port, PHY_MMD31, PHY_MMD31_FEDCR, ct_bmcr | BMCR_ANRESTART);
+	ct_have = 1;
+	ct_state = CT_IDLE;
+	cabletest_print();
+}
diff --git a/rtl837x_cabletest.h b/rtl837x_cabletest.h
new file mode 100644
index 00000000..5846b82f
--- /dev/null
+++ b/rtl837x_cabletest.h
@@ -0,0 +1,21 @@
+#ifndef _RTL837X_CABLETEST_H_
+#define _RTL837X_CABLETEST_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define CABLE_RESULT_UNSPEC		0
+#define CABLE_RESULT_OK			1
+#define CABLE_RESULT_OPEN		2
+#define CABLE_RESULT_SAME_SHORT		3
+#define CABLE_RESULT_CROSS_SHORT	4
+#define CABLE_RESULT_MISMATCH		5
+
+void rtl_phy_cable_test_start(uint8_t port) __banked;
+bool rtl_phy_cable_test_get_status(uint8_t port) __banked;
+
+void cabletest_run(void) __banked;
+void cabletest_show(void) __banked;
+void cabletest_tick(void) __banked;
+
+#endif
diff --git a/rtl837x_common.h b/rtl837x_common.h
index a36d41fc..4d4047f9 100644
--- a/rtl837x_common.h
+++ b/rtl837x_common.h
@@ -16,12 +16,14 @@
 #define TICKS_DUE(last, period)	((uint8_t)((uint8_t)ticks - (last)) >= (period))
 
 #define CPU_PORT        9
+#define MAC_ADDR_LEN    6
+#define PORT_BIT(p)     ((uint16_t)1 << (p))
 #define NUL			'\0'
 
 // Define Port-masks for 9-port devices and 6-port devices
 #define PMASK_9		0x1ff
 #define PMASK_6		0x1f8
-#define PMASK_CPU	0x200
+#define PMASK_CPU	((uint16_t)(1 << CPU_PORT))
 
 // Defines a port mask for dropping all packets on Lookup-miss
 #define LOOKUP_MISS_DROP_6  0x00015540
@@ -140,7 +142,7 @@ extern __xdata bool stp_enabled;
  * advertises it as the System Name TLV) read it from here. */
 extern __xdata char hostname[24];
 
-extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE+2];
+extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 extern __xdata struct uip_eth_addr uip_ethaddr;
 
 // Headers for calls in the common code area (HOME/BANK0)
diff --git a/rtl837x_igmp.c b/rtl837x_igmp.c
index 3ef2b2ec..35940446 100644
--- a/rtl837x_igmp.c
+++ b/rtl837x_igmp.c
@@ -22,13 +22,13 @@ extern __xdata uint8_t igmpEnabled;
 #include "uip.h"
 #include "uip_arp.h"
 
-#pragma codeseg BANK1
-#pragma constseg BANK1
+#pragma codeseg BANK3
+#pragma constseg BANK3
 
 extern __xdata uint8_t cpuPort;
 extern __xdata uint8_t sfr_data[4];
 extern __xdata struct machine_runtime machine_detected;
-extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE + 2];
+extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 
 __xdata uint16_t idx;
 #define IGMP_IP_HDR		offsetof(struct igmp_pkt, hlen)
@@ -107,8 +107,7 @@ void igmp_setup(void) __banked
 	REG_SET(RTL837X_IPV4_UNKN_MC_FLD_PMSK, mask);
 	REG_SET(RTL837X_IPV6_UNKN_MC_FLD_PMSK, mask);
 
-	// Enable lookup of IPv4 MC addresses in table
-	reg_bit_set(RTL837X_L2_CTRL, L2_CTRL_LUT_IPMC_HASH);
+	reg_bit_clear(RTL837X_L2_CTRL, L2_CTRL_LUT_IPMC_HASH);
 
 	/* Configure per-port IGMP operations when protocol messages are received
 	 * bits 0-9 enable MC protocol snooping
@@ -145,6 +144,8 @@ void igmp_enable(void) __banked
 {
 	print_string("igmp_enable called\n");
 	igmpEnabled = 1;
+	// Enable lookup of IPv4 MC addresses in table
+	reg_bit_set(RTL837X_L2_CTRL, L2_CTRL_LUT_IPMC_HASH);
 	// Configure trapping of unhandled IGMP protocol packets to CPU
 	REG_SET(RTL837X_IGMP_TRAP_CFG, IGMP_CPU_PORT | IGMP_TRAP_PRIORITY);
 
@@ -250,6 +251,8 @@ uint8_t igmp_packet_handler(void) __banked
 #ifdef DEBUG
 	print_string("IGMP join "); print_byte(igmp_join); write_char('\n');
 #endif
+	if (uip_buf[igmp_grp] == IGMP_LOCAL_NET_0 && !uip_buf[igmp_grp + 1] && !uip_buf[igmp_grp + 2])
+		return 1;
 
 #ifdef IPMC_USES_L3MC
 	memset((__xdata uint8_t *)&entry, 0, sizeof(struct ipmc_table_entry));
diff --git a/rtl837x_igmp.h b/rtl837x_igmp.h
index d6d28f81..1b56e367 100644
--- a/rtl837x_igmp.h
+++ b/rtl837x_igmp.h
@@ -10,6 +10,7 @@
 #define IGMP_V3_REPORT		0x22
 #define IGMP_V3_TO_INCLUDE	3
 #define IGMP_V3_TO_EXCLUDE	4
+#define IGMP_LOCAL_NET_0	224
 
 void igmp_setup(void) __banked;
 void igmp_enable(void) __banked;
diff --git a/rtl837x_lacp.c b/rtl837x_lacp.c
new file mode 100644
index 00000000..2573bc34
--- /dev/null
+++ b/rtl837x_lacp.c
@@ -0,0 +1,504 @@
+/*
+ * LACP (IEEE 802.3ad Clause 43) driver for the RTL837x platform.
+ * This code is in the Public Domain.
+ */
+
+// #define DEBUG
+
+#pragma codeseg BANK3
+#pragma constseg BANK3
+
+#include <stdint.h>
+#include "rtl837x_common.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_lacp.h"
+#include "rtl837x_trap.h"
+#include "rtl837x_port.h"
+#include "uip.h"
+#include "machine.h"
+
+extern __code const struct machine machine;
+extern __xdata struct machine_runtime machine_detected;
+extern __xdata uint16_t management_vlan;
+extern __xdata struct uip_eth_addr uip_ethaddr;
+extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
+
+/* 20-byte Actor/Partner information body (802.3ad 43.4.2.2), network byte order */
+struct lacp_info {
+	uint16_t sys_prio;
+	uint8_t  sys[MAC_ADDR_LEN];
+	uint16_t key;
+	uint16_t port_prio;
+	uint16_t port;
+	uint8_t  state;
+	uint8_t  reserved[3];
+};
+
+/* Outgoing LACPDU (no VLAN tag on TX, as in stp_pkt) */
+struct lacpdu {
+	uint8_t  dst[MAC_ADDR_LEN];
+	uint8_t  src[MAC_ADDR_LEN];
+	struct rtl_tag rtl_tag;
+	uint16_t ethertype;
+	uint8_t  subtype;
+	uint8_t  version;
+	uint8_t  tlv_actor;
+	uint8_t  actor_len;
+	struct lacp_info actor;
+	uint8_t  tlv_partner;
+	uint8_t  partner_len;
+	struct lacp_info partner;
+	uint8_t  tlv_collector;
+	uint8_t  collector_len;
+	uint16_t collector_max_delay;
+	uint8_t  collector_reserved[12];
+	uint8_t  tlv_terminator;
+	uint8_t  terminator_len;
+	uint8_t  terminator_reserved[50];
+};
+
+/* Incoming LACPDU, split because a VLAN tag sits between the two only when the
+ * frame was forwarded: a trapped one carries none (cf. stp_pkt_in) */
+struct lacpdu_in_hdr {
+	uint8_t  dst[MAC_ADDR_LEN];
+	uint8_t  src[MAC_ADDR_LEN];
+	struct rtl_tag rtl_tag;
+};
+
+struct lacpdu_in {
+	uint16_t ethertype;
+	uint8_t  subtype;
+	uint8_t  version;
+	uint8_t  tlv_actor;
+	uint8_t  actor_len;
+	struct lacp_info actor;
+	uint8_t  tlv_partner;
+	uint8_t  partner_len;
+	struct lacp_info partner;
+};
+
+__xdata uint8_t lacp_rxbody;
+
+#define LACP_O ((__xdata struct lacpdu        *)&uip_buf[RTL_FRAME_DESC_SIZE])
+#define LACP_H ((__xdata struct lacpdu_in_hdr *)&uip_buf[0])
+#define LACP_I ((__xdata struct lacpdu_in     *)&uip_buf[lacp_rxbody])
+
+__xdata uint8_t  lacp_actor_state[10];
+__xdata uint8_t  lacp_rx_state[10];
+__xdata uint8_t  lacp_partner_state[10];
+__xdata uint8_t  lacp_partner_sys[10][MAC_ADDR_LEN];
+__xdata uint16_t lacp_partner_key[10];
+__xdata uint16_t lacp_partner_port[10];
+__xdata uint16_t lacp_partner_sys_prio[10];
+__xdata uint16_t lacp_partner_port_prio[10];
+__xdata uint16_t lacp_periodic[10];
+__xdata uint16_t lacp_timeout[10];
+__xdata uint8_t  lacp_ntt[10];
+
+#define LACP_TICK_STEP	(SYS_TICK_HZ / 50)
+#define LACP_CATCH_UP	8
+__xdata uint8_t lacp_tick_last;
+extern volatile __xdata uint32_t ticks;
+
+__xdata uint16_t lacp_lag_ports[LACP_NUM_LAGS];
+__xdata uint8_t  lacp_port_lag[10];
+__xdata uint8_t  lacp_agg_sys[LACP_NUM_LAGS][MAC_ADDR_LEN];
+__xdata uint8_t  lacp_agg_valid[LACP_NUM_LAGS];
+__xdata uint16_t lacp_members_last[LACP_NUM_LAGS];
+
+__xdata uint16_t lacp_scratch_mask;
+__xdata uint8_t  lacp_scratch_flag;
+__xdata uint8_t  lacp_scratch_lag;
+
+__xdata uint16_t lacp_rx_count[10];
+
+
+static uint8_t lacp_sys_eq(__xdata uint8_t *a, __xdata uint8_t *b)
+{
+	for (uint8_t i = 0; i < MAC_ADDR_LEN; i++) {
+		if (a[i] != b[i])
+			return 0;
+	}
+	return 1;
+}
+
+
+static uint8_t lacp_port_selected(uint8_t port)
+{
+	uint8_t lag = lacp_port_lag[port];
+	if (lag == LACP_LAG_NONE)
+		return 0;
+	if (lacp_rx_state[port] != LACP_RX_CURRENT)
+		return 0;
+	if (!(lacp_partner_state[port] & LACP_STATE_AGGREGATION))
+		return 0;
+	if (!lacp_agg_valid[lag])
+		return 0;
+	return lacp_sys_eq(lacp_partner_sys[port], lacp_agg_sys[lag]);
+}
+
+
+static uint8_t lacp_mux_machine(uint8_t port)
+{
+	uint8_t old = lacp_actor_state[port];
+	uint8_t new = old;
+
+	if (lacp_port_selected(port)) {
+		new |= LACP_STATE_SYNC;
+		if (lacp_partner_state[port] & LACP_STATE_SYNC)
+			new |= LACP_STATE_COLLECTING | LACP_STATE_DISTRIBUTING;
+		else
+			new &= ~(LACP_STATE_COLLECTING | LACP_STATE_DISTRIBUTING);
+	} else {
+		new &= ~(LACP_STATE_SYNC | LACP_STATE_COLLECTING | LACP_STATE_DISTRIBUTING);
+	}
+
+	if (new == old)
+		return 0;
+	lacp_actor_state[port] = new;
+	return 1;
+}
+
+void lacp_mux_update(void) __banked
+{
+	for (uint8_t lag = 0; lag < LACP_NUM_LAGS; lag++) {
+		if (!lacp_lag_ports[lag])
+			continue;
+		lacp_scratch_mask = 0;
+		for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+			if (lacp_port_lag[i] != lag)
+				continue;
+			if ((lacp_actor_state[i] & LACP_STATE_FULL) == LACP_STATE_FULL
+			    && (lacp_partner_state[i] & LACP_STATE_SYNC))
+				lacp_scratch_mask |= PORT_BIT(i);
+		}
+		if (lacp_scratch_mask != lacp_members_last[lag]) {
+			lacp_members_last[lag] = lacp_scratch_mask;
+			port_lag_members_set(lag, lacp_scratch_mask);
+		}
+	}
+}
+
+
+void lacp_send(uint8_t port) __banked
+{
+	uint16_t saved_mgmt_vlan;
+
+	memset((__xdata uint8_t *)LACP_O, 0, sizeof(struct lacpdu));
+	LACP_O->dst[0] = 0x01; LACP_O->dst[1] = 0x80; LACP_O->dst[2] = 0xc2;
+	LACP_O->dst[3] = 0x00; LACP_O->dst[4] = 0x00; LACP_O->dst[5] = LACP_DST5;
+	memcpy(LACP_O->src, uip_ethaddr.addr, MAC_ADDR_LEN);
+
+	LACP_O->rtl_tag.tag = HTONS(RTL_FRAME_TAG_ID);
+	LACP_O->rtl_tag.version = RTL_FRAME_TAG_VERSION;
+	LACP_O->rtl_tag.reason = 0x00;
+	LACP_O->rtl_tag.flags = HTONS(RTL_TAG_LEARN_DIS | RTL_TAG_KEEP);
+	LACP_O->rtl_tag.pmask = HTONS(PORT_BIT(port));
+
+	LACP_O->ethertype = HTONS(SLOW_PROTO_ETHERTYPE);
+	LACP_O->subtype = SLOW_PROTO_SUBTYPE_LACP;
+	LACP_O->version = LACP_VERSION;
+
+	LACP_O->tlv_actor = LACP_TLV_ACTOR;
+	LACP_O->actor_len = LACP_TLV_LEN_INFO;
+	LACP_O->actor.sys_prio = HTONS(LACP_SYS_PRIO);
+	memcpy(LACP_O->actor.sys, uip_ethaddr.addr, MAC_ADDR_LEN);
+	LACP_O->actor.key = HTONS((uint16_t)(lacp_port_lag[port] + 1));
+	LACP_O->actor.port_prio = HTONS(LACP_DEF_PORT_PRIO);
+	LACP_O->actor.port = HTONS((uint16_t)port + 1);
+	LACP_O->actor.state = lacp_actor_state[port];
+
+	LACP_O->tlv_partner = LACP_TLV_PARTNER;
+	LACP_O->partner_len = LACP_TLV_LEN_INFO;
+	LACP_O->partner.sys_prio = HTONS(lacp_partner_sys_prio[port]);
+	memcpy(LACP_O->partner.sys, lacp_partner_sys[port], MAC_ADDR_LEN);
+	LACP_O->partner.key = HTONS(lacp_partner_key[port]);
+	LACP_O->partner.port_prio = HTONS(lacp_partner_port_prio[port]);
+	LACP_O->partner.port = HTONS(lacp_partner_port[port]);
+	LACP_O->partner.state = lacp_partner_state[port];
+
+	LACP_O->tlv_collector = LACP_TLV_COLLECTOR;
+	LACP_O->collector_len = LACP_TLV_LEN_COLLECTOR;
+	LACP_O->collector_max_delay = 0;
+	LACP_O->tlv_terminator = LACP_TLV_TERMINATOR;
+	LACP_O->terminator_len = 0x00;
+
+	lacp_ntt[port] = 0;
+	saved_mgmt_vlan = management_vlan;
+	management_vlan = 0;
+	uip_len = sizeof(struct lacpdu);
+	tcpip_output();
+	management_vlan = saved_mgmt_vlan;
+}
+
+
+void lacp_in(void) __banked
+{
+	__xdata uint8_t port, lag;
+
+	lacp_rxbody = TRAP_RX_BODY();
+	if (uip_len < lacp_rxbody + sizeof(struct lacpdu_in)) {
+		uip_len = 0;
+		return;
+	}
+	uip_len = 0;
+
+	if (LACP_I->ethertype != HTONS(SLOW_PROTO_ETHERTYPE)
+	    || LACP_I->subtype != SLOW_PROTO_SUBTYPE_LACP)
+		return;
+
+	port = ((uint8_t)HTONS(LACP_H->rtl_tag.pmask)) & 0x0f;
+	if (port < machine.min_port || port > machine.max_port)
+		return;
+
+	lag = lacp_port_lag[port];
+	if (lag == LACP_LAG_NONE)
+		return;
+	if (lacp_sys_eq(LACP_I->actor.sys, uip_ethaddr.addr))
+		return;
+
+
+#ifdef DEBUG
+	print_string("LACP in, port "); print_byte(port);
+	print_string(" partner_state "); print_byte(LACP_I->actor.state); write_char('\n');
+#endif
+
+	lacp_rx_count[port]++;
+
+	memcpy(lacp_partner_sys[port], LACP_I->actor.sys, MAC_ADDR_LEN);
+	lacp_scratch_mask = HTONS(LACP_I->actor.key);
+	lacp_partner_key[port] = lacp_scratch_mask;
+	lacp_scratch_mask = HTONS(LACP_I->actor.port);
+	lacp_partner_port[port] = lacp_scratch_mask;
+	lacp_scratch_mask = HTONS(LACP_I->actor.sys_prio);
+	lacp_partner_sys_prio[port] = lacp_scratch_mask;
+	lacp_scratch_mask = HTONS(LACP_I->actor.port_prio);
+	lacp_partner_port_prio[port] = lacp_scratch_mask;
+	lacp_partner_state[port]     = LACP_I->actor.state;
+
+	lacp_rx_state[port] = LACP_RX_CURRENT;
+	lacp_timeout[port] = LACP_SHORT_TIMEOUT;
+
+	if (!lacp_agg_valid[lag]) {
+		memcpy(lacp_agg_sys[lag], LACP_I->actor.sys, MAC_ADDR_LEN);
+		lacp_agg_valid[lag] = 1;
+	}
+
+	if (lacp_mux_machine(port))
+		lacp_ntt[port] = 1;
+
+	if (LACP_I->partner.state != lacp_actor_state[port]
+	    || HTONS(LACP_I->partner.port) != (uint16_t)port + 1)
+		lacp_ntt[port] = 1;
+
+	lacp_mux_update();
+}
+
+
+
+static void lacp_step(void)
+{
+	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+		if (lacp_port_lag[i] == LACP_LAG_NONE)
+			continue;
+
+		if (lacp_periodic[i]) {
+			lacp_periodic[i]--;
+		} else {
+			lacp_periodic[i] = (lacp_partner_state[i] & LACP_STATE_TIMEOUT) ?
+				LACP_FAST_PERIODIC : LACP_SLOW_PERIODIC;
+			lacp_ntt[i] = 1;
+		}
+
+		if (lacp_timeout[i]) {
+			if (!--lacp_timeout[i]) {
+				lacp_rx_state[i] = LACP_RX_DEFAULTED;
+				lacp_partner_state[i] = LACP_STATE_DEFAULTED;
+				if (lacp_mux_machine(i))
+					lacp_ntt[i] = 1;
+			}
+		}
+
+		if (lacp_ntt[i])
+			lacp_send(i);
+	}
+
+	for (uint8_t lag = 0; lag < LACP_NUM_LAGS; lag++) {
+		uint8_t any_current = 0;
+
+		if (!lacp_agg_valid[lag])
+			continue;
+		for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+			if (lacp_port_lag[i] == lag && lacp_rx_state[i] == LACP_RX_CURRENT
+			    && lacp_sys_eq(lacp_partner_sys[i], lacp_agg_sys[lag])) {
+				any_current = 1;
+				break;
+			}
+		}
+		if (!any_current)
+			lacp_agg_valid[lag] = 0;
+	}
+
+	lacp_mux_update();
+}
+
+
+void lacp_timers(void) __banked
+{
+	uint8_t n = LACP_CATCH_UP;
+	while (n-- && TICKS_DUE(lacp_tick_last, LACP_TICK_STEP)) {
+		lacp_tick_last += LACP_TICK_STEP;
+		lacp_step();
+	}
+}
+
+
+static void lacp_port_init(uint8_t port)
+{
+	lacp_actor_state[port] = LACP_STATE_ACTIVITY | LACP_STATE_AGGREGATION |
+		LACP_STATE_TIMEOUT;
+	lacp_rx_state[port] = LACP_RX_INITIALIZE;
+	lacp_partner_state[port] = LACP_STATE_DEFAULTED;
+	memset(lacp_partner_sys[port], 0, MAC_ADDR_LEN);
+	lacp_partner_key[port] = 0;
+	lacp_partner_port[port] = 0;
+	lacp_periodic[port] = LACP_FAST_PERIODIC;
+	lacp_timeout[port] = 0;
+	lacp_ntt[port] = 1;
+	lacp_rx_count[port] = 0;
+}
+
+static void lacp_port_release(uint8_t port)
+{
+	lacp_actor_state[port] = 0;
+	lacp_ntt[port] = 0;
+	lacp_partner_state[port] = 0;
+	lacp_rx_state[port] = LACP_RX_INITIALIZE;
+	lacp_rx_count[port] = 0;
+	memset(lacp_partner_sys[port], 0, MAC_ADDR_LEN);
+}
+
+static uint8_t lacp_any_lag(void)
+{
+	for (uint8_t l = 0; l < LACP_NUM_LAGS; l++)
+		if (lacp_lag_ports[l])
+			return 1;
+	return 0;
+}
+
+static void lacp_engine_on(void)
+{
+	lacp_tick_last = (uint8_t)ticks;
+	lacpEnabled = 1;
+	trap_rma_set(RTL837X_RMA2_CONF, RTL837X_RMA_ACT_TRAP);
+}
+
+static void lacp_engine_off(void)
+{
+	trap_rma_set(RTL837X_RMA2_CONF, RTL837X_RMA_ACT_DROP);
+	lacpEnabled = 0;
+}
+
+void lacp_init(void) __banked
+{
+	for (uint8_t i = 0; i < 10; i++) {
+		lacp_port_lag[i] = LACP_LAG_NONE;
+		lacp_actor_state[i] = 0;
+		lacp_ntt[i] = 0;
+	}
+	for (uint8_t l = 0; l < LACP_NUM_LAGS; l++) {
+		lacp_lag_ports[l] = 0;
+		lacp_agg_valid[l] = 0;
+		lacp_members_last[l] = 0;
+	}
+	lacpEnabled = 0;
+}
+
+void lacp_lag_set(uint8_t lag, __xdata uint16_t ports) __banked
+{
+	if (lag >= LACP_NUM_LAGS)
+		return;
+	if (ports && ports == lacp_lag_ports[lag])
+		return;
+	lacp_scratch_flag = lacp_any_lag();
+
+	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+		if (lacp_port_lag[i] == lag && !(ports & PORT_BIT(i))) {
+			lacp_port_lag[i] = LACP_LAG_NONE;
+			lacp_port_release(i);
+		}
+	}
+	if (lacp_members_last[lag] || ports) {
+		lacp_members_last[lag] = 0;
+		port_lag_members_set(lag, 0);
+	}
+	lacp_agg_valid[lag] = 0;
+	lacp_lag_ports[lag] = ports;
+
+	if (ports && !lacp_scratch_flag)
+		lacp_engine_on();
+
+	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+		if (!(ports & PORT_BIT(i)))
+			continue;
+		lacp_scratch_lag = lacp_port_lag[i];
+		lacp_port_lag[i] = lag;
+		if (lacp_scratch_lag != LACP_LAG_NONE && lacp_scratch_lag != lag) {
+			lacp_scratch_mask = lacp_lag_ports[lacp_scratch_lag] & ~PORT_BIT(i);
+			lacp_lag_ports[lacp_scratch_lag] = lacp_scratch_mask;
+			if (!lacp_scratch_mask) {
+				lacp_agg_valid[lacp_scratch_lag] = 0;
+				if (lacp_members_last[lacp_scratch_lag]) {
+					lacp_members_last[lacp_scratch_lag] = 0;
+					port_lag_members_set(lacp_scratch_lag, 0);
+				}
+			}
+		}
+		lacp_port_init(i);
+	}
+
+	if (!lacp_any_lag() && lacp_scratch_flag)
+		lacp_engine_off();
+
+	lacp_mux_update();
+}
+
+
+void lacp_off(void) __banked
+{
+	for (uint8_t l = 0; l < LACP_NUM_LAGS; l++)
+		if (lacp_lag_ports[l])
+			lacp_lag_set(l, 0);
+}
+
+
+void lacp_show(void) __banked
+{
+	print_string("LACP "); print_string(lacpEnabled ? "on" : "off"); write_char('\n');
+	for (uint8_t l = 0; l < LACP_NUM_LAGS; l++) {
+		if (!lacp_lag_ports[l])
+			continue;
+		print_string("lag "); print_byte(l + 1);
+		print_string(" ports "); print_short(lacp_lag_ports[l]);
+		print_string(" aggregator ");
+		if (lacp_agg_valid[l]) {
+			for (uint8_t j = 0; j < MAC_ADDR_LEN; j++)
+				print_byte(lacp_agg_sys[l][j]);
+		} else {
+			print_string("(none)");
+		}
+		print_string(" members "); print_short(lacp_members_last[l]); write_char('\n');
+	}
+
+	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
+		print_string("port "); print_byte(machine.log_to_phys_port[i]);
+		print_string(" actor "); print_byte(lacp_actor_state[i]);
+		print_string(" partner "); print_byte(lacp_partner_state[i]);
+		print_string(" rxst "); print_byte(lacp_rx_state[i]);
+		print_string(" rx "); print_short(lacp_rx_count[i]);
+		print_string(" psys ");
+		for (uint8_t j = 0; j < MAC_ADDR_LEN; j++)
+			print_byte(lacp_partner_sys[i][j]);
+		write_char('\n');
+	}
+}
diff --git a/rtl837x_lacp.h b/rtl837x_lacp.h
new file mode 100644
index 00000000..a03c4c69
--- /dev/null
+++ b/rtl837x_lacp.h
@@ -0,0 +1,70 @@
+#ifndef _RTL837X_LACP_H_
+#define _RTL837X_LACP_H_
+
+/*
+ * LACP (IEEE 802.3ad Clause 43) for the RTL837x platform.
+ * This code is in the Public Domain.
+ */
+
+#include <stdint.h>
+#include "rtl837x_common.h"
+
+void lacp_init(void) __banked;
+void lacp_in(void) __banked;
+void lacp_timers(void) __banked;
+void lacp_off(void) __banked;
+void lacp_show(void) __banked;
+void lacp_lag_set(uint8_t lag, __xdata uint16_t ports) __banked;
+
+#define LACP_NUM_LAGS		4
+#define LACP_LAG_NONE		0xff
+
+extern __xdata uint8_t  lacpEnabled;
+extern __xdata uint8_t  lacp_actor_state[10];
+extern __xdata uint8_t  lacp_partner_state[10];
+extern __xdata uint8_t  lacp_rx_state[10];
+extern __xdata uint8_t  lacp_partner_sys[10][MAC_ADDR_LEN];
+extern __xdata uint16_t lacp_rx_count[10];
+extern __xdata uint8_t  lacp_port_lag[10];
+extern __xdata uint16_t lacp_lag_ports[LACP_NUM_LAGS];
+extern __xdata uint8_t  lacp_agg_sys[LACP_NUM_LAGS][MAC_ADDR_LEN];
+extern __xdata uint8_t  lacp_agg_valid[LACP_NUM_LAGS];
+extern __xdata uint16_t lacp_members_last[LACP_NUM_LAGS];
+
+#define SLOW_PROTO_ETHERTYPE	0x8809
+#define SLOW_PROTO_SUBTYPE_LACP	0x01
+#define LACP_VERSION		0x01
+#define LACP_DST5		0x02
+
+#define LACP_TLV_ACTOR		0x01
+#define LACP_TLV_PARTNER	0x02
+#define LACP_TLV_COLLECTOR	0x03
+#define LACP_TLV_TERMINATOR	0x00
+#define LACP_TLV_LEN_INFO	0x14
+#define LACP_TLV_LEN_COLLECTOR	0x10
+
+#define LACP_SYS_PRIO		0xffff
+#define LACP_DEF_PORT_PRIO	0x00ff
+
+#define LACP_STATE_ACTIVITY	0x01	/* active LACP, sends periodically */
+#define LACP_STATE_TIMEOUT	0x02	/* short timeout requested */
+#define LACP_STATE_AGGREGATION	0x04	/* link can be aggregated */
+#define LACP_STATE_SYNC		0x08	/* in sync with the partner */
+#define LACP_STATE_COLLECTING	0x10
+#define LACP_STATE_DISTRIBUTING	0x20
+#define LACP_STATE_DEFAULTED	0x40	/* partner information is the default */
+#define LACP_STATE_EXPIRED	0x80
+
+#define LACP_STATE_FULL		(LACP_STATE_SYNC | LACP_STATE_COLLECTING | LACP_STATE_DISTRIBUTING)
+
+#define LACP_FAST_PERIODIC	50
+#define LACP_SLOW_PERIODIC	1500
+#define LACP_SHORT_TIMEOUT	200
+
+#define LACP_RX_INITIALIZE	0
+#define LACP_RX_PORT_DISABLED	1
+#define LACP_RX_EXPIRED		2
+#define LACP_RX_DEFAULTED	3
+#define LACP_RX_CURRENT		4
+
+#endif
diff --git a/rtl837x_lldp.h b/rtl837x_lldp.h
index 298775c6..0e6ee674 100644
--- a/rtl837x_lldp.h
+++ b/rtl837x_lldp.h
@@ -7,7 +7,6 @@
 #define LLDP_ETHERTYPE       0x88cc
 #define LLDP_ETHERTYPE_LENGTH 2
 #define LLDP_MAX_FRAME       256
-#define MAC_ADDR_LEN    6
 #define LLDP_TX_INTERVAL_TICKS 6000
 
 #define LLDP_PORT_ID_TLV_TYPE 2
diff --git a/rtl837x_nic.c b/rtl837x_nic.c
new file mode 100644
index 00000000..af755628
--- /dev/null
+++ b/rtl837x_nic.c
@@ -0,0 +1,90 @@
+#include "rtl837x_common.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_sfr.h"
+#include "rtl837x_nic.h"
+
+extern __xdata uint8_t rx_headers[16];
+
+
+#ifndef RTLP_HOST_TEST
+/* One RX DMA operation, starting inside the configured ring. The hardware
+ * wraps transfers that cross its end; the initial address must be normalized.
+ * Host tests supply a simulated DMA engine for this hardware boundary. */
+bool nic_rx_dma(__xdata uint8_t *buffer, uint16_t ring_ptr, uint8_t words) __reentrant
+{
+	uint16_t guard = 0;
+
+	SFR_NIC_DATA_U16LE = (uint16_t)buffer;
+	SFR_NIC_RING_U16LE = ring_ptr;
+	SFR_NIC_CTRL = words;
+	while (SFR_NIC_CTRL != 0) {
+		if (++guard == 0) {
+			print_string("NIC: RX transfer did not complete\n");
+			return false;
+		}
+	}
+	return true;
+}
+#endif
+
+static bool nic_rx_copy(__xdata uint8_t *buffer, uint16_t ring_ptr, uint8_t words) __reentrant
+{
+	if (ring_ptr > RTL837X_NIC_RX_RING_BYTES || (ring_ptr & 7))
+		return false;
+	if (ring_ptr == RTL837X_NIC_RX_RING_BYTES)
+		ring_ptr = 0;
+
+	return nic_rx_dma(buffer, ring_ptr, words);
+}
+
+
+bool nic_rx_header(uint16_t ring_ptr) __reentrant
+{
+	if (ring_ptr >= RTL837X_NIC_RX_RING_BYTES)
+		return false;
+	return nic_rx_copy(rx_headers, ring_ptr, 1);
+}
+
+
+bool nic_rx_packet(__xdata uint8_t *buffer, uint16_t ring_ptr) __reentrant
+{
+	uint16_t len = ((uint16_t)rx_headers[5] << 8) | rx_headers[4];
+
+	if (!len || len > UIP_CONF_BUFFER_SIZE)
+		return false;
+	return nic_rx_copy(buffer, ring_ptr, (len + 7) >> 3);
+}
+
+
+/*
+ * Transfers data in XMEM to the ASIC for transmission by the NIC
+ */
+void nic_tx_packet(__xdata uint8_t *buffer, uint16_t len, uint16_t ring_ptr)
+{
+	uint16_t guard = 0;
+
+	SFR_NIC_DATA_U16LE = (uint16_t)(uintptr_t)buffer;
+
+#ifdef RXTXDBG
+	print_string("TX: \n");
+	for (uint8_t i = 0; i < 100; i++) {
+		print_byte(uip_buf[i]);
+		write_char(' ');
+	}
+	write_char('\n');
+#endif
+
+	ring_ptr <<= 3;
+	ring_ptr |= 0x8000;
+	SFR_NIC_RING_U16LE = ring_ptr;
+
+	len += 0xf;
+	len >>= 3;
+	SFR_NIC_CTRL = len;
+	while (SFR_NIC_CTRL != 0) {
+		if (++guard == 0) {
+			print_string("NIC: TX transfer did not complete\n");
+			return;
+		}
+	}
+}
diff --git a/rtl837x_nic.h b/rtl837x_nic.h
new file mode 100644
index 00000000..2eb54d21
--- /dev/null
+++ b/rtl837x_nic.h
@@ -0,0 +1,20 @@
+#ifndef RTL837X_NIC_H
+#define RTL837X_NIC_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+// #define RXTXDBG 1
+
+bool nic_rx_header(uint16_t ring_ptr) __reentrant;
+bool nic_rx_packet(__xdata uint8_t *buffer, uint16_t ring_ptr) __reentrant;
+
+/* buffer starts at the eight-byte NIC descriptor; len excludes that
+ * descriptor. ring_ptr is the ASIC TX position in eight-byte slots. */
+void nic_tx_packet(__xdata uint8_t *buffer, uint16_t len, uint16_t ring_ptr);
+
+/* RX DMA in eight-byte units. ring_ptr must start inside the configured
+ * RX ring; the hardware wraps transfers that cross its end. */
+bool nic_rx_dma(__xdata uint8_t *buffer, uint16_t ring_ptr, uint8_t words) __reentrant;
+
+#endif
diff --git a/rtl837x_port.c b/rtl837x_port.c
index 6cbc5870..1c44d0b5 100644
--- a/rtl837x_port.c
+++ b/rtl837x_port.c
@@ -57,7 +57,7 @@ void port_mirror_del(void) __banked
 
 bool port_ingress_filter(__xdata uint8_t port, __xdata vlan_ingress_mode_t type) __banked
 {
-	if (port > 9 || type >= VLAN_INVALID) {
+	if (port > CPU_PORT || type >= VLAN_INVALID) {
 		print_string("Invalid port or ingress filter type\n");
 		return false;
 	}
@@ -510,7 +510,7 @@ void port_media_show(uint8_t port) __banked
 
 void port_stats_print(void) __banked
 {
-	print_string("\nPort\tState\tLink\tTxGood\t\tTxBad\t\tRxGood\t\tRxBad\n");
+	print_string("\nPort\tState\tLink\tTxGood\t\tTxBad\t\tRxGood\t\tRxBad\t\tMACs\n");
 	for (uint8_t i = machine.min_port; i <= machine.max_port; i++) {
 		print_phys_port(i); write_char('\t');
 
@@ -584,6 +584,9 @@ void port_stats_print(void) __banked
 
 		STAT_GET(STAT_COUNTER_ERR_PKTS, i);
 		print_reg(RTL837X_STAT_V_HIGH); write_char('\t');
+
+		reg_read(RTL837X_L2_LRN_PORT_CONSTRT_CNT + (i << 2));
+		itoa_short(SFR_DATA_U16 & L2_LRN_PORT_CNT_MASK);
 		print_string("\n");
 	}
 }
diff --git a/rtl837x_regs.h b/rtl837x_regs.h
index 49520a9f..5527039b 100644
--- a/rtl837x_regs.h
+++ b/rtl837x_regs.h
@@ -147,6 +147,9 @@
  */
 #define RTL837X_REG_NIC_BUFFSIZE_TX	0x7844
 #define RTL837X_REG_NIC_RXBUFF_RX	0x7848
+/* RX ring: inclusive final eight-byte slot, as programmed by nic_setup(). */
+#define RTL837X_NIC_RX_LAST_SLOT	0x04ff
+#define RTL837X_NIC_RX_RING_BYTES	((RTL837X_NIC_RX_LAST_SLOT + 1U) * 8U)
 #define RTL837X_REG_NIC_RXCMD		0x784c
 #define RTL837X_REG_NIC_TXCMD		0x7850
 #define RTL837X_REG_RX_CTRL		0x785c
@@ -214,6 +217,8 @@
 #define RTL837x_L2_TBL_FLUSH_CNF	0x53dc
 #define RTL837X_L2_LRN_PORT_CONSTRAINT	0x5384
 #define RTL837X_L2_LRN_PORT_CONSTRT_ACT	0x4f80
+#define RTL837X_L2_LRN_PORT_CONSTRT_CNT	0x53ac
+#define L2_LRN_PORT_CNT_MASK		0x1fff
 #define	RTL8373_REG_MAC_L2_PORT_MAX_LEN	0x1250
 
 /*
@@ -285,6 +290,13 @@
  */
 #define RTL8373_RLDP_TIMER		0x1074
 #define RTL837X_RMA0_CONF		0x4ecc
+#define RTL837X_RMA0E_CONF		0x4ee8
+#define RTL837X_RMA2_CONF		0x4ed4
+#define RTL837X_RMA_ACT_MASK		0x30
+#define RTL837X_RMA_ACT_FORWARD		0x00
+#define RTL837X_RMA_ACT_TRAP		0x10
+#define RTL837X_RMA_ACT_DROP		0x20
+#define RTL837X_EXT_CPU_CTRL		0x6724
 #define RTL837X_IMR_INT_PORT_LINK_STS_CHG	0x5f34
 #define RTL837X_ISR_SW_INT_MODE		0x5f84
 #define RTL837X_ISR_INT_PORT_LINK_CHG	0x5f88
diff --git a/rtl837x_stp.c b/rtl837x_stp.c
index 26e14806..bc810d96 100644
--- a/rtl837x_stp.c
+++ b/rtl837x_stp.c
@@ -12,6 +12,7 @@
 #include "rtl837x_regs.h"
 #include "rtl837x_stp.h"
 #include "rtl837x_port.h"
+#include "rtl837x_trap.h"
 #include "uip.h"
 #include "machine.h"
 
@@ -29,7 +30,7 @@ extern __xdata struct machine_runtime machine_detected;
 
 extern __xdata struct uip_eth_addr uip_ethaddr;
 
-extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE + 2];
+extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 
 extern __xdata uint8_t cmd_buffer[CMD_BUF_SIZE];
 extern __xdata uint8_t cmd_words_len;
@@ -85,6 +86,7 @@ __xdata uint16_t stp_link_now;
 
 __xdata uint8_t  stp_scratch;
 __xdata uint8_t  stp_tx_flags_extra;	/* one-shot flags OR-ed into the next BPDU (TCA) */
+__xdata uint8_t  stp_rxbody;
 __xdata uint16_t stp_rxlen;		/* received frame length, saved before uip_len is consumed */
 __xdata uint8_t  stp_msg_age;		/* message age of the root info we hold, seconds */
 __xdata uint16_t stp_tc_while;		/* ticks left to set the TC flag in our BPDUs */
@@ -121,11 +123,13 @@ struct stp_pkt {
 	uint8_t version1_length;	/* RST BPDU only: length of the (empty) v1 part */
 };
 
-struct stp_pkt_in {
+struct stp_pkt_in_hdr {
 	uint8_t stp_addr[6];
 	uint8_t src_addr[6];
 	struct rtl_tag rtl_tag;
-	struct vlan_tag vlan_tag;
+};
+
+struct stp_pkt_in {
 	uint16_t msg_len;
 	uint8_t dsap;
 	uint8_t ssap;
@@ -147,7 +151,8 @@ struct stp_pkt_in {
 };
 
 #define STP_O ((__xdata struct stp_pkt *)&uip_buf[RTL_FRAME_DESC_SIZE])
-#define STP_I ((__xdata struct stp_pkt_in *)&uip_buf[0])
+#define STP_H ((__xdata struct stp_pkt_in_hdr *)&uip_buf[0])
+#define STP_I ((__xdata struct stp_pkt_in *)&uip_buf[stp_rxbody])
 
 #define BPDU_VER_STP		0x00
 #define BPDU_VER_RSTP		0x02
@@ -158,7 +163,8 @@ struct stp_pkt_in {
 
 #define BPDU_LEN_CONFIG		0x26	// LLC and a 35 byte body
 #define BPDU_LEN_RST		0x27	// LLC and a 36 byte body
-#define BPDU_LEN_MIN_HEADER	33	// addresses through bpdu_type
+#define BPDU_LEN_MIN_BODY	9
+#define BPDU_LEN_FULL_BODY	40
 
 #define BPDU_FLAG_TC		0x01
 #define BPDU_FLAG_LEARNING	0x10
@@ -547,7 +553,8 @@ void stp_in(void) __banked
 {
 	uint8_t port;
 
-	if (uip_len < BPDU_LEN_MIN_HEADER) {
+	stp_rxbody = TRAP_RX_BODY();
+	if (uip_len < stp_rxbody + BPDU_LEN_MIN_BODY) {
 		uip_len = 0;
 		return;
 	}
@@ -557,7 +564,7 @@ void stp_in(void) __banked
 	uip_len = 0;
 
 	/* Ingress port: low nibble of the CPU tag's pmask on RX */
-	stp_scratch = ((uint8_t)HTONS(STP_I->rtl_tag.pmask)) & 0x0f;
+	stp_scratch = ((uint8_t)HTONS(STP_H->rtl_tag.pmask)) & 0x0f;
 	if (stp_scratch < machine.min_port || stp_scratch > machine.max_port)
 		return;
 	port = stp_ent_of[stp_scratch];
@@ -607,7 +614,7 @@ void stp_in(void) __banked
 	}
 
 	/* Everything below reads the full Config/RST body. */
-	if (stp_rxlen < 64)
+	if (stp_rxlen < stp_rxbody + BPDU_LEN_FULL_BODY)
 		return;
 
 	/* Our own BPDU coming back: two of our ports sit on one segment. Only
@@ -865,8 +872,7 @@ void stp_defaults(void) __banked
 
 
 /*
- * Steer BPDUs while STP runs, and restore flooding when it stops.
- * Changing a port's PVID while STP runs needs "stp off" then "stp on".
+ * Restore BPDU flooding when STP stops.
  */
 static void stp_fdb_update(__xdata uint16_t pmask)
 {
@@ -928,16 +934,6 @@ void stp_setup(void) __banked
 
 	print_reg(RTL837X_MSTP_STATES); write_char('\n');
 
-	for (stp_i = machine.min_port; stp_i <= machine.max_port; stp_i++) {
-		if (!(stp_pflags[stp_i] & STP_PF_ENABLED))
-			continue;
-		if (port_ingress_filter_get(stp_i) != VLAN_TAGGED)
-			continue;
-		print_string("STP: port ");
-		write_char('0' + machine.log_to_phys_port[stp_i]);
-		print_string(" admits tagged frames only - BPDUs are untagged and will not arrive\n");
-	}
-
 	/* Seed the carrier bitmap, so turning STP on does not report every
 	 * port that was already down as a fresh topology change. */
 	reg_read_m(RTL837X_REG_LINKS_STS);
@@ -949,8 +945,7 @@ void stp_setup(void) __banked
 
 	stp_claim_root();
 
-	/* Take BPDUs to the CPU only - we are a participating bridge now. */
-	stp_fdb_update(PMASK_CPU);
+	trap_rma_set(RTL837X_RMA0_CONF, RTL837X_RMA_ACT_TRAP);
 }
 
 
@@ -972,6 +967,7 @@ void stp_off(void) __banked
 
 	/* Restore BPDU transparency: flood them again like an unmanaged switch. */
 	stp_fdb_update(PMASK_CPU | (machine_detected.isRTL8373 ? PMASK_9 : PMASK_6));
+	trap_rma_set(RTL837X_RMA0_CONF, RTL837X_RMA_ACT_FORWARD);
 }
 
 
diff --git a/rtl837x_stp.h b/rtl837x_stp.h
index b547f5d8..95bac8af 100644
--- a/rtl837x_stp.h
+++ b/rtl837x_stp.h
@@ -46,7 +46,7 @@ extern __xdata uint8_t  stp_pflags[STP_ENTITIES];
 extern __xdata uint32_t stp_pcost[STP_ENTITIES];	/* path cost; 0 = auto (20000)      */
 extern __xdata uint8_t  stp_pprio[STP_ENTITIES];
 extern __xdata uint8_t  stp_pp2p[STP_ENTITIES];
-extern __xdata uint8_t  stp_ent_of[10];		/* the STP entity a port answers to: itself, or its lag */
+extern __xdata uint8_t  stp_ent_of[STP_PORTS];	/* the STP entity a port answers to: itself, or its lag */
 extern __xdata uint16_t stp_lag_mask[STP_LAG_COUNT];	/* member ports of each lag; 0 = not part of STP */
 
 /* Last-heard designated info per port (from received BPDUs); consult
diff --git a/rtl837x_trap.c b/rtl837x_trap.c
new file mode 100644
index 00000000..1f2373a2
--- /dev/null
+++ b/rtl837x_trap.c
@@ -0,0 +1,21 @@
+#include "rtl837x_common.h"
+#include "rtl837x_sfr.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_trap.h"
+
+#pragma codeseg BANK2
+#pragma constseg BANK2
+
+extern __xdata uint8_t sfr_data[4];
+
+void trap_init(void) __banked
+{
+	REG_SET(RTL837X_EXT_CPU_CTRL, CPU_PORT);
+}
+
+void trap_rma_set(uint16_t reg, uint8_t act) __banked
+{
+	reg_read_m(reg);
+	sfr_data[3] = (sfr_data[3] & ~RTL837X_RMA_ACT_MASK) | act;
+	reg_write_m(reg);
+}
diff --git a/rtl837x_trap.h b/rtl837x_trap.h
new file mode 100644
index 00000000..88e99da5
--- /dev/null
+++ b/rtl837x_trap.h
@@ -0,0 +1,16 @@
+#ifndef _RTL837X_TRAP_H_
+#define _RTL837X_TRAP_H_
+
+#include <stdint.h>
+#include "rtl837x_common.h"
+
+#define TRAP_RX_HDR_SIZE	(12 + RTL_TAG_SIZE)
+
+#define TRAP_RX_BODY() \
+	((uip_buf[TRAP_RX_HDR_SIZE] == 0x81 && uip_buf[TRAP_RX_HDR_SIZE + 1] == 0x00) \
+	 ? TRAP_RX_HDR_SIZE + VLAN_TAG_SIZE : TRAP_RX_HDR_SIZE)
+
+void trap_init(void) __banked;
+void trap_rma_set(uint16_t reg, uint8_t act) __banked;
+
+#endif
diff --git a/rtlplayground.c b/rtlplayground.c
index 2c2184fd..0afa93c8 100644
--- a/rtlplayground.c
+++ b/rtlplayground.c
@@ -2,7 +2,6 @@
 #include <stdint.h>
 
 // #define REGDBG 1
-// #define RXTXDBG 1
 
 #include "rtl837x_sfr.h"
 #include "rtl837x_regs.h"
@@ -11,12 +10,16 @@
 #include "rtl837x_pins.h"
 #include "rtl837x_phy.h"
 #include "rtl837x_port.h"
+#include "rtl837x_trap.h"
+#include "rtl837x_nic.h"
 #include "rtl837x_stp.h"
+#include "rtl837x_lacp.h"
 #include "rtl837x_igmp.h"
 #include "rtl837x_leds.h"
 #include "rtl837x_bandwidth.h"
 #include "rtl837x_init.h"
 #include "rtl837x_lldp.h"
+#include "rtl837x_cabletest.h"
 #include "dhcp.h"
 #include "cmd_parser.h"
 #include "cmd_editor.h"
@@ -120,8 +123,8 @@ __code const uint8_t * __code const hex = "0123456789abcdef";
 __xdata uint8_t flash_buf[FLASH_BUF_SIZE];
 
 // NIC buffers for packet RX/TX
-__xdata uint8_t rx_headers[16]; // Packet header(s) on RX
-__xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE+2];
+__xdata uint8_t rx_headers[16]; // RX descriptor
+__xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 
 __xdata uint16_t rx_packet_vlan;
 __xdata uint16_t management_vlan;
@@ -132,6 +135,7 @@ __xdata bool stp_enabled;
 __xdata uint8_t igmpEnabled;
 __xdata bool lldp_enabled;
 __xdata char hostname[24];	/* device hostname, default set at boot, see rtl837x_common.h */
+__xdata uint8_t lacpEnabled;
 
 __code const uint16_t bit_mask[16] = {
 	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
@@ -710,108 +714,6 @@ void get_random_32(void)
 }
 
 
-/*
- * Transfer Network Interface RX data from the ASIC to the 8051 XMEM
- * data will be stored in the rx_header structure
- * len is the length of data to be transferred
- */
-bool nic_rx_header(uint16_t ring_ptr)
-{
-	uint16_t buffer = (uint16_t) &rx_headers[0];
-	uint16_t guard = 0;
-
-	SFR_NIC_DATA_U16LE = buffer;
-	SFR_NIC_RING_U16LE = ring_ptr;
-	SFR_NIC_CTRL = 1;
-	while (SFR_NIC_CTRL != 0) {
-		if (++guard == 0) {
-			print_string("NIC: RX header transfer did not complete\n");
-			return false;
-		}
-	}
-	return true;
-}
-
-
-/*
- * Transfer Network Interface RX data from the ASIC to the 8051 XMEM
- * the description of the packet must be in the rx_headers data structure
- * data will be returned in the xmem buffer points to
- * ring_ptr is the current position of the RX Ring on the ASIC side
- */
-bool nic_rx_packet(uint16_t buffer, uint16_t ring_ptr)
-{
-	uint16_t guard = 0;
-
-	SFR_NIC_DATA_U16LE = buffer;
-	SFR_NIC_RING_U16LE = ring_ptr;
-
-	uint16_t len = (((uint16_t)rx_headers[5]) << 8) | rx_headers[4];
-	len += 7;
-	len >>= 3;
-#ifdef RXTXDBG
-	print_string(" len: ");
-	print_short(len);
-#endif
-	SFR_NIC_CTRL = len;
-	while (SFR_NIC_CTRL != 0) {
-		if (++guard == 0) {
-			print_string("NIC: RX transfer did not complete\n");
-			return false;
-		}
-	}
-	return true;
-}
-
-
-/*
- * Transfers data in XMEM to the ASIC for transmission by the nic
- */
-void nic_tx_packet(uint16_t ring_ptr)
-{
-	uint16_t len;
-	uint16_t guard = 0;
-
-	/* A frame that got a dot1Q tag was shifted forward over its padding, so it
-	 * starts at uip_buf and carries the q_frame layout. One that did not keeps
-	 * the padding in front and the nonq_frame layout, so the padding is skipped.
-	 */
-	if (frame_tagged) {
-		SFR_NIC_DATA_U16LE = (uint16_t) uip_buf;
-		len = FRAME_Q->len;
-		/*
-		(__xdata struct rtl_dot1q_frame *)uip_buf
-#define FRAME (((__xdata struct rtl_dot1q_frame *)&uip_buf[0]).nonq_frame)*/
-	} else {
-		SFR_NIC_DATA_U16LE = (uint16_t) uip_buf + VLAN_TAG_SIZE;
-		len = FRAME->len;
-	}
-
-#ifdef RXTXDBG
-	print_string("TX: \n");
-	for (uint8_t i = 0; i < 100; i++) {
-		print_byte(uip_buf[i]);
-		write_char(' ');
-	}
-	write_char('\n');
-#endif
-
-	ring_ptr <<= 3;
-	ring_ptr |= 0x8000;
-	SFR_NIC_RING_U16LE = ring_ptr;
-
-	len += 0xf;
-	len >>= 3;
-	SFR_NIC_CTRL = len;
-	while (SFR_NIC_CTRL != 0) {
-		if (++guard == 0) {
-			print_string("NIC: TX transfer did not complete\n");
-			return;
-		}
-	}
-}
-
-
 /* Read flash using the MMIO capabilities of the DW8051 core
  * Bank is < 0x3f and is the MSB
  * addr gives the address in the bank
@@ -995,8 +897,12 @@ void tcpip_output(void)
 	uint16_t ring_ptr = ((uint16_t)sfr_data[2]) << 8;
 	ring_ptr |= sfr_data[3];
 
-	// Move data over from xmem buffer to ASIC side using DMA
-	nic_tx_packet(ring_ptr);
+	// Move data over from xmem buffer to ASIC side using DMA. A VLAN-tagged
+	// frame starts at uip_buf; an untagged frame retains four bytes of padding.
+	if (frame_tagged)
+		nic_tx_packet(uip_buf, FRAME_Q->len, ring_ptr);
+	else
+		nic_tx_packet(uip_buf + VLAN_TAG_SIZE, FRAME->len, ring_ptr);
 
 	// New position of the ring-pointer on the NIC-side indicates number of bytes transmitted
 	reg_read_m(RTL837X_REG_NIC_TX_CURR_PKT);
@@ -1033,7 +939,7 @@ void handle_rx(void)
 			write_char(' ');
 		}
 #endif
-		if (!nic_rx_packet((uint16_t) &uip_buf[0], ring_ptr + 8)) {
+		if (!nic_rx_packet(uip_buf, ring_ptr + 8)) {
 			REG_SET(RTL837X_REG_NIC_RXCMD, 1);
 			return;
 		}
@@ -1058,12 +964,16 @@ void handle_rx(void)
 		print_byte(uip_buf[3]); print_byte(uip_buf[4]); print_byte(uip_buf[5]); write_char('\n');
 		print_string(" MGMT-VLAN: "); print_short(management_vlan); write_char('\n');
 #endif
-		if (stp_enabled && uip_buf[0] == 0x01 && uip_buf[1] == 0x80 && uip_buf[2] == 0xc2 // STP packet?
-			&& uip_buf[3] == 0x00 && uip_buf[4] == 0x00 && uip_buf[5] == 0x00) {
-			stp_in();
-			if (uip_len) {
-				print_string("STP TX\n");
-				tcpip_output();
+		if ((stp_enabled || lacpEnabled) && uip_buf[0] == 0x01 && uip_buf[1] == 0x80
+			&& uip_buf[2] == 0xc2 && uip_buf[3] == 0x00 && uip_buf[4] == 0x00) {
+			if (stp_enabled && uip_buf[5] == 0x00) {
+				stp_in();
+				if (uip_len) {
+					print_string("STP TX\n");
+					tcpip_output();
+				}
+			} else if (lacpEnabled && uip_buf[5] == 0x02) {
+				lacp_in();
 			}
 		} else if (igmpEnabled && uip_buf[0] == 0x01 && uip_buf[1] == 0x00 && uip_buf[2] == 0x5e // IPv4-MC packet?
 			&& igmp_packet_handler()) {
@@ -1289,9 +1199,12 @@ static void handle_tick(void)
 			stp_timers();
 		}
 	}
+	if (lacpEnabled)
+		lacp_timers();
 	health_phase(HEALTH_PH_STP);
 	lldp_tick();
 	health_phase(HEALTH_LLDP);
+	cabletest_tick();
 }
 
 
@@ -1673,7 +1586,7 @@ void main(void)
 	// Flash controller should be initialized before any code in other banks is being fetched
 	// See this issue: https://github.com/logicog/RTLPlayground/issues/70
 	print_string("\nInitializing Flash controller\n");
-	flash_init(1);
+	flash_init(machine.flash_sio ? 0 : 1);
 
 	// Set default for SFP pins so we can start up a module already inserted
 	sfp_pins_last = 0x33; // signal LOS and no module inserted (for both slots, even if only 1 present)
@@ -1791,8 +1704,10 @@ void main(void)
 #endif
 	stp_enabled = 0;
 	stp_defaults();		/* 802.1D/w default config before any "stp ..." replay */
+	lacpEnabled = 0;
+	lacp_init();
 	nic_setup();
-	REG_SET(RTL837X_NIC_INT_MSK, NIC_INT_RXIE);
+	trap_init();
 	vlan_setup();
 	port_l2_setup();
 	igmp_setup();
diff --git a/test/Makefile b/test/Makefile
index c817897d..65f24825 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -31,7 +31,9 @@ TESTS = $(BUILDDIR)/test_cmd_editor \
         $(BUILDDIR)/test_tick_gate \
         $(BUILDDIR)/test_cpu_vlan_full \
         $(BUILDDIR)/test_cpu_vlan_restricted \
-        $(BUILDDIR)/test_cpu_vlan_8372
+        $(BUILDDIR)/test_cpu_vlan_8372\
+        $(BUILDDIR)/test_nic_rx \
+        $(BUILDDIR)/test_lacp
 
 # The table tests link the register mock and one environment file; stub/
 # stands in for the two headers a firmware build generates.
@@ -54,9 +56,18 @@ $(BUILDDIR)/test_port_tables: test_port_tables.c $(TABLE_ENV) hw_mock.h | $(BUIL
 $(BUILDDIR)/test_tick_gate: test_tick_gate.c support.c $(SRCROOT)/cmd_editor.c | $(BUILDDIR)
 	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
 
+# Exercise the production RX ring reader; only the hardware DMA edge is mocked.
+# Discard unused TX functions so this RX fixture needs no TX register mocks.
+$(BUILDDIR)/test_nic_rx: test_nic_rx.c $(SRCROOT)/rtl837x_nic.c $(SRCROOT)/rtl837x_nic.h | $(BUILDDIR)
+	$(CC) $(CFLAGS) -ffunction-sections -fdata-sections $(filter %.c,$^) -o $@ $(LDFLAGS) -Wl,--gc-sections
+
 $(BUILDDIR)/test_page_json: test_page_json.c $(TABLE_ENV) hw_mock.h | $(BUILDDIR)
 	$(CC) $(CFLAGS) $(filter %.c,$^) -o $@ $(LDFLAGS)
 
+# rtl837x_lacp.c is compiled UNMODIFIED from the firmware tree.
+$(BUILDDIR)/test_lacp: test_lacp.c $(SRCROOT)/rtl837x_lacp.c | $(BUILDDIR)
+	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+
 # httpd/httpd.c and uip/uip.c are compiled UNMODIFIED from the firmware tree;
 # this test carries the environment below them itself.
 $(BUILDDIR)/test_httpd_tx: test_httpd_tx.c $(SRCROOT)/httpd/httpd.c $(SRCROOT)/uip/uip.c | $(BUILDDIR)
diff --git a/test/README.md b/test/README.md
index 08ec0cef..a79b3242 100644
--- a/test/README.md
+++ b/test/README.md
@@ -48,6 +48,7 @@ fires — so it drops straight into CI.
 | `test_port_tables` | `rtl837x_port.c` | VLAN entry layout and round trip, PVID register sharing, static multicast and management entries, per-port flush, trunk membership and hash seed |
 | `test_page_json` | `httpd/page_impl.c` + `rtl837x_port.c` | `/vlan.json`, `/vlanlist`, `/l2.json` (walk, wrap marker, paging inside `outbuf`), 64-bit counters in `/status.json` and `/counters.json` |
 | `test_httpd_tx` | `httpd/httpd.c` + `uip/uip.c` | a GET of a static file against a client that moves its receive window: ACK accounting, continuation chunks out of flash, retransmission |
+| `test_lacp` | `rtl837x_lacp.c` | state machines against a simulated 802.3ad partner: convergence, mis-cabling, expiry, re-election, two groups, delivery by trap |
 
 ## Adding a test for another module
 1. Write `test_<module>.c` with `main()` driving the module's entry points and
diff --git a/test/env_tables.c b/test/env_tables.c
index b7f80529..d4a9895c 100644
--- a/test/env_tables.c
+++ b/test/env_tables.c
@@ -16,6 +16,7 @@
 #include "syslog.h"
 #include "rtl837x_phy.h"
 #include "support.h"
+#include "rtl837x_lacp.h"
 
 /* ---- console: everything lands in out_buf (support.c) ---- */
 void print_byte(uint8_t v)
@@ -133,3 +134,15 @@ uint8_t  stp_prio = 0x80, stp_root_port = 0xff, stp_rstp = 1, stp_txhold = 6;
 uint8_t sfp_buf[16];
 bool    sfp_read_block(uint8_t slot, uint8_t reg, uint8_t len) { (void)slot; (void)reg; (void)len; return false; }
 void    print_phys_port(uint8_t port) { itoa_short(machine.log_to_phys_port[port]); }
+
+uint8_t  lacpEnabled;
+uint8_t  lacp_actor_state[10];
+uint8_t  lacp_partner_state[10];
+uint8_t  lacp_rx_state[10];
+uint8_t  lacp_partner_sys[10][MAC_ADDR_LEN];
+uint16_t lacp_rx_count[10];
+uint8_t  lacp_port_lag[10];
+uint16_t lacp_lag_ports[LACP_NUM_LAGS];
+uint8_t  lacp_agg_sys[LACP_NUM_LAGS][MAC_ADDR_LEN];
+uint8_t  lacp_agg_valid[LACP_NUM_LAGS];
+uint16_t lacp_members_last[LACP_NUM_LAGS];
diff --git a/test/test_httpd_tx.c b/test/test_httpd_tx.c
index 4df05472..9b31141d 100644
--- a/test/test_httpd_tx.c
+++ b/test/test_httpd_tx.c
@@ -112,7 +112,7 @@ void read_reg_timer(uint32_t *tmr) { *tmr = 0; }
 
 /* uip-conf.h asks uIP not to define the packet buffer: on the switch it lives
  * at a fixed XDATA address, so the bench provides the storage itself. */
-u8_t uip_buf[UIP_BUFSIZE + 2];
+u8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 
 uint16_t strlen_x(const char *s) { return (uint16_t)strlen(s); }
 
@@ -148,6 +148,7 @@ void send_mirror(void) { }
 void send_mtu(void) { }
 void send_config(void) { }
 void send_cmd_log(void) { }
+void send_lacp(void) { }
 void send_lag(void) { }
 void send_stp(void) { }
 void send_stp_counters(void) { }
diff --git a/test/test_lacp.c b/test/test_lacp.c
new file mode 100644
index 00000000..160c773e
--- /dev/null
+++ b/test/test_lacp.c
@@ -0,0 +1,480 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include "rtl837x_common.h"
+#include "machine.h"
+#include "uip.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_lacp.h"
+
+/* ---------- platform mocks ---------- */
+
+uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
+uint16_t uip_len;
+struct uip_eth_addr uip_ethaddr = { .addr = {0x02,0x11,0x22,0x33,0x44,0x55} };
+const struct machine machine = { .min_port = 0, .max_port = 7,
+			   .log_to_phys_port = {5, 1, 2, 3, 4, 6, 7, 8, 9} };
+struct machine_runtime machine_detected = { .isRTL8373 = 1 };
+uint8_t lacpEnabled;
+uint16_t management_vlan;	/* mocked; slow-protocol path zeroes it per-frame */
+
+static int verbose = 0;
+void print_string(const char *s) { if (verbose) fputs(s, stdout); }
+void print_byte(uint8_t b) { if (verbose) printf("%02x", b); }
+void print_short(uint16_t v) { if (verbose) printf("%04x", v); }
+void write_char(char c) { if (verbose) putchar(c); }
+
+/* Trunk programming mock: record last mask per LAG + call count.
+ * hw_members mirrors LAG 0 so the single-aggregator scenarios read naturally. */
+static uint16_t hw_members_lag[4];
+static int hw_set_calls;
+#define hw_members hw_members_lag[0]
+void port_lag_members_set(uint8_t lag, uint16_t members)
+{
+	if (lag < 4)
+		hw_members_lag[lag] = members;
+	hw_set_calls++;
+}
+
+/* Reserved-multicast action mock: delivery of a LACPDU to the CPU rests on
+ * the action of the slow-protocols entry alone, so record what the engine
+ * sets. The real trap_rma_set() touches only the action field. */
+static uint16_t hw_rma_reg;
+static uint8_t hw_rma_act;
+static int hw_rma_calls;
+void trap_rma_set(uint16_t reg, uint8_t act);
+void trap_rma_set(uint16_t reg, uint8_t act)
+{
+	hw_rma_reg = reg;
+	hw_rma_act = act;
+	hw_rma_calls++;
+}
+
+/* ---------- on-wire mirrors (independent re-statement of the layout) ---------- */
+
+struct wire_info {
+	uint16_t sys_prio;
+	uint8_t  sys[MAC_ADDR_LEN];
+	uint16_t key;
+	uint16_t port_prio;
+	uint16_t port;
+	uint8_t  state;
+	uint8_t  reserved[3];
+};
+
+struct wire_pdu_out {		/* what lacp_send() writes at uip_buf+12 */
+	uint8_t  dst[MAC_ADDR_LEN];
+	uint8_t  src[MAC_ADDR_LEN];
+	struct rtl_tag rtl_tag;
+	uint16_t ethertype;
+	uint8_t  subtype;
+	uint8_t  version;
+	uint8_t  tlv_actor, actor_len;
+	struct wire_info actor;
+	uint8_t  tlv_partner, partner_len;
+	struct wire_info partner;
+	uint8_t  tlv_collector, collector_len;
+	uint16_t collector_max_delay;
+	uint8_t  collector_reserved[12];
+	uint8_t  tlv_terminator, terminator_len;
+	uint8_t  terminator_reserved[50];
+};
+
+struct wire_pdu_in {		/* forwarded form: the hardware inserts a VLAN tag */
+	uint8_t  dst[MAC_ADDR_LEN];
+	uint8_t  src[MAC_ADDR_LEN];
+	struct rtl_tag rtl_tag;
+	struct vlan_tag vlan_tag;
+	uint16_t ethertype;
+	uint8_t  subtype;
+	uint8_t  version;
+	uint8_t  tlv_actor, actor_len;
+	struct wire_info actor;
+	uint8_t  tlv_partner, partner_len;
+	struct wire_info partner;
+};
+
+_Static_assert(sizeof(struct wire_info) == 18, "info TLV body must be 18");
+_Static_assert(sizeof(struct wire_pdu_out) == 132, "TX pdu must be 132");
+_Static_assert(sizeof(struct rtl_tag) == 8, "rtl tag must be 8");
+
+/* ---------- TX capture ---------- */
+
+static struct wire_pdu_out last_tx[10];
+static int tx_count[10];
+
+void tcpip_output(void)
+{
+	struct wire_pdu_out *p = (struct wire_pdu_out *)&uip_buf[RTL_FRAME_DESC_SIZE];
+	uint16_t pmask = HTONS(p->rtl_tag.pmask);
+	for (int port = 0; port < 10; port++) {
+		if (pmask & (1u << port)) {
+			last_tx[port] = *p;
+			tx_count[port]++;
+		}
+	}
+	uip_len = 0;
+}
+
+/* ---------- simulated partner ---------- */
+
+/* Deliver a LACPDU into the switch on `port`, from partner system `sys`.
+ * pstate = partner's Actor_State flags. If `echo`, the partner echoes the
+ * switch's last-seen actor block back (fresh view) - required for quiescence. */
+static void partner_frame_full(uint8_t port, const uint8_t sys[MAC_ADDR_LEN], uint8_t pstate,
+			       int echo, uint16_t len, int tagged)
+{
+	struct wire_pdu_in in;
+	memset(&in, 0, sizeof(in));
+
+	in.dst[0]=0x01; in.dst[1]=0x80; in.dst[2]=0xc2; in.dst[5]=0x02;
+	memcpy(in.src, sys, MAC_ADDR_LEN);
+	in.rtl_tag.tag = HTONS(RTL_FRAME_TAG_ID);
+	in.rtl_tag.pmask = HTONS(port);		/* RX: 4-bit ingress port */
+	in.vlan_tag.svlan = HTONS(0x8100);	/* the tag's TPID, which marks the body offset */
+	in.ethertype = HTONS(0x8809);
+	in.subtype = 0x01;
+	in.version = 0x01;
+
+	in.tlv_actor = 0x01; in.actor_len = 0x14;
+	in.actor.sys_prio = HTONS(0x8000);
+	memcpy(in.actor.sys, sys, MAC_ADDR_LEN);
+	in.actor.key = HTONS(0x0011);
+	in.actor.port_prio = HTONS(0x00ff);
+	in.actor.port = HTONS((uint16_t)port + 101);
+	in.actor.state = pstate;
+
+	in.tlv_partner = 0x02; in.partner_len = 0x14;
+	if (echo) {			/* fresh view of us, from our last TX */
+		in.partner.sys_prio = last_tx[port].actor.sys_prio;
+		memcpy(in.partner.sys, last_tx[port].actor.sys, MAC_ADDR_LEN);
+		in.partner.key = last_tx[port].actor.key;
+		in.partner.port = last_tx[port].actor.port;
+		in.partner.state = last_tx[port].actor.state;
+	}				/* else: zeros = stale view */
+
+	memcpy(uip_buf, &in, sizeof(in));
+	if (!tagged) {		/* trapped: no VLAN tag, so the body sits earlier */
+		uint8_t *body = uip_buf + RTL_FRAME_DESC_SIZE + RTL_TAG_SIZE;
+		memmove(body, body + VLAN_TAG_SIZE,
+			sizeof(in) - (RTL_FRAME_DESC_SIZE + RTL_TAG_SIZE + VLAN_TAG_SIZE));
+		len -= VLAN_TAG_SIZE;
+	}
+	uip_len = len;
+	lacp_in();
+}
+
+static void partner_frame_len(uint8_t port, const uint8_t sys[MAC_ADDR_LEN], uint8_t pstate, int echo, uint16_t len)
+{
+	partner_frame_full(port, sys, pstate, echo, len, 1);
+}
+
+static void partner_frame(uint8_t port, const uint8_t sys[MAC_ADDR_LEN], uint8_t pstate, int echo)
+{
+	partner_frame_full(port, sys, pstate, echo, sizeof(struct wire_pdu_in), 1);
+}
+
+/* The same LACPDU as the reserved-multicast trap delivers it. */
+static void partner_frame_trap(uint8_t port, const uint8_t sys[MAC_ADDR_LEN], uint8_t pstate, int echo)
+{
+	partner_frame_full(port, sys, pstate, echo, sizeof(struct wire_pdu_in), 0);
+}
+
+/* Advance time by n system ticks; the LACP timers step every fourth one */
+volatile uint32_t ticks;
+static void step(int n) { while (n--) { ticks++; lacp_timers(); } }
+
+/* ---------- scenario runner ---------- */
+
+static int failures;
+#define CHECK(cond, name) do { \
+	if (cond) printf("PASS  %s\n", name); \
+	else { printf("FAIL  %s\n", name); failures++; } \
+} while (0)
+
+#define P_ACT   LACP_STATE_ACTIVITY
+#define P_AGG   LACP_STATE_AGGREGATION
+#define P_SYNC  LACP_STATE_SYNC
+#define P_COL   LACP_STATE_COLLECTING
+#define P_DIST  LACP_STATE_DISTRIBUTING
+#define P_TO    LACP_STATE_TIMEOUT	/* partner requests short (fast) timeout */
+
+static const uint8_t SYS_A[MAC_ADDR_LEN] = {0x02,0xaa,0xaa,0xaa,0xaa,0x01};
+static const uint8_t SYS_B[MAC_ADDR_LEN] = {0x02,0xbb,0xbb,0xbb,0xbb,0x02};
+
+int main(int argc, char **argv)
+{
+	verbose = (argc > 1 && !strcmp(argv[1], "-v"));
+
+	/* Boot init first: on host, zeroed globals would otherwise read as "every
+	 * port belongs to LAG 0" (the firmware calls this from main() the same way) */
+	lacp_init();
+
+	/* T1: enable announces on every port with sane field contents */
+	lacp_lag_set(0, 0x00ff);
+	step(8);
+	int all_tx = 1, sane = 1;
+	for (int i = machine.min_port; i <= machine.max_port; i++) {
+		if (!tx_count[i]) all_tx = 0;
+		if (last_tx[i].ethertype != HTONS(0x8809) || last_tx[i].subtype != 1
+		    || last_tx[i].dst[5] != 0x02
+		    || !(last_tx[i].actor.state & (P_ACT|P_AGG|P_TO)))
+			sane = 0;
+	}
+	CHECK(all_tx && sane, "T1 enable: LACPDU announced on all ports, well-formed");
+
+	/* T2: partner without SYNC -> actor SYNC only, no members yet */
+	partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO, 1);
+	partner_frame(1, SYS_A, P_ACT|P_AGG|P_TO, 1);
+	step(8);
+	CHECK((lacp_actor_state[0] & P_SYNC) && !(lacp_actor_state[0] & (P_COL|P_DIST))
+	      && hw_members == 0,
+	      "T2 partner not in sync: actor SYNC only, trunk empty");
+
+	/* T3: partner in sync on ports 0,1 -> full converge, members 0x0003 */
+	partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	partner_frame(1, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(8);
+	CHECK(hw_members == 0x0003
+	      && (lacp_actor_state[0] & (P_SYNC|P_COL|P_DIST)) == (P_SYNC|P_COL|P_DIST)
+	      && (lacp_actor_state[1] & (P_SYNC|P_COL|P_DIST)) == (P_SYNC|P_COL|P_DIST),
+	      "T3 convergence: both ports collecting/distributing, trunk 0x0003");
+
+	/* T3b: partner-block echo must be VERBATIM. A Linux 802.3ad partner accepts
+	 * our SYNC only if our Partner TLV mirrors its actor identity exactly; a
+	 * hardcoded sys_prio/port_prio (instead of the recorded value) makes Linux
+	 * clear partner-SYNC and the bond never distributes. Verify we echo the
+	 * partner's own priorities back, not a constant. */
+	CHECK(HTONS(last_tx[0].partner.sys_prio) == 0x8000
+	      && HTONS(last_tx[0].partner.port_prio) == 0x00ff
+	      && HTONS(last_tx[0].partner.key) == 0x0011
+	      && HTONS(last_tx[0].partner.port) == (uint16_t)0 + 101,
+	      "T3b partner echo: recorded partner priorities/key/port echoed verbatim");
+
+	/* T4: mis-cabling - port 2 sees a DIFFERENT system: must stay out */
+	partner_frame(2, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(8);
+	CHECK(hw_members == 0x0003 && !(lacp_actor_state[2] & P_SYNC),
+	      "T4 mis-cabling: port with different partner system stays out");
+
+	/* T5: register-write economy: stable state must not rewrite the trunk */
+	int calls_before = hw_set_calls;
+	partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	partner_frame(1, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(64);
+	CHECK(hw_set_calls == calls_before,
+	      "T5 stable state: no redundant trunk register writes");
+
+	/* T6: stale echo triggers retransmit (update_NTT) */
+	int txc = tx_count[0];
+	partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 0 /* stale view of us */);
+	step(8);
+	CHECK(tx_count[0] > txc, "T6 update_NTT: stale partner view causes retransmit");
+
+	/* T7: expiry - partner silent past the short timeout: trunk drains,
+	 * aggregator identity is released */
+	step(4 * LACP_SHORT_TIMEOUT + 64);	/* past the short timeout */
+	CHECK(hw_members == 0 && lacp_agg_valid[0] == 0,
+	      "T7 expiry: members drop to 0 and aggregator is released");
+
+	/* T8: re-convergence with a NEW partner system after release */
+	/* (needs a fresh announce first so the echo below carries current state) */
+	step(4 * 0x0100 + 8);		/* let periodic TX refresh last_tx */
+	partner_frame(3, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	partner_frame(3, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(8);
+	CHECK(hw_members == 0x0008 && (lacp_actor_state[3] & P_COL),
+	      "T8 re-election: new partner system forms a fresh aggregate");
+
+	/* T9: lacp off clears the trunk */
+	lacp_off();
+	CHECK(hw_members == 0 && lacpEnabled == 0, "T9 disable: trunk cleared");
+
+	/* ---- per-LAG scenarios: two independent aggregators ---- */
+
+	/* T10: lag 1 lacp {0,1} + lag 2 lacp {2,3}, both to the SAME partner
+	 * system (worst case for sibling scoping): each converges into its own
+	 * hardware trunk, and the engine reports enabled. */
+	lacp_lag_set(1, 0x0003);	/* ports 0,1 */
+	lacp_lag_set(2, 0x000c);	/* ports 2,3 */
+	step(8);			/* announce */
+	for (int r = 0; r < 2; r++) {	/* two rounds so echoes carry fresh state */
+		for (int p = 0; p < 4; p++)
+			partner_frame(p, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(8);
+	}
+	CHECK(lacpEnabled == 1
+	      && hw_members_lag[1] == 0x0003 && hw_members_lag[2] == 0x000c,
+	      "T10 two LAGs: independent aggregates converge on their own trunks");
+
+	/* T11: removing one LAG releases only its trunk; the other keeps running */
+	lacp_lag_set(1, 0);
+	CHECK(hw_members_lag[1] == 0 && hw_members_lag[2] == 0x000c
+	      && lacpEnabled == 1,
+	      "T11 remove one LAG: its trunk drains, the other LAG unaffected");
+
+	/* T12: a port in no LACP LAG ignores LACPDUs entirely */
+	int rx5_before = tx_count[5];
+	partner_frame(5, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(8);
+	CHECK(!(lacp_actor_state[5] & P_SYNC) && hw_members_lag[2] == 0x000c,
+	      "T12 unassigned port: LACPDU ignored, no state change");
+	(void)rx5_before;
+
+	/* T13: removing the last LACP LAG shuts the engine down */
+	lacp_lag_set(2, 0);
+	CHECK(lacpEnabled == 0 && hw_members_lag[2] == 0
+	      && hw_rma_reg == RTL837X_RMA2_CONF && hw_rma_act == RTL837X_RMA_ACT_DROP,
+	      "T13 last LAG removed: engine off, trunk drained, address dropped");
+
+	/* T14: while the engine runs, the slow-protocols address is trapped to
+	 * the CPU. The trap keys on the address alone, so delivery needs no L2
+	 * entry and nothing written per VLAN or per PVID. */
+	hw_rma_calls = 0;
+	lacp_lag_set(0, 0x0003);
+	CHECK(hw_rma_calls == 1 && hw_rma_reg == RTL837X_RMA2_CONF
+	      && hw_rma_act == RTL837X_RMA_ACT_TRAP,
+	      "T14 engine on traps 01:80:c2:00:00:02 to the CPU");
+
+	/* T15: a trapped LACPDU arrives without the VLAN tag a forwarded one
+	 * carries, so its body sits four bytes earlier. Both forms must parse. */
+	uint16_t rx_before = lacp_rx_count[0];
+	lacp_partner_state[0] = 0;		/* all three are written past the ethertype gate */
+	memset(lacp_partner_sys[0], 0, MAC_ADDR_LEN);
+	partner_frame_trap(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	int trap_ok = lacp_rx_count[0] == (uint16_t)(rx_before + 1)
+		   && lacp_partner_state[0] == (P_ACT|P_AGG|P_TO|P_SYNC)
+		   && !memcmp(lacp_partner_sys[0], SYS_A, MAC_ADDR_LEN);
+	partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	CHECK(trap_ok && lacp_rx_count[0] == (uint16_t)(rx_before + 2),
+	      "T15 trapped LACPDU parses like a forwarded one");
+
+	/* T16: the partner changes one cable at a time. Port 1 starts hearing B
+	 * while port 0 still hears A, then A goes quiet and B appears on port 0
+	 * too. The aggregator must let go of A once no port hears it, even though
+	 * port 1 was CURRENT the whole time, or the LAG never aggregates with B. */
+	lacp_lag_set(0, 0);
+	lacp_lag_set(0, 0x0003);
+	step(8);
+	for (int r = 0; r < 3; r++) {
+		partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		partner_frame(1, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(8);
+	}
+	for (int t = 0; t < 40; t++) {		/* port 1 moved to B, port 0 still on A */
+		partner_frame(0, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		partner_frame(1, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(4 * 40);
+	}
+	int stayed_out = hw_members == 0x0001 && !(lacp_actor_state[1] & P_SYNC);
+	for (int t = 0; t < 60; t++)		/* port 0 unplugged from A, past the short timeout */
+		{ partner_frame(1, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1); step(4 * 40); }
+	for (int t = 0; t < 40; t++) {		/* port 0 now on B as well */
+		partner_frame(0, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		partner_frame(1, SYS_B, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(4 * 40);
+	}
+	CHECK(stayed_out && hw_members == 0x0003 && !memcmp(lacp_agg_sys[0], SYS_B, MAC_ADDR_LEN),
+	      "T16 re-cabling one port at a time: aggregator moves from A to B");
+
+	/* T17: a group that already has a STATIC trunk is put under LACP with the
+	 * same ports (the LAG page's Static -> LACP switch sends only "lag N lacp").
+	 * The static trunk must go: until the partner converges the ports are not
+	 * an aggregate, and after a reboot the config replays only the LACP line. */
+	hw_members_lag[1] = 0x0030;		/* static lag 2: ports 4,5 */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	CHECK(hw_members_lag[1] == 0 && lacp_members_last[1] == 0 && lacp_lag_ports[1] == 0x0030,
+	      "T17 static trunk taken over: cleared while the group negotiates");
+	lacp_lag_set(1, 0);
+
+	/* T18: a port named in a second group moves there. The first group's
+	 * candidate set drops it, so taking the second group out later leaves no
+	 * orphan that group 1 still shows as a candidate but never runs LACP on. */
+	lacp_lag_set(1, 0x0030);		/* ports 4,5 */
+	step(8);
+	for (int r = 0; r < 2; r++) {
+		partner_frame(4, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		partner_frame(5, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(8);
+	}
+	int converged = hw_members_lag[1] == 0x0030;
+	lacp_lag_set(2, 0x0060);		/* ports 5,6: port 5 moves from group 2 to 3 */
+	int moved = lacp_lag_ports[1] == 0x0010 && lacp_port_lag[5] == 2
+		    && hw_members_lag[1] == 0x0010;
+	lacp_lag_set(2, 0);
+	int no_orphan = lacp_port_lag[5] == LACP_LAG_NONE && lacp_lag_ports[1] == 0x0010;
+	lacp_lag_set(3, 0x0010);		/* the last port leaves group 2 as well */
+	CHECK(converged && moved && no_orphan && lacp_lag_ports[1] == 0 && lacp_agg_valid[1] == 0,
+	      "T18 port moves between groups: old group drops it from candidates and trunk");
+	lacp_lag_set(3, 0);
+
+	/* T20: taking a group out of LACP leaves nothing of the partner behind
+	 * for "lacp show" to report as if the port still heard it. */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	partner_frame(4, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	step(8);
+	int had_partner = lacp_rx_state[4] == LACP_RX_CURRENT && lacp_rx_count[4] > 0;
+	lacp_lag_set(1, 0);
+	CHECK(had_partner && lacp_partner_state[4] == 0 && lacp_rx_state[4] == LACP_RX_INITIALIZE
+	      && lacp_rx_count[4] == 0 && !memcmp(lacp_partner_sys[4], "\0\0\0\0\0\0", MAC_ADDR_LEN),
+	      "T20 release: partner state, rx state, counter and system cleared");
+
+	/* T21: applying the same candidate set again (the LAG page resends it
+	 * with every Apply) must not tear the trunk down and renegotiate. */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	for (int r = 0; r < 2; r++) {
+		partner_frame(4, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		partner_frame(5, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+		step(8);
+	}
+	int before = hw_set_calls;
+	lacp_lag_set(1, 0x0030);
+	CHECK(hw_members_lag[1] == 0x0030 && hw_set_calls == before
+	      && (lacp_actor_state[4] & P_COL),
+	      "T21 same ports applied again: trunk and state untouched");
+	lacp_lag_set(1, 0);
+
+	/* T22: a runt on the slow-protocols address must not be parsed as a
+	 * LACPDU; the partner block would be read from stale buffer bytes. */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	partner_frame_len(4, SYS_A, P_ACT|P_AGG|P_TO|P_SYNC, 1, 40);	/* cut before the partner block */
+	CHECK(lacp_rx_count[4] == 0 && lacp_rx_state[4] == LACP_RX_INITIALIZE,
+	      "T22 truncated LACPDU ignored: the port does not record it");
+	lacp_lag_set(1, 0);
+
+	/* T23: the partner asks for the long timeout (Linux's default slow rate).
+	 * current_while is armed from OUR LACP_Timeout, which is short, so a
+	 * partner that stops speaking LACP with the link up is dropped after the
+	 * short timeout, not after two minutes. */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	for (int r = 0; r < 2; r++) {
+		partner_frame(4, SYS_A, P_ACT|P_AGG|P_SYNC, 1);
+		partner_frame(5, SYS_A, P_ACT|P_AGG|P_SYNC, 1);
+		step(8);
+	}
+	int slow_converged = hw_members_lag[1] == 0x0030;
+	step(4 * LACP_SHORT_TIMEOUT + 64);
+	CHECK(slow_converged && hw_members_lag[1] == 0,
+	      "T23 partner on slow rate goes quiet: dropped after our short timeout");
+	lacp_lag_set(1, 0);
+
+	/* T24: a LACPDU carrying our own system id (two ports of one group
+	 * cabled to each other) must not be taken for a partner. */
+	lacp_lag_set(1, 0x0030);
+	step(8);
+	partner_frame(4, uip_ethaddr.addr, P_ACT|P_AGG|P_TO|P_SYNC, 1);
+	CHECK(lacp_rx_count[4] == 0 && lacp_rx_state[4] == LACP_RX_INITIALIZE,
+	      "T24 own system id: LACPDU ignored");
+	lacp_lag_set(1, 0);
+
+	printf("\n%s (%d failure%s)\n", failures ? "SANDBOX: FAILURES" : "SANDBOX: ALL PASS",
+	       failures, failures == 1 ? "" : "s");
+	return failures ? 1 : 0;
+}
diff --git a/test/test_nic_rx.c b/test/test_nic_rx.c
new file mode 100644
index 00000000..4ad36310
--- /dev/null
+++ b/test/test_nic_rx.c
@@ -0,0 +1,277 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "rtl837x_common.h"
+#include "rtl837x_regs.h"
+#include "rtl837x_nic.h"
+
+uint8_t rx_headers[16];
+
+/* Model the DMA behavior reported on SWTGW218AS: a transfer starting inside
+ * the RX ring wraps at its end. An initial address outside the ring instead
+ * reads flat ASIC memory, including stale TX bytes at 0x2800. */
+static uint8_t asic[0x8000];
+static struct {
+	uint8_t before[16];
+	uint8_t data[UIP_CONF_BUFFER_ALLOC_SIZE];
+	uint8_t after[16];
+} destination;
+
+struct dma_request {
+	uint8_t *buffer;
+	uint16_t ring;
+	uint8_t words;
+};
+static struct dma_request requests[8];
+static unsigned request_count, fail_request;
+static int failures;
+
+static void check(bool condition, const char *what)
+{
+	if (!condition) {
+		printf("  FAIL: %s\n", what);
+		failures++;
+	}
+}
+
+bool nic_rx_dma(uint8_t *buffer, uint16_t ring, uint8_t words)
+{
+	size_t bytes = (size_t)words * 8;
+	unsigned call = ++request_count;
+
+	if (call <= sizeof(requests) / sizeof(requests[0]))
+		requests[call - 1] = (struct dma_request){ buffer, ring, words };
+	if (call == fail_request || !words || (size_t)ring + bytes > sizeof(asic))
+		return false;
+	if (ring < RTL837X_NIC_RX_RING_BYTES) {
+		for (size_t i = 0; i < bytes; i++)
+			buffer[i] = asic[((size_t)ring + i) % RTL837X_NIC_RX_RING_BYTES];
+	} else {
+		memcpy(buffer, asic + ring, bytes);
+	}
+	return true;
+}
+
+static void fixture_reset(void)
+{
+	memset(asic, 0xd7, sizeof(asic));
+	memset(&destination, 0xa5, sizeof(destination));
+	memset(rx_headers, 0x6c, sizeof(rx_headers));
+	memset(requests, 0, sizeof(requests));
+	request_count = 0;
+	fail_request = 0;
+}
+
+static bool filled(const uint8_t *data, size_t len, uint8_t value)
+{
+	while (len--)
+		if (*data++ != value)
+			return false;
+	return true;
+}
+
+static bool guards_intact(void)
+{
+	return filled(destination.before, sizeof(destination.before), 0xa5)
+		&& filled(destination.after, sizeof(destination.after), 0xa5);
+}
+
+static bool requests_start_in_rx_ring(void)
+{
+	for (unsigned i = 0; i < request_count; i++) {
+		if (i >= sizeof(requests) / sizeof(requests[0]) || !requests[i].words
+		    || (requests[i].ring & 7)
+		    || requests[i].ring >= RTL837X_NIC_RX_RING_BYTES)
+			return false;
+	}
+	return true;
+}
+
+static void ring_write(uint16_t offset, const uint8_t *data, size_t len)
+{
+	for (size_t i = 0; i < len; i++)
+		asic[((size_t)offset + i) % RTL837X_NIC_RX_RING_BYTES] = data[i];
+}
+
+static void put_descriptor(uint16_t offset, uint16_t len)
+{
+	uint8_t descriptor[8] = { 0x03, 0x00, 0xb0, 0xc8, len, len >> 8, 0, 0 };
+	ring_write(offset, descriptor, sizeof(descriptor));
+}
+
+static void expect_descriptor(uint16_t len)
+{
+	uint8_t descriptor[8] = { 0x03, 0x00, 0xb0, 0xc8, len, len >> 8, 0, 0 };
+	check(!memcmp(rx_headers, descriptor, sizeof(descriptor)), "the first eight descriptor bytes stay intact");
+}
+
+static void pattern(uint8_t *data, size_t len)
+{
+	for (size_t i = 0; i < len; i++)
+		data[i] = (uint8_t)(i * 37 + (i >> 8) + 0x13);
+}
+
+static void t_last_descriptor(void)
+{
+	static const uint8_t root_bpdu[68] = {
+		0x01, 0x80, 0xc2, 0, 0, 0, 0xd0, 0xea, 0x11, 0x12, 0x34, 0x56,
+		0x88, 0x99, 0x04, 0, 0, 0, 0, 8,
+		0, 0x27, 0x42, 0x42, 3, 0, 0, 2, 2, 0x3c,
+		0x10, 0, 0xd0, 0xea, 0x11, 0x12, 0x34, 0x56, 0, 0, 0, 0,
+		0x10, 0, 0xd0, 0xea, 0x11, 0x12, 0x34, 0x56, 0x80, 0x0a,
+		0, 0, 0x14, 0, 2, 0, 0x0f, 0, 0
+	};
+	uint8_t stale_tx[72] = { 0 };
+	uint16_t last = RTL837X_NIC_RX_RING_BYTES - 8;
+
+	printf("[test] the last RX descriptor wraps its BPDU payload before DMA\n");
+	fixture_reset();
+	put_descriptor(last, sizeof(root_bpdu));
+	ring_write(0, root_bpdu, sizeof(root_bpdu));
+	memcpy(stale_tx, root_bpdu, sizeof(root_bpdu));
+	stale_tx[17] = 0x20;
+	stale_tx[19] = 1; /* retained TX destination mask, not ingress port 8 */
+	memcpy(asic + RTL837X_NIC_RX_RING_BYTES, stale_tx, sizeof(stale_tx));
+	check(nic_rx_header(last), "the final descriptor is readable");
+	expect_descriptor(sizeof(root_bpdu));
+	check(nic_rx_packet(destination.data, last + 8), "a payload address at the RX ring limit wraps to zero");
+	check(!memcmp(destination.data, root_bpdu, sizeof(root_bpdu)), "the complete upstream BPDU is read instead of stale TX bytes");
+	check(destination.data[19] == 8, "the upstream ingress tag survives the ring boundary");
+	check(request_count == 2 && requests[0].ring == last && requests[0].words == 1
+	      && requests[1].ring == 0 && requests[1].words == 9,
+	      "descriptor and rounded payload DMA both start in the RX ring");
+	check(requests_start_in_rx_ring() && guards_intact(), "DMA starts inside the RX ring and preserves destination guards");
+	expect_descriptor(sizeof(root_bpdu));
+}
+
+static void t_payload_layouts(void)
+{
+	static const struct {
+		uint16_t descriptor, len;
+	} cases[] = {
+		{ 0x0100, 8 }, { 0x0100, 16 }, { 0x0100, 64 },
+		{ 0x0100, 68 }, { 0x0100, 72 },
+		{ RTL837X_NIC_RX_RING_BYTES - 16, 8 },
+		{ RTL837X_NIC_RX_RING_BYTES - 16, 16 },
+		{ RTL837X_NIC_RX_RING_BYTES - 16, 68 },
+		{ RTL837X_NIC_RX_RING_BYTES - 72, 64 },
+		{ RTL837X_NIC_RX_RING_BYTES - 48, 68 }
+	};
+	uint8_t frame[80];
+
+	printf("[test] payload DMA handles ordinary, exact-boundary, and crossing frames\n");
+	pattern(frame, sizeof(frame));
+	for (unsigned i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
+		size_t rounded = (cases[i].len + 7u) & ~7u;
+		fixture_reset();
+		put_descriptor(cases[i].descriptor, cases[i].len);
+		ring_write(cases[i].descriptor + 8, frame, rounded);
+		check(nic_rx_header(cases[i].descriptor), "the descriptor transfer completes");
+		check(nic_rx_packet(destination.data, cases[i].descriptor + 8), "the payload transfer completes");
+		check(!memcmp(destination.data, frame, rounded), "every payload and permitted padding byte reaches the correct destination offset");
+		check(filled(destination.data + rounded, sizeof(destination.data) - rounded, 0xa5), "DMA does not write beyond the rounded frame");
+		check(request_count == 2, "the payload uses one DMA request even when crossing the ring end");
+		check(requests_start_in_rx_ring() && guards_intact(), "crossing DMA starts inside the RX ring and preserves destination guards");
+		expect_descriptor(cases[i].len);
+	}
+}
+
+static void t_maximum_frames(void)
+{
+	uint8_t frame[(UIP_CONF_BUFFER_SIZE + 7u) & ~7u];
+	static const uint16_t lengths[] = { 1, 7, 1549, 1550, 1551, 1552, 1553, 1554, 1555, 1556 };
+
+	printf("[test] rounded maximum frames fit without overwriting their descriptor\n");
+	pattern(frame, sizeof(frame));
+	for (unsigned layout = 0; layout < 3; layout++) {
+		uint16_t descriptor = layout == 0 ? 0x0100
+			: RTL837X_NIC_RX_RING_BYTES - (layout == 1 ? 16 : 8);
+		for (unsigned i = 0; i < sizeof(lengths) / sizeof(lengths[0]); i++) {
+			uint16_t len = lengths[i];
+			size_t rounded = (len + 7u) & ~7u;
+			fixture_reset();
+			put_descriptor(descriptor, len);
+			ring_write(descriptor + 8, frame, rounded);
+			check(nic_rx_header(descriptor), "the maximum-frame descriptor transfer completes");
+			check(nic_rx_packet(destination.data, descriptor + 8), "all supported frame lengths fit the destination");
+			check(!memcmp(destination.data, frame, rounded), "the full rounded frame is preserved");
+			check(filled(destination.data + rounded, sizeof(destination.data) - rounded, 0xa5), "rounded DMA writes no bytes beyond the available destination");
+			check(request_count == 2, "maximum frames use a single payload DMA request");
+			check(requests_start_in_rx_ring() && guards_intact(), "rounded DMA starts inside the RX ring and preserves destination guards");
+			expect_descriptor(len);
+		}
+	}
+}
+
+static void t_invalid_frames(void)
+{
+	static const uint16_t invalid_lengths[] = { 0, UIP_CONF_BUFFER_SIZE + 1, 0xffff };
+	static const uint16_t invalid_pointers[] = { 1, 7, RTL837X_NIC_RX_RING_BYTES + 8, 0xfff8 };
+
+	printf("[test] invalid lengths and DMA addresses are rejected before transfer\n");
+	for (unsigned i = 0; i < sizeof(invalid_lengths) / sizeof(invalid_lengths[0]); i++) {
+		fixture_reset();
+		rx_headers[4] = invalid_lengths[i];
+		rx_headers[5] = invalid_lengths[i] >> 8;
+		check(!nic_rx_packet(destination.data, 0x0100), "unsupported or overflowing lengths are rejected");
+		check(!request_count && filled(destination.data, sizeof(destination.data), 0xa5) && guards_intact(),
+		      "invalid frame lengths cause no DMA or destination changes");
+	}
+	for (unsigned i = 0; i < sizeof(invalid_pointers) / sizeof(invalid_pointers[0]); i++) {
+		fixture_reset();
+		rx_headers[4] = 68;
+		rx_headers[5] = 0;
+		check(!nic_rx_header(invalid_pointers[i]), "an invalid descriptor address is rejected");
+		check(!nic_rx_packet(destination.data, invalid_pointers[i]), "an invalid payload address is rejected");
+		check(!request_count && guards_intact(), "invalid addresses never reach DMA");
+	}
+	fixture_reset();
+	check(!nic_rx_header(RTL837X_NIC_RX_RING_BYTES) && !request_count,
+	      "a descriptor at the ring limit is rejected rather than wrapped");
+}
+
+static void t_dma_failure(void)
+{
+	uint8_t frame[UIP_CONF_BUFFER_ALLOC_SIZE];
+	static const uint16_t lengths[] = { 68, UIP_CONF_BUFFER_SIZE };
+
+	printf("[test] failed descriptor and single-payload DMA transfers propagate failure\n");
+	fixture_reset();
+	fail_request = 1;
+	check(!nic_rx_header(0x0100) && request_count == 1, "descriptor DMA failure reaches the caller");
+	pattern(frame, sizeof(frame));
+	for (unsigned layout = 0; layout < 3; layout++) {
+		uint16_t descriptor = layout == 0 ? 0x0100
+			: RTL837X_NIC_RX_RING_BYTES - (layout == 1 ? 16 : 8);
+		for (unsigned i = 0; i < sizeof(lengths) / sizeof(lengths[0]); i++) {
+			uint16_t len = lengths[i];
+			fixture_reset();
+			put_descriptor(descriptor, len);
+			ring_write(descriptor + 8, frame, (len + 7u) & ~7u);
+			check(nic_rx_header(descriptor), "the descriptor precedes the injected payload failure");
+			fail_request = 2;
+			check(!nic_rx_packet(destination.data, descriptor + 8), "payload DMA failure reaches the caller");
+			check(request_count == fail_request, "a failed payload DMA is not retried or split");
+			check(filled(destination.data, sizeof(destination.data), 0xa5) && guards_intact(),
+			      "an injected failure before DMA preserves the destination and guards");
+			expect_descriptor(len);
+		}
+	}
+}
+
+int main(void)
+{
+	t_last_descriptor();
+	t_payload_layouts();
+	t_maximum_frames();
+	t_invalid_frames();
+	t_dma_failure();
+	if (failures) {
+		printf("%d NIC RX check(s) failed\n", failures);
+		return 1;
+	}
+	puts("all NIC RX checks passed");
+	return 0;
+}
diff --git a/test/test_page_json.c b/test/test_page_json.c
index e650a538..a7626565 100644
--- a/test/test_page_json.c
+++ b/test/test_page_json.c
@@ -185,6 +185,23 @@ static void t_l2_page(void)
 	CHECK(balanced(), "every page is valid JSON");
 }
 
+static void t_status_macs(void)
+{
+	const char *p1, *end, *mac;
+
+	printf("[test] /status.json reports the MAC addresses learned on each port\n");
+	hw_reset(); out_reset();
+	hw_reg_set(RTL837X_L2_LRN_PORT_CONSTRT_CNT + (1 << 2), 0x21);
+	send_status();
+	p1 = strstr(body(), "\"logPort\":1,");
+	end = p1 ? strchr(p1, '}') : NULL;
+	mac = p1 ? strstr(p1, "\"macs\":\"0x21\"") : NULL;
+	CHECK(mac && mac < end, "port 1 shows its learned count");
+	CHECK(has("\"macs\":\"0x0\""), "a port without learned addresses shows 0");
+	CHECK(slen <= TCP_OUTBUF_SIZE, "fits the buffer");
+	CHECK(balanced(), "valid JSON");
+}
+
 static void t_status_counters(void)
 {
 	printf("[test] /status.json prints 64-bit packet counters in full\n");
@@ -211,6 +228,7 @@ int main(void)
 	t_l2();
 	t_l2_page();
 	t_status_counters();
+	t_status_macs();
 	printf("\n%d checks, %d failed\n", tests_run, tests_failed);
 	return tests_failed ? 1 : 0;
 }
diff --git a/test/test_startup_crlf.py b/test/test_startup_crlf.py
new file mode 100644
index 00000000..f1b99f63
--- /dev/null
+++ b/test/test_startup_crlf.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""Compile the current firmware execute_config() with mocked flash/tokenizer edges."""
+import pathlib, subprocess
+root=pathlib.Path(__file__).resolve().parent.parent
+src=(root/'cmd_parser.c').read_text()
+start=src.index('void execute_config(void) __banked')
+end=src.index('// Execute multiple commands',start)
+body=src[start:end]
+out=root/'test/build';out.mkdir(exist_ok=True)
+harness=r"""
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#define __xdata
+#define __banked
+#define CONFIG_START 0
+#define CONFIG_LEN 1024
+#define FLASH_READ_BURST_SIZE 256
+#define CMD_BUF_SIZE 64
+#define ERR_OK 0
+#define NUL 0
+#define PASSWORD "test-default"
+uint8_t flash_buf[256],cmd_buffer[64],save_cmd,err_status;
+char passwd[32],image[1024],seen[16][64];int count;
+struct {uint32_t addr;uint16_t len;} flash_region;
+void strtox(char*d,const char*s){strcpy(d,s);}
+void flash_read_bulk(uint8_t*d){memcpy(d,image+flash_region.addr,256);}
+void print_string(const char*s){(void)s;}
+void print_string_x(uint8_t*s){(void)s;}
+void write_char(char c){(void)c;}
+void clear_command_history(void){}
+void cmd_tokenize(void){err_status=cmd_buffer[0]=='#'?1:0;}
+void cmd_parser(void){assert(count<16);strcpy(seen[count++],(char*)cmd_buffer);}
+"""
+tests=r"""
+void run(const char*s){memset(image,0,sizeof image);strncpy(image,s,sizeof image-1);count=0;execute_config();assert(save_cmd==1);}
+int main(void){
+run("one\ntwo\n");assert(count==2&&!strcmp(seen[1],"two"));
+run("one\rtwo\r");assert(count==2&&!strcmp(seen[0],"one"));
+run("one\r\ntwo\r\n");assert(count==2&&!strcmp(seen[1],"two"));
+run("\r\n# ignored\r\none\r\n\r\ntwo");assert(count==2&&!strcmp(seen[0],"one"));
+run("one\0ignored");assert(count==1&&!strcmp(seen[0],"one"));
+char longline[300];memset(longline,'x',sizeof longline);strcpy(longline+280,"\r\nok\r\n");run(longline);assert(count==1&&!strcmp(seen[0],"ok"));
+/* CR at the end of a flash burst, LF at the start of the next. */
+char boundary[300];memset(boundary,'\n',255);strcpy(boundary+255,"\r\nok\r\n");run(boundary);assert(count==1&&!strcmp(seen[0],"ok"));
+puts("startup CR/LF/CRLF, comments, NUL, overlong and burst-boundary cases passed");return 0;
+}
+"""
+(out/'startup_crlf.c').write_text(harness+body+tests)
+subprocess.run(['gcc','-std=gnu11','-Wall','-Wextra','-Werror','-g','-fsanitize=address,undefined','-fno-omit-frame-pointer','-no-pie',str(out/'startup_crlf.c'),'-o',str(out/'test_startup_crlf')],check=True)
+subprocess.run([str(out/'test_startup_crlf')],check=True)
diff --git a/tools/httpd_sim.c b/tools/httpd_sim.c
index 5fea029f..68f87232 100644
--- a/tools/httpd_sim.c
+++ b/tools/httpd_sim.c
@@ -56,6 +56,7 @@ time_t last_session_use;
 
 uint64_t txG[PORTS], txB[PORTS], rxG[PORTS], rxB[PORTS];
 char txG_buff[20], txB_buff[20], rxG_buff[20], rxB_buff[20], counter_buf[20], counter_name[20];
+char macs_buff[8];
 char sfp_temp[8], sfp_vcc[8], sfp_txbias[8], sfp_txpower[8], sfp_rxpower[8], sfp_laser[8], sfp_options[6];
 char num_buff[20];
 char l2_idx_buff[20];
@@ -180,6 +181,12 @@ void send_status(int s)
 		json_object_object_add(v, "txB", json_object_new_string(txB_buff));
 		json_object_object_add(v, "rxG", json_object_new_string(rxG_buff));
 		json_object_object_add(v, "rxB", json_object_new_string(rxB_buff));
+		uint16_t macs = 0;
+		for (int e = 0; e < L2_ENTRY_NUM; e++)
+			if (l2_entries[e].port == physToLogPort[i-1] && l2_entries[e].type != 's')
+				macs++;
+		sprintf(macs_buff, "0x%04x", macs);
+		json_object_object_add(v, "macs", json_object_new_string(macs_buff));
 		if (i >= PORTS - NSFP) {
 			uint16_t temp = 0x28fb + rand() / (RAND_MAX / 100);
 			uint16_t vcc = 0x7eda + rand() / (RAND_MAX / 100);
diff --git a/uip/uip-conf.h b/uip/uip-conf.h
index 9e87fda2..f93e6bd7 100644
--- a/uip/uip-conf.h
+++ b/uip/uip-conf.h
@@ -132,6 +132,10 @@ typedef unsigned short uip_stats_t;
  */
 #define UIP_CONF_BUFFER_SIZE     1556
 
+/* Backing storage includes padding for the NIC's eight-byte DMA transfers.
+ * Keep UIP_CONF_BUFFER_SIZE as the logical frame/MSS limit. */
+#define UIP_CONF_BUFFER_ALLOC_SIZE ((UIP_CONF_BUFFER_SIZE + 7U) & ~7U)
+
 /**
  * Bytes of the buffer kept out of the advertised MSS.
  *
diff --git a/uip/uip.c b/uip/uip.c
index 774067da..c8d0f20b 100644
--- a/uip/uip.c
+++ b/uip/uip.c
@@ -136,7 +136,7 @@ static __code const uip_ipaddr_t all_zeroes_addr =
 #endif /* UIP_CONF_IPV6 */
 
 #ifndef UIP_CONF_EXTERNAL_BUFFER
-u8_t uip_buf[UIP_BUFSIZE + 2];   /* The packet buffer that contains
+u8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];   /* The packet buffer that contains
 				    incoming packets. */
 #endif /* UIP_CONF_EXTERNAL_BUFFER */
 
diff --git a/uip/uipopt.h b/uip/uipopt.h
index 620d6054..84ea318c 100644
--- a/uip/uipopt.h
+++ b/uip/uipopt.h
@@ -419,7 +419,7 @@
 #endif /* UIP_CONF_BUFFER_EXTRA */
 
 
-extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE+2];
+extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_ALLOC_SIZE];
 
 /**
  * Determines if statistics support should be compiled in.