Skip to content

Commit 2f4cd74

Browse files
eightycceightycc
committed
Use MICROPY_HW_MCU_NAME for sysname and nodename for all ports.
1 parent 04e6363 commit 2f4cd74

File tree

10 files changed

+20
-26
lines changed

10 files changed

+20
-26
lines changed

‎ports/analog/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ static const qstr os_uname_info_fields[] = {
1919
MP_QSTR_sysname, MP_QSTR_nodename,
2020
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
2121
};
22-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "max32");
23-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "max32");
22+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
23+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2424

2525
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2626
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

‎ports/atmel-samd/common-hal/os/__init__.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@ static const qstr os_uname_info_fields[] = {
2020
MP_QSTR_sysname, MP_QSTR_nodename,
2121
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
2222
};
23-
#ifdef SAMD21
24-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd21");
25-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd21");
26-
#endif
27-
#ifdef SAM_D5X_E5X
28-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd51");
29-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd51");
30-
#endif
23+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
24+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
3125
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
3226
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
3327
static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);

‎ports/cxd56/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ static const qstr os_uname_info_fields[] = {
1515
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
1616
};
1717

18-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "spresense");
19-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "spresense");
18+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
19+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2020
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2121
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
2222
static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);

‎ports/litex/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ static const qstr os_uname_info_fields[] = {
1616
MP_QSTR_sysname, MP_QSTR_nodename,
1717
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
1818
};
19-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "litex");
20-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "litex");
19+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
20+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2121
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2222
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
2323
static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);

‎ports/mimxrt10xx/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ static const qstr os_uname_info_fields[] = {
2121
MP_QSTR_sysname, MP_QSTR_nodename,
2222
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
2323
};
24-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "mimxrt10xx");
25-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "mimxrt10xx");
24+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
25+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2626
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2727
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
2828
static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);

‎ports/nordic/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ static const qstr os_uname_info_fields[] = {
2121
MP_QSTR_sysname, MP_QSTR_nodename,
2222
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
2323
};
24-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "nrf52");
25-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "nrf52");
24+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
25+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2626

2727
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2828
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

‎ports/renode/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ static const qstr os_uname_info_fields[] = {
1616
MP_QSTR_sysname, MP_QSTR_nodename,
1717
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
1818
};
19-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "renode");
20-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "renode");
19+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
20+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2121
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2222
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
2323
static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);

‎ports/silabs/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ static const qstr os_uname_info_fields[] = {
3939
MP_QSTR_sysname, MP_QSTR_nodename,
4040
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
4141
};
42-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, EFR32_SERIES_LOWER);
43-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, EFR32_SERIES_LOWER);
42+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
43+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
4444

4545
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
4646
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

‎ports/stm/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ static const qstr os_uname_info_fields[] = {
1919
MP_QSTR_sysname, MP_QSTR_nodename,
2020
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
2121
};
22-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, STM32_SERIES_LOWER);
23-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, STM32_SERIES_LOWER);
22+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
23+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2424

2525
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2626
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

‎ports/zephyr-cp/common-hal/os/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ static const qstr os_uname_info_fields[] = {
1717
MP_QSTR_sysname, MP_QSTR_nodename,
1818
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
1919
};
20-
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "nrf52");
21-
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "nrf52");
20+
static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME);
21+
static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME);
2222

2323
static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
2424
static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);

0 commit comments

Comments
 (0)