Merge pull request #640 from hlyi/add-chipset

Add MACHINE_CHIPSET in header files.

doc/adding-a-device.md

@@ -1,6 +1,6 @@
 # Adding a new device
 
-A device is supported by adding one board definition `.h` and board configuration `.c` file
+A device is supported by adding one board header `.h` and board definition `.c` file
 under `machine/`. 
 the build selects the definition by name, and CI compiles every file it finds.
 
@@ -14,27 +14,34 @@ make MACHINE=<NAME>
 | 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 |
+| `machine/<NAME>.h` | `MACHINE_MODEL` (the model string shown in the UI and the CLI) and `MACHINE_CHIPSET` (`RTL8372` or `RTL8373`) |
 | `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
+## Step 1: the board header
 
-`machine/<NAME>.h` only carries the product string. Use the existing files as
+`machine/<NAME>.h` carries the product string and the SoC family. Use the
-the template:
+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"
+#define MACHINE_CHIPSET RTL8373
 
 #endif
 ```
 
+`MACHINE_CHIPSET` is `RTL8373` or `RTL8372`; a build without it will fail. It selects the default
+logical port range: `min_port` is `0` for RTL8373 and `3` for RTL8372, while `max_port` is `8`,
+the highest logical port index. A board with a different range defines
+`MACHINE_MIN_PORT` and/or `MACHINE_MAX_PORT` in its header to override the
+defaults.
+
 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]
@@ -55,10 +62,7 @@ ports and the same number of SFP+ cages.
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},
@@ -89,13 +93,16 @@ __code const struct machine machine = {
 };
 ```
 
+`MACHINE_COMMON_SETTING` (from `machine_defs.h`) initializes `machine_name`,
+`isRTL8373`, `min_port` and `max_port` from the header's `MACHINE_MODEL` and
+`MACHINE_CHIPSET`. Keep it as the first initializer and list the
+board-specific fields after it.
+
 ### Fields
 
 | Field | Meaning |
 |-------|---------|
-| `machine_name` | always `MACHINE_MODEL` |
+| `MACHINE_COMMON_SETTING` | expands to `machine_name` (`MACHINE_MODEL`), `isRTL8373` (`1` for `RTL8373`, `0` for `RTL8372`), `min_port` and `max_port`; all are derived from the header's `MACHINE_CHIPSET` (see Step 1) |
-| `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 |
@@ -130,8 +137,10 @@ 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
+The new board still needs `machine/MY_BOARD_1_0.h` (pick the version number on
-`MACHINE_MODEL`, because `MACHINE_MODEL` is what distinguishes the products.
+the PCB) with its own `MACHINE_MODEL` and `MACHINE_CHIPSET`: `MACHINE_MODEL` is
+what distinguishes the products, and `MACHINE_CHIPSET` must match the SoC of
+the board definition being reused.
 Existing examples: `machine/PCB_K0402WS_V3.c`, `machine/KP_9000_9XHML_X_V3_2.c`
 and the six `KP_9000_*` revision variants.
 

machine.h

@@ -15,8 +15,48 @@
 
 #define MACHINE_INC(dir,file) MACHINE_STR(dir/file)
 
+#define RTL8370 0x70
+#define RTL8372 0x72
+#define RTL8373 0x73
+
 #include  MACHINE_INC(MACHINE_DEF_DIR,MACHINE_NAME.h)
 
+
+#ifndef MACHINE_CHIPSET
+#error "MACHINE_CHIPSET shall be defined in <machine>.h file"
+#endif
+
+#ifndef MACHINE_MIN_PORT
+#if MACHINE_CHIPSET == RTL8372
+#define MACHINE_MIN_PORT 3
+#else
+#define MACHINE_MIN_PORT 0
+#endif
+#endif
+
+#ifndef MACHINE_MAX_PORT
+#if MACHINE_CHIPSET == RTL8370
+#define MACHINE_MAX_PORT 7
+#else
+#define MACHINE_MAX_PORT 8
+#endif
+#endif
+
+// auto derive SOC_FAMILY
+#define RTL836X 6
+#define RTL837X 7
+
+#ifdef SOC_FAMILY
+#error "SOC_FAMILY can not be manually defined, shall be auto derived"
+#endif
+#if (MACHINE_CHIPSET == RTL8372) || (MACHINE_CHIPSET == RTL8373)
+#define SOC_FAMILY RTL837X
+#elif (MACHINE_CHIPSET == RTL8370 )
+#define SOC_FAMILY RTL836X
+#else
+#error "Unsupported MACHINE_CHIPSET is specified!"
+#endif
+
 #define LED_27 1
 // SYSTEM LED
 #define LED_28_SYS 2

machine/2G08110GSN.h

@@ -2,5 +2,6 @@
 #define _MACHINE_2G08110GSN_H_
 
 #define MACHINE_MODEL "MokerLink 2G08110GSN"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/2G5F4_10G2_V1_01.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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

machine/2G5F4_10G2_V1_01.h

@@ -2,5 +2,6 @@
 #define _MACHINE_2G5F4_10G2_V1_01_H_
 
 #define MACHINE_MODEL "2G5F4_10G2_V1.01 / SGT0204S"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/DEFAULT_8C_1SFP.h

@@ -2,5 +2,6 @@
 #define _MACHINE_DEFAULT_8C_1SFP_H_
 
 #define MACHINE_MODEL "8+1 SFP Port Switch"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/F7008_2_5.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/F7008_2_5.h

@@ -2,5 +2,6 @@
 #define _MACHINE_F7008_2_5_H_
 
 #define MACHINE_MODEL "F7008-2.5 8+1 SFP Port Switch"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/FG_4GT_2SX_V2_0.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/FG_4GT_2SX_V2_0.h

@@ -2,5 +2,6 @@
 #define _MACHINE_FG_4GT_2SX_V2_0_H_
 
 #define MACHINE_MODEL "FG-4GT-2SX_V2.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/FG_8GT_1SX.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/FG_8GT_1SX.h

@@ -2,5 +2,6 @@
 #define _MACHINE_FG_8GT_1SX_H_
 
 #define MACHINE_MODEL "FG-8GT-1SX"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/FNS1200P.h

@@ -2,5 +2,6 @@
 #define _MACHINE_FNS1200P_H_
 
 #define MACHINE_MODEL "FNS-1200P"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/GT_ST018M.h

@@ -2,5 +2,6 @@
 #define _MACHINE_GT_ST018M_H_
 
 #define MACHINE_MODEL "GoodTop GT-ST018M"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/GT_ST024M.h

@@ -2,5 +2,6 @@
 #define _MACHINE_GT_ST024M_H_
 
 #define MACHINE_MODEL "GoodTop GT-ST024M"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/HASIVO_S1100P_8GT_1SX_S.c

@@ -1,11 +1,8 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/HASIVO_S1100P_8GT_1SX_S.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HASIVO_S1100P_8GT_1SX_S_H_
 
 #define MACHINE_MODEL "Hasivo S1100P-8GT-1SX-S"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/HASIVO_S1100WP_8GT_1SX_SE.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HASIVO_S1100WP_8GT_1SX_SE_H_
 
 #define MACHINE_MODEL "Hasivo S1100WP-8GT-1SX-SE"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/HASIVO_S600W_4GT_2XGT_SE.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/HASIVO_S600W_4GT_2XGT_SE.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HASIVO_S600W_4GT_2XGT_SE_H_
 
 #define MACHINE_MODEL "Hasivo S600W-4GT-2XGT-SE"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/HC_SWTG124AS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HC_SWTG124AS_H_
 
 #define MACHINE_MODEL "Horaco HC-SWTG124AS"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/HG0402XG_V1_1.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/HG0402XG_V1_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HG0402XG_V1_1_H_
 
 #define MACHINE_MODEL "HG0402XG V1.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/HI_K0402WS.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/HI_K0402WS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HI_K0402WS_H_
 
 #define MACHINE_MODEL "PCB-K0402WS-V3.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/HI_K0801WS.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/HI_K0801WS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_HI_K0801WS_H_
 
 #define MACHINE_MODEL "Hi-Source HI-k0801WS"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/K0501W_V2_0.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/K0501W_V2_0.h

@@ -2,5 +2,6 @@
 #define _MACHINE_K0501W_V2_0_H_
 
 #define MACHINE_MODEL "K0501W V2.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XHML_X2.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/KP_9000_6XHML_X2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XHML_X2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XHML-X2"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XHML_X2_V1_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XHML_X2_V1_1_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XHML V1.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XHML_X2_V1_2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XHML_X2_V1_2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XHML V1.2"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XHML_X2_V2_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XHML_X2_V2_1_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XHML V2.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XH_X.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/KP_9000_6XH_X.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XH_X_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XH-X"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XH_X2.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/KP_9000_6XH_X2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XH_X2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XH-X2"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XH_X2_V1_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XH_X2_V1_1_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XH V1.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XH_X2_V1_2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XH_X2_V1_2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XH V1.2"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_6XH_X2_V2_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_6XH_X2_V2_1_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-6XH-X2 V2.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/KP_9000_9XHML_X_V2_2.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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 },

machine/KP_9000_9XHML_X_V2_2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_9XHML_X_V2_2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-9XHML-X V2.2"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/KP_9000_9XHML_X_V3_1.c

@@ -2,10 +2,7 @@
 
 // 2M-PCB23-V3.2 is wired like V3.1 (SFP detection, LEDs, factory MAC location)
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/KP_9000_9XHML_X_V3_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_9XHML_X_V3_1_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-9XHML-X V3.1"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/KP_9000_9XHML_X_V3_2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_9XHML_X_V3_2_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-9XHML-X V3.2"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/KP_9000_9XH_X_EU.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/KP_9000_9XH_X_EU.h

@@ -2,5 +2,6 @@
 #define _MACHINE_KP_9000_9XH_X_EU_H_
 
 #define MACHINE_MODEL "keepLink KP-9000-9XH-X-EU"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/LIANGUO_HYWS_SGT0108S.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/LIANGUO_HYWS_SGT0108S.h

@@ -2,5 +2,6 @@
 #define _MACHINE_LIANGUO_HYWS_SGT0108S_H_
 
 #define MACHINE_MODEL "Lianguo HYWS-SGT0108S"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/LIANGUO_ZX_SWTGW215AS.c

@@ -1,11 +1,8 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/LIANGUO_ZX_SWTGW215AS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_LIANGUO_ZX_SWTGW215AS_H_
 
 #define MACHINE_MODEL "Lianguo ZX-SWTGW215AS"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/ONT_S207CW_62TS_SE.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/ONT_S207CW_62TS_SE.h

@@ -2,5 +2,6 @@
 #define _MACHINE_ONT_S207CW_62TS_SE_H_
 
 #define MACHINE_MODEL "ONT-S207CW-62TS-SE / Binardat 2G06-04210GSM / Binardat 2G06-04210GS"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/PB_2132.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/PB_2132.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PB_2132_H_
 
 #define MACHINE_MODEL "PB-2132"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/PCB_K0402WS_V1.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/PCB_K0402WS_V1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PCB_K0402WS_V1_H_
 
 #define MACHINE_MODEL "PCB-K0402WS-V1.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/PCB_K0402WS_V2.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-    .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},

machine/PCB_K0402WS_V2.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PCB_K0402WS_V2_H_
 
 #define MACHINE_MODEL "PCB-K0402WS-V2.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/PCB_K0402WS_V3.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PCB_K0402WS_V3_H_
 
 #define MACHINE_MODEL "PCB-K0402WS-V3.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/PCB_SWTG018AS_V2_1_0.c

@@ -2,11 +2,8 @@
 
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/PCB_SWTG018AS_V2_1_0.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PCB_SWTG018AS_V2_1_0_H_
 
 #define MACHINE_MODEL "SWTGW218AS (SWTG018AS-V2.1.0)"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/PCB_SWTG024AS_A_2_0_1.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/PCB_SWTG024AS_A_2_0_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_PCB_SWTG024AS_A_2_0_1_H_
 
 #define MACHINE_MODEL "PCB-SWTG024AS-A-2.0.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/POE_2G080110GS.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/POE_2G080110GS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_POE_2G080110GS_H_
 
 #define MACHINE_MODEL "MokerLink POE-2G080110GS"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/SIRIVISION_S25G2206FP_V1_1.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/SIRIVISION_S25G2206FP_V1_1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SIRIVISION_S25G2206FP_V1_1_H_
 
 #define MACHINE_MODEL "SIRIVISION S25G2206FP V1.1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SKS3200_8E1X.h

@@ -2,6 +2,7 @@
 #define _MACHINE_SKS3200_8E1X_H_
 
 #define MACHINE_MODEL "XikeStor SKS3200-8E1X"
+#define MACHINE_CHIPSET RTL8373
 
 #endif
 

machine/STEAMEMO_IG204_V1.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/STEAMEMO_IG204_V1.h

@@ -2,5 +2,6 @@
 #define _MACHINE_STEAMEMO_IG204_V1_H_
 
 #define MACHINE_MODEL "Steamemo IG204 V1"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SWGT024_V2_0_MANAGED.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/SWGT024_V2_0_MANAGED.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWGT024_V2_0_MANAGED_H_
 
 #define MACHINE_MODEL "SWGT024 V2.0 Managed"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SWGT024_V2_0_UNMANAGED.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/SWGT024_V2_0_UNMANAGED.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWGT024_V2_0_UNMANAGED_H_
 
 #define MACHINE_MODEL "SWGT024 V2.0 Unmanaged"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SWTG018AS_A_V_2_0.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/SWTG018AS_A_V_2_0.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWTG018AS_A_V_2_0_H_
 
 #define MACHINE_MODEL "SWTG018AS-A V2.0"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/SWTG024AS_A_2_0_1_5C_1SFP.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/SWTG024AS_A_2_0_1_5C_1SFP.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWTG024AS_A_2_0_1_5C_1SFP_H_
 
 #define MACHINE_MODEL "SWTG024AS-A-V2.0.1-5C-1SFP"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SWTG024AS_V2_0.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-    .machine_name = MACHINE_MODEL,
+    MACHINE_COMMON_SETTING,
-    .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},

machine/SWTG024AS_V2_0.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWTG024AS_V2_0_H_
 
 #define MACHINE_MODEL "SWTG024AS-V2.0"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/SWTGW218AS.c

@@ -2,11 +2,8 @@
 
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/SWTGW218AS.h

@@ -2,5 +2,6 @@
 #define _MACHINE_SWTGW218AS_H_
 
 #define MACHINE_MODEL "SWTGW218AS 8+1 Managed Switch"
+#define MACHINE_CHIPSET RTL8373
 
 #endif

machine/TRENDNET_TEG_S562.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/TRENDNET_TEG_S562.h

@@ -2,5 +2,6 @@
 #define _MACHINE_TRENDNET_TEG_S562_H_
 
 #define MACHINE_MODEL "Trendnet TEG-S562"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/YS25_0402M.h

@@ -2,5 +2,6 @@
 #define _MACHINE_YS25_0402M_H_
 
 #define MACHINE_MODEL "YuanLey YS25-0402M"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/ZX310S_4T2XH.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/ZX310S_4T2XH.h

@@ -2,5 +2,6 @@
 #define _MACHINE_ZX310S_4T2XH_H_
 
 #define MACHINE_MODEL "ZX310S-4T2XH"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/ZX310S_4T2XT.c

@@ -1,10 +1,7 @@
 #include "machine_defs.h"
 
 __code const struct machine machine = {
-	.machine_name = MACHINE_MODEL,
+	MACHINE_COMMON_SETTING,
-	.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},

machine/ZX310S_4T2XT.h

@@ -2,5 +2,6 @@
 #define _MACHINE_ZX310S_4T2XT_H_
 
 #define MACHINE_MODEL "ZX310S_4T2XT"
+#define MACHINE_CHIPSET RTL8372
 
 #endif

machine/default_machine.h

@@ -11,7 +11,11 @@
  * 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.
+ * selected. MACHINE_CHIPSET has to be present because machine.h requires it;
+ * the tests supply their own `machine` object, so the chipset-derived port
+ * defaults below it are unused.
  */
 
+#define MACHINE_CHIPSET RTL8373
+
 #endif

machine/machine_defs.h

@@ -41,4 +41,10 @@
 	 (scl_pin) == GPIO50_I2C_SCL2_UART1_TX ? 2 : \
 	 (scl_pin) == GPIO40_I2C_SCL3_MDC1 ? 3 : I2CBUS_INVALID)
 
+#define MACHINE_COMMON_SETTING \
+	.machine_name = MACHINE_MODEL, \
+	.isRTL8373 = MACHINE_CHIPSET == RTL8373, \
+	.min_port = MACHINE_MIN_PORT, \
+	.max_port = MACHINE_MAX_PORT
+
 #endif