From cdbc48f2c27d1ee43a2d4b876d263a5cd5c9871e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= Date: Sat, 28 Mar 2026 19:29:49 +0100 Subject: [PATCH] Rename LED_28 to LED_28_SYS. So it clear that led 28 is the SYSTEM LED. --- machine.c | 18 +++++++++--------- machine.h | 2 +- rtl837x_leds.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/machine.c b/machine.c index 2890231..5b809f5 100644 --- a/machine.c +++ b/machine.c @@ -27,7 +27,7 @@ __code const struct machine machine = { .sfp_port[1].sds = 1, .sfp_port[1].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO54_ACL_BIT2_EN, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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 @@ -89,7 +89,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO_NA, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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, @@ -115,7 +115,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO48_I2C_SCL1, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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 */ @@ -160,7 +160,7 @@ __code const struct machine machine = { .sfp_port[1].sds = 0, .sfp_port[1].i2c = { .sda = GPIO41_I2C_SDA3_MDIO1, .scl = GPIO40_I2C_SCL3_MDC1 }, /* GPIO 40 */ .reset_pin = GPIO36_PWM_OUT, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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 @@ -192,7 +192,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO_NA, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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 */ @@ -274,7 +274,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO54_ACL_BIT2_EN, - .high_leds = { .mux = LED_27 | LED_28 | LED_29, .enable = LED_28 | LED_29 }, + .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 @@ -306,7 +306,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO54_ACL_BIT2_EN, - .high_leds = { .mux = LED_27 | LED_28 | LED_29, .enable = LED_28 | LED_29 }, + .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 @@ -340,7 +340,7 @@ __code const struct machine machine = { .sfp_port[0].sds = 1, .sfp_port[0].i2c = { .sda = GPIO39_I2C_SDA4, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO_NA, - .high_leds = { .mux = LED_27 | LED_29, .enable = LED_28 | LED_29 }, + .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, @@ -416,7 +416,7 @@ __code const struct machine machine = { .sfp_port[1].i2c = { .sda = GPIO41_I2C_SDA3_MDIO1, .scl = GPIO40_I2C_SCL3_MDC1 }, .reset_pin = GPIO_NA, - .high_leds = { .mux = LED_28 | LED_29, .enable = LED_27 | LED_28 | LED_29 }, + .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 = { { diff --git a/machine.h b/machine.h index d41438e..20e8070 100644 --- a/machine.h +++ b/machine.h @@ -29,7 +29,7 @@ typedef struct { #define LED_27 1 -#define LED_28 2 +#define LED_28_SYS 2 #define LED_29 4 struct high_leds { diff --git a/rtl837x_leds.c b/rtl837x_leds.c index 86e7f97..f92360b 100644 --- a/rtl837x_leds.c +++ b/rtl837x_leds.c @@ -190,7 +190,7 @@ void leds_setup(void) __banked else reg_bit_clear(RTL837X_PIN_MUX_0, 27); - if (machine.high_leds.mux & LED_28) + if (machine.high_leds.mux & LED_28_SYS) reg_bit_set(RTL837X_PIN_MUX_0, 28); else reg_bit_clear(RTL837X_PIN_MUX_0, 28); @@ -205,7 +205,7 @@ void leds_setup(void) __banked else reg_bit_clear(RTL837X_REG_LED_GLB_IO_EN, 27); - if (machine.high_leds.enable & LED_28) + if (machine.high_leds.enable & LED_28_SYS) reg_bit_set(RTL837X_REG_LED_GLB_IO_EN, 28); else reg_bit_clear(RTL837X_REG_LED_GLB_IO_EN, 28);