diff --git a/doc/devices/PCB-SWTG024AS-V2.0-17452.md b/doc/devices/PCB-SWTG024AS-V2.0-17452.md index abeb69d9..6d91e91d 100644 --- a/doc/devices/PCB-SWTG024AS-V2.0-17452.md +++ b/doc/devices/PCB-SWTG024AS-V2.0-17452.md @@ -8,10 +8,10 @@ Also the RJ45 connectors can be all plastic/non-shielded or with metal shielding ## Brands |Brand|Type|Managed|PCB|PCB Label|Flash|Chip RTL| |---|---|---|---|---|---|---| -| LIANGUO |SWTG024AS |No| SWTG024AS-v2.0-17452 | CM-23-11-2336 023-17453| 512 KiB | 8272 | -| Horaco |ZX-SWTG124AS | Yes | SWTG024AS-v2.0 | ??? | ??? | 8272 | -| Xikestore |SKS3200M-4GPY2XF | Yes | PCB-SWTG024AS-V2.0-17452 | CM-23-08-2043 023-16721 | 2048 KiB | 8272 | -| Sodola | SL-SWTG124AS-D | Yes | SWTG024AS-v2.0-17452 | ??? | 2048 KiB | 8272 | +| LIANGUO |SWTG024AS |No| PCB-SWTG024AS-V2.0-17452 | CM-23-11-2336 023-17453| 512 KiB | 8272 | +| Horaco |ZX-SWTG124AS | Yes | PCB-SWTG024AS-V2.0-17452 | ??? | ??? | 8272 | +| Xikestore |SKS3200M-4GPY2XF | Yes | PCB-SWTG024AS-V2.0-17452 | CM-23-08-2043 023-16721 | 2048 KiB | 8272 | +| Sodola | SL-SWTG124AS-D | Yes | PCB-SWTG024AS-V2.0-17452 | ??? | 2048 KiB | 8272 | ## PCB diff --git a/doc/supported_devices.md b/doc/supported_devices.md index 626589cc..c585e0c9 100644 --- a/doc/supported_devices.md +++ b/doc/supported_devices.md @@ -11,6 +11,7 @@ The following devices have been tested and are fully working: | GoodTop | GT-ST018M | Yes | [PCB-SWTG018AS-A V2.0.1_19649](devices/PCB-SWTG018AS-A-V2.0.1_19649.md) | 2M | 8 + 1 | | GoodTop | GT-ST024M | Yes | [PCB-SWTG024AS-A V2.0.1_19650](devices/PCB-SWTG024AS-A-V2.0.1_19650.md) | 2M | 4 + 2 | | Guangnianwei | 7018-2.5G | No | [F7008-2.5GPOE-V1.2](devices/F7008-2.5GPOE-V1.2.md) | 8M | 8 + 1 | +| Hasivo | S1100P-8GT-1SX-S | No | [S1100P-8GT-1SX-73N-S-V1.01](devices/S1100P-8GT-1SX-73N-S-V1.01.md) | 2M | 8 + 1 | | Hasivo | S1100WP_8GT_1SX_SE | Yes | [S1100W-8GT-1SX_SE-V1.05](devices/S1100W-8GT-1SX_SE-V1.05.md) | 2M | 8 + 1 | | Hisource | Hi-K0402WS | No | [PCB-K0402W-V2.0](devices/PCB-K0402W-V2.0.md) | 2M | 4 + 2 | | Hisource | Hi-K0402WS | No | [PCB-K0402W-V3.0](devices/PCB-K0402W-V3.0.md) | | 4 + 2 | @@ -24,7 +25,7 @@ The following devices have been tested and are fully working: | Horaco | ZX310S-4T2XH | Yes | [PCB-SL310S-4T1T1X-V1.0.1-24107](devices/PCB-SL310S-4T1T1X-V1.0.1-24107.md) | 2M | 5 + 1 | | Horaco | ZX310S-4T2XT | Yes | [PCB-310S-4T2XT-V1.0.0_22273](devices/PCB-310S-4T2XT-V1.0.0_22273.md) | 2M | 6 | | Horaco | ZX-SG4T2 | No | [SWTG024AS-A-V2.0.1_19650_4C_2SFP](devices/PCB-SWTG024AS-A-V2.0.1_19650.md) | 0.5M | 4 + 2 | -| Horaco | ZX-SWTG124AS | Yes | [SWTG024AS-v2.0](devices/PCB-SWTG024AS-V2.0-17452.md) | | 4 + 2 | +| Horaco | ZX-SWTG124AS | Yes | [PCB-SWTG024AS-V2.0-17452](devices/PCB-SWTG024AS-V2.0-17452.md) | | 4 + 2 | | keepLINK | KP-9000-6XH-X2 | No/Yes | [2M-PCB43-V1.2 / V2.1](devices/2M-PCB43-V2.1.md) | | 4 + 2 | | keepLINK | KP-9000-6XHML-X2| No/Yes | [2M-PCB43-V1.2 / V2.1](devices/2M-PCB43-V2.1.md) | | 4 + 2 | | keepLINK | KP-9000-9XHML-X | Yes | [2M-PCB23-V2.2](devices/2M-PCB23-V2.2.md) | 2M | 8 + 1 | @@ -32,7 +33,7 @@ The following devices have been tested and are fully working: | keepLINK | KP-9000-9XHML-X | Yes | [2M-PCB23-V3.2](devices/2M-PCB23-V3.2.md) | 2M | 8 + 1 | | keepLINK | KP-9000-9XHP-X | No | [2M-PCB51-ML-V1.1](devices/2M-PCB51-ML-V1.1.md) | 4M | 8 + 1 | | LIANGUO | HYWS-SGT0108S | No | [2G5F_20G_V1.01](devices/2G5F_20G_V1.01.md) | 0.5M | 8 + 1 | -| LIANGUO | SWTG024AS | No | [SWTG024AS-v2.0-17452](devices/PCB-SWTG024AS-V2.0-17452.md) | 0.5M | 4 + 2 | +| LIANGUO | SWTG024AS | No | [PCB-SWTG024AS-V2.0-17452](devices/PCB-SWTG024AS-V2.0-17452.md) | 0.5M | 4 + 2 | | LIANGUO | ZX-SWTGW215AS | Yes | [PCB-SWTG115AS-V2.0 / PCB-SWTG115AS-V2.1](devices/PCB-SWTG115AS-V2.0-16030.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 | @@ -45,7 +46,7 @@ The following devices have been tested and are fully working: | Ruiying | RY-8GT-1SX | No | [FG-8GT-1SX](devices/FG-8GT-1SX.md) | 1M | 8 + 1 | | SICSOLINK| SL-G0402F | No | [PCB-K0402W-V3.0](devices/PCB-K0402W-V3.0.md) | | 4 + 2 | | Sirivision | SR-S25G2109F | Yes | [S25G1109FP V1.3](devices/S25G1109FP-V1.3.md) | 2M | 8 + 1 | -| Sodola | SL-SWTG124AS-D | Yes | [SWTG024AS-v2.0-17452](devices/PCB-SWTG024AS-V2.0-17452.md) | 2M | 4 + 2 | +| Sodola | SL-SWTG124AS-D | Yes | [PCB-SWTG024AS-V2.0-17452](devices/PCB-SWTG024AS-V2.0-17452.md) | 2M | 4 + 2 | | Sodola | SL-SWTGW215AS-D | Yes | [SWTG115AS-V2.1-17443](devices/PCB-SWTG115AS-V2.1-17443.md) | 2M | 5 + 1 | | Sodola | SL902-SWTG024AS | Yes | [PCB-SWTG024AS-V2.1.0_19023](devices/PCB-SWTG024AS-V2.1.0_19023.md) | 2M | 4 + 2 | | Steamemo | IG204-V1 | No | [PB-2131](devices/PB-2131.md) | | 4 + 2 | diff --git a/machine/PB_2132.c b/machine/GOALAKE_IG108.c similarity index 100% rename from machine/PB_2132.c rename to machine/GOALAKE_IG108.c diff --git a/machine/PB_2132.h b/machine/GOALAKE_IG108.h similarity index 100% rename from machine/PB_2132.h rename to machine/GOALAKE_IG108.h diff --git a/machine/SWGT024_V2_0_MANAGED.c b/machine/SWGT024_V2_0_MANAGED.c index 5cc37aec..c06e0f8d 120000 --- a/machine/SWGT024_V2_0_MANAGED.c +++ b/machine/SWGT024_V2_0_MANAGED.c @@ -1 +1 @@ -pcb/PCB_SWTG024AS_V2_0_17452_XIKESTOR.c \ No newline at end of file +pcb/PCB_SWTG024AS_V2_0_17452.c \ No newline at end of file diff --git a/machine/SWGT024_V2_0_UNMANAGED.c b/machine/SWGT024_V2_0_UNMANAGED.c index c06e0f8d..df47bcb4 120000 --- a/machine/SWGT024_V2_0_UNMANAGED.c +++ b/machine/SWGT024_V2_0_UNMANAGED.c @@ -1 +1 @@ -pcb/PCB_SWTG024AS_V2_0_17452.c \ No newline at end of file +pcb/PCB_SWTG024AS_V2_0_17452__UNMANAGED.c \ No newline at end of file diff --git a/machine/SWTG024AS_A_V2_0_1_5C_1SFP.c b/machine/SWTG024AS_A_V2_0_1_5C_1SFP.c index 7f9f6dd3..921c085d 120000 --- a/machine/SWTG024AS_A_V2_0_1_5C_1SFP.c +++ b/machine/SWTG024AS_A_V2_0_1_5C_1SFP.c @@ -1 +1 @@ -pcb/PCB_SWTG024AS_A_V2_0_1_19650_HORACO.c \ No newline at end of file +pcb/PCB_SWTG024AS_A_V2_0_1_19650__1S1C.c \ No newline at end of file diff --git a/machine/HG0402XG_V1_1.c b/machine/ZOERAX_HG0402XG_V1_1.c similarity index 100% rename from machine/HG0402XG_V1_1.c rename to machine/ZOERAX_HG0402XG_V1_1.c diff --git a/machine/HG0402XG_V1_1.h b/machine/ZOERAX_HG0402XG_V1_1.h similarity index 100% rename from machine/HG0402XG_V1_1.h rename to machine/ZOERAX_HG0402XG_V1_1.h diff --git a/machine/pcb/PCB_SWTG024AS_A_V2_0_1_19650_HORACO.c b/machine/pcb/PCB_SWTG024AS_A_V2_0_1_19650__1S1C.c similarity index 100% rename from machine/pcb/PCB_SWTG024AS_A_V2_0_1_19650_HORACO.c rename to machine/pcb/PCB_SWTG024AS_A_V2_0_1_19650__1S1C.c diff --git a/machine/pcb/PCB_SWTG024AS_V2_0_17452.c b/machine/pcb/PCB_SWTG024AS_V2_0_17452.c index b07f6d8f..b3997fd3 100644 --- a/machine/pcb/PCB_SWTG024AS_V2_0_17452.c +++ b/machine/pcb/PCB_SWTG024AS_V2_0_17452.c @@ -8,17 +8,17 @@ __code const struct machine machine = { .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_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 = GPIO51_I2C_SDA2_UART1_RX, + .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 = GPIO_NA, + .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 = { @@ -35,4 +35,5 @@ __code const struct machine machine = { 0, }, }, + .mac_flash_offset = 0x1FC000, }; diff --git a/machine/pcb/PCB_SWTG024AS_V2_0_17452_XIKESTOR.c b/machine/pcb/PCB_SWTG024AS_V2_0_17452__UNMANAGED.c similarity index 89% rename from machine/pcb/PCB_SWTG024AS_V2_0_17452_XIKESTOR.c rename to machine/pcb/PCB_SWTG024AS_V2_0_17452__UNMANAGED.c index b3997fd3..b07f6d8f 100644 --- a/machine/pcb/PCB_SWTG024AS_V2_0_17452_XIKESTOR.c +++ b/machine/pcb/PCB_SWTG024AS_V2_0_17452__UNMANAGED.c @@ -8,17 +8,17 @@ __code const struct machine machine = { .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_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 = GPIO_NA, + .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 = GPIO54_ACL_BIT2_EN, + .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 = { @@ -35,5 +35,4 @@ __code const struct machine machine = { 0, }, }, - .mac_flash_offset = 0x1FC000, };