From 107b1c29062a5d16a638e56b1e48a28ae28b960e Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Mon, 19 Sep 2022 19:46:38 +0200 Subject: [PATCH] machine: do not expose RESET_MAGIC_VALUE This is a constant for internal use only, but was (unintentionally?) exported. In addition, it doesn't follow the Go naming convention. This change simply renames the constant so that it is unexported. --- src/machine/board_arduino_mkr1000.go | 2 +- src/machine/board_arduino_mkrwifi1010.go | 2 +- src/machine/board_arduino_nano33.go | 2 +- src/machine/board_arduino_zero.go | 2 +- src/machine/board_atsame54-xpro.go | 2 +- src/machine/board_circuitplay_express.go | 2 +- src/machine/board_feather-m0.go | 2 +- src/machine/board_feather-m4-can.go | 2 +- src/machine/board_feather-m4.go | 2 +- src/machine/board_grandcentral-m4.go | 2 +- src/machine/board_itsybitsy-m0.go | 2 +- src/machine/board_itsybitsy-m4.go | 2 +- src/machine/board_matrixportal-m4.go | 2 +- src/machine/board_metro-m4-airlift.go | 2 +- src/machine/board_p1am-100.go | 2 +- src/machine/board_pybadge.go | 2 +- src/machine/board_pygamer.go | 2 +- src/machine/board_pyportal.go | 2 +- src/machine/board_qtpy.go | 2 +- src/machine/board_trinket.go | 2 +- src/machine/board_wioterminal.go | 2 +- src/machine/board_xiao.go | 2 +- src/machine/machine_atsamd21.go | 2 +- src/machine/machine_atsamd51.go | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/machine/board_arduino_mkr1000.go b/src/machine/board_arduino_mkr1000.go index 133cb5b89..1cb711621 100644 --- a/src/machine/board_arduino_mkr1000.go +++ b/src/machine/board_arduino_mkr1000.go @@ -7,7 +7,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0x07738135 +const resetMagicValue = 0x07738135 // GPIO Pins const ( diff --git a/src/machine/board_arduino_mkrwifi1010.go b/src/machine/board_arduino_mkrwifi1010.go index 931261d7a..43490f9a5 100644 --- a/src/machine/board_arduino_mkrwifi1010.go +++ b/src/machine/board_arduino_mkrwifi1010.go @@ -7,7 +7,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0x07738135 +const resetMagicValue = 0x07738135 // GPIO Pins const ( diff --git a/src/machine/board_arduino_nano33.go b/src/machine/board_arduino_nano33.go index 9655dd66c..ff53be607 100644 --- a/src/machine/board_arduino_nano33.go +++ b/src/machine/board_arduino_nano33.go @@ -7,7 +7,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0x07738135 +const resetMagicValue = 0x07738135 // GPIO Pins const ( diff --git a/src/machine/board_arduino_zero.go b/src/machine/board_arduino_zero.go index 709109d7f..8e7d9a778 100644 --- a/src/machine/board_arduino_zero.go +++ b/src/machine/board_arduino_zero.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0x07738135 +const resetMagicValue = 0x07738135 // GPIO Pins - Digital Low const ( diff --git a/src/machine/board_atsame54-xpro.go b/src/machine/board_atsame54-xpro.go index 8c2606577..98521002d 100644 --- a/src/machine/board_atsame54-xpro.go +++ b/src/machine/board_atsame54-xpro.go @@ -8,7 +8,7 @@ import ( ) // Definition for compatibility, but not used -const RESET_MAGIC_VALUE = 0x00000000 +const resetMagicValue = 0x00000000 const ( LED = PC18 diff --git a/src/machine/board_circuitplay_express.go b/src/machine/board_circuitplay_express.go index 28f59df27..da2270822 100644 --- a/src/machine/board_circuitplay_express.go +++ b/src/machine/board_circuitplay_express.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_feather-m0.go b/src/machine/board_feather-m0.go index a0c71f56c..01fadc5fe 100644 --- a/src/machine/board_feather-m0.go +++ b/src/machine/board_feather-m0.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_feather-m4-can.go b/src/machine/board_feather-m4-can.go index 7bc1a6e3e..4f2e3d668 100644 --- a/src/machine/board_feather-m4-can.go +++ b/src/machine/board_feather-m4-can.go @@ -8,7 +8,7 @@ import ( ) // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_feather-m4.go b/src/machine/board_feather-m4.go index 07783964d..c9b0b4cbc 100644 --- a/src/machine/board_feather-m4.go +++ b/src/machine/board_feather-m4.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_grandcentral-m4.go b/src/machine/board_grandcentral-m4.go index 61201826f..7acdffe17 100644 --- a/src/machine/board_grandcentral-m4.go +++ b/src/machine/board_grandcentral-m4.go @@ -245,7 +245,7 @@ const ( // Other peripheral constants const ( - RESET_MAGIC_VALUE = 0xF01669EF // Used to reset into bootloader + resetMagicValue = 0xF01669EF // Used to reset into bootloader ) // USB CDC pins diff --git a/src/machine/board_itsybitsy-m0.go b/src/machine/board_itsybitsy-m0.go index 22b2daa7f..32e9d82a5 100644 --- a/src/machine/board_itsybitsy-m0.go +++ b/src/machine/board_itsybitsy-m0.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_itsybitsy-m4.go b/src/machine/board_itsybitsy-m4.go index f42efee98..8170b678c 100644 --- a/src/machine/board_itsybitsy-m4.go +++ b/src/machine/board_itsybitsy-m4.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_matrixportal-m4.go b/src/machine/board_matrixportal-m4.go index 7fa91fc3a..9d3303530 100644 --- a/src/machine/board_matrixportal-m4.go +++ b/src/machine/board_matrixportal-m4.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xF01669EF +const resetMagicValue = 0xF01669EF // Digital pins const ( diff --git a/src/machine/board_metro-m4-airlift.go b/src/machine/board_metro-m4-airlift.go index 2350ea71b..649de0be3 100644 --- a/src/machine/board_metro-m4-airlift.go +++ b/src/machine/board_metro-m4-airlift.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_p1am-100.go b/src/machine/board_p1am-100.go index 4d7410d58..e7a74a785 100644 --- a/src/machine/board_p1am-100.go +++ b/src/machine/board_p1am-100.go @@ -7,7 +7,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0x07738135 +const resetMagicValue = 0x07738135 // Note: On the P1AM-100, pins D8, D9, D10, A3, and A4 are used for // communication with the base controller. diff --git a/src/machine/board_pybadge.go b/src/machine/board_pybadge.go index 69b814a5c..65432d7dc 100644 --- a/src/machine/board_pybadge.go +++ b/src/machine/board_pybadge.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_pygamer.go b/src/machine/board_pygamer.go index 319e9e95f..b1d6a4251 100644 --- a/src/machine/board_pygamer.go +++ b/src/machine/board_pygamer.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_pyportal.go b/src/machine/board_pyportal.go index 3e7aa7cb7..600969b48 100644 --- a/src/machine/board_pyportal.go +++ b/src/machine/board_pyportal.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_qtpy.go b/src/machine/board_qtpy.go index aa294b81e..3ebf1fdd0 100644 --- a/src/machine/board_qtpy.go +++ b/src/machine/board_qtpy.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_trinket.go b/src/machine/board_trinket.go index 34f271910..c95dd2c5e 100644 --- a/src/machine/board_trinket.go +++ b/src/machine/board_trinket.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/board_wioterminal.go b/src/machine/board_wioterminal.go index ad182c457..dfe836e61 100644 --- a/src/machine/board_wioterminal.go +++ b/src/machine/board_wioterminal.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef const ( ADC0 = A0 diff --git a/src/machine/board_xiao.go b/src/machine/board_xiao.go index aa8c44045..aee638493 100644 --- a/src/machine/board_xiao.go +++ b/src/machine/board_xiao.go @@ -4,7 +4,7 @@ package machine // used to reset into bootloader -const RESET_MAGIC_VALUE = 0xf01669ef +const resetMagicValue = 0xf01669ef // GPIO Pins const ( diff --git a/src/machine/machine_atsamd21.go b/src/machine/machine_atsamd21.go index b587dc4f6..587fb3623 100644 --- a/src/machine/machine_atsamd21.go +++ b/src/machine/machine_atsamd21.go @@ -1735,7 +1735,7 @@ func EnterBootloader() { // Perform magic reset into bootloader, as mentioned in // https://github.com/arduino/ArduinoCore-samd/issues/197 - *(*uint32)(unsafe.Pointer(uintptr(0x20007FFC))) = RESET_MAGIC_VALUE + *(*uint32)(unsafe.Pointer(uintptr(0x20007FFC))) = resetMagicValue arm.SystemReset() } diff --git a/src/machine/machine_atsamd51.go b/src/machine/machine_atsamd51.go index 9e0750a2e..0c296553b 100644 --- a/src/machine/machine_atsamd51.go +++ b/src/machine/machine_atsamd51.go @@ -1975,7 +1975,7 @@ func EnterBootloader() { // Perform magic reset into bootloader, as mentioned in // https://github.com/arduino/ArduinoCore-samd/issues/197 - *(*uint32)(unsafe.Pointer(uintptr(0x20000000 + HSRAM_SIZE - 4))) = RESET_MAGIC_VALUE + *(*uint32)(unsafe.Pointer(uintptr(0x20000000 + HSRAM_SIZE - 4))) = resetMagicValue arm.SystemReset() }