stm32: Change header include guards from STMHAL to STM32 to match dir.

38 files changed, 114 insertions, 114 deletions

diff --git a/ports/stm32/accel.h b/ports/stm32/accel.h
index fc35f77756..1fea1249c7 100644
--- a/ports/stm32/accel.h
+++ b/ports/stm32/accel.h
@@ -23,11 +23,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_ACCEL_H
-#define MICROPY_INCLUDED_STMHAL_ACCEL_H
+#ifndef MICROPY_INCLUDED_STM32_ACCEL_H
+#define MICROPY_INCLUDED_STM32_ACCEL_H
 
 extern const mp_obj_type_t pyb_accel_type;
 
 void accel_init(void);
 
-#endif // MICROPY_INCLUDED_STMHAL_ACCEL_H
+#endif // MICROPY_INCLUDED_STM32_ACCEL_H
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index c90e6b3433..4ae6022bc3 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -23,10 +23,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_ADC_H
-#define MICROPY_INCLUDED_STMHAL_ADC_H
+#ifndef MICROPY_INCLUDED_STM32_ADC_H
+#define MICROPY_INCLUDED_STM32_ADC_H
 
 extern const mp_obj_type_t pyb_adc_type;
 extern const mp_obj_type_t pyb_adc_all_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_ADC_H
+#endif // MICROPY_INCLUDED_STM32_ADC_H
diff --git a/ports/stm32/bufhelper.h b/ports/stm32/bufhelper.h
index c1967bf430..12c79c2fda 100644
--- a/ports/stm32/bufhelper.h
+++ b/ports/stm32/bufhelper.h
@@ -23,10 +23,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_BUFHELPER_H
-#define MICROPY_INCLUDED_STMHAL_BUFHELPER_H
+#ifndef MICROPY_INCLUDED_STM32_BUFHELPER_H
+#define MICROPY_INCLUDED_STM32_BUFHELPER_H
 
 void pyb_buf_get_for_send(mp_obj_t o, mp_buffer_info_t *bufinfo, byte *tmp_data);
 mp_obj_t pyb_buf_get_for_recv(mp_obj_t o, vstr_t *vstr);
 
-#endif // MICROPY_INCLUDED_STMHAL_BUFHELPER_H
+#endif // MICROPY_INCLUDED_STM32_BUFHELPER_H
diff --git a/ports/stm32/can.h b/ports/stm32/can.h
index 8600128139..b725b59249 100644
--- a/ports/stm32/can.h
+++ b/ports/stm32/can.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_CAN_H
-#define MICROPY_INCLUDED_STMHAL_CAN_H
+#ifndef MICROPY_INCLUDED_STM32_CAN_H
+#define MICROPY_INCLUDED_STM32_CAN_H
 
 #define PYB_CAN_1 (1)
 #define PYB_CAN_2 (2)
@@ -35,4 +35,4 @@ void can_init0(void);
 void can_deinit(void);
 void can_rx_irq_handler(uint can_id, uint fifo_id);
 
-#endif // MICROPY_INCLUDED_STMHAL_CAN_H
+#endif // MICROPY_INCLUDED_STM32_CAN_H
diff --git a/ports/stm32/dac.h b/ports/stm32/dac.h
index f487f52a92..1d8f0ab61e 100644
--- a/ports/stm32/dac.h
+++ b/ports/stm32/dac.h
@@ -23,11 +23,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_DAC_H
-#define MICROPY_INCLUDED_STMHAL_DAC_H
+#ifndef MICROPY_INCLUDED_STM32_DAC_H
+#define MICROPY_INCLUDED_STM32_DAC_H
 
 void dac_init(void);
 
 extern const mp_obj_type_t pyb_dac_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_DAC_H
+#endif // MICROPY_INCLUDED_STM32_DAC_H
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 55fb621758..0055181612 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_DMA_H
-#define MICROPY_INCLUDED_STMHAL_DMA_H
+#ifndef MICROPY_INCLUDED_STM32_DMA_H
+#define MICROPY_INCLUDED_STM32_DMA_H
 
 typedef struct _dma_descr_t dma_descr_t;
 
@@ -100,4 +100,4 @@ void dma_deinit(const dma_descr_t *dma_descr);
 void dma_invalidate_channel(const dma_descr_t *dma_descr);
 void dma_idle_handler(int controller);
 
-#endif // MICROPY_INCLUDED_STMHAL_DMA_H
+#endif // MICROPY_INCLUDED_STM32_DMA_H
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 846790b9be..0bd20affa7 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_EXTINT_H
-#define MICROPY_INCLUDED_STMHAL_EXTINT_H
+#ifndef MICROPY_INCLUDED_STM32_EXTINT_H
+#define MICROPY_INCLUDED_STM32_EXTINT_H
 
 // Vectors 0-15 are for regular pins
 // Vectors 16-22 are for internal sources.
@@ -64,4 +64,4 @@ void Handle_EXTI_Irq(uint32_t line);
 
 extern const mp_obj_type_t extint_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_EXTINT_H
+#endif // MICROPY_INCLUDED_STM32_EXTINT_H
diff --git a/ports/stm32/flash.h b/ports/stm32/flash.h
index 688e70a3cd..d69f6e27f6 100644
--- a/ports/stm32/flash.h
+++ b/ports/stm32/flash.h
@@ -23,11 +23,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_FLASH_H
-#define MICROPY_INCLUDED_STMHAL_FLASH_H
+#ifndef MICROPY_INCLUDED_STM32_FLASH_H
+#define MICROPY_INCLUDED_STM32_FLASH_H
 
 uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
 void flash_erase(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
 void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
 
-#endif // MICROPY_INCLUDED_STMHAL_FLASH_H
+#endif // MICROPY_INCLUDED_STM32_FLASH_H
diff --git a/ports/stm32/font_petme128_8x8.h b/ports/stm32/font_petme128_8x8.h
index 8b0cc9cb01..cdc4e73a79 100644
--- a/ports/stm32/font_petme128_8x8.h
+++ b/ports/stm32/font_petme128_8x8.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_FONT_PETME128_8X8_H
-#define MICROPY_INCLUDED_STMHAL_FONT_PETME128_8X8_H
+#ifndef MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
+#define MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
 
 static const uint8_t font_petme128_8x8[] = {
     0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 32= 
@@ -125,4 +125,4 @@ static const uint8_t font_petme128_8x8[] = {
     0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55, // 127
 };
 
-#endif // MICROPY_INCLUDED_STMHAL_FONT_PETME128_8X8_H
+#endif // MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
diff --git a/ports/stm32/gccollect.h b/ports/stm32/gccollect.h
index 1b64a51a6a..25a74a306a 100644
--- a/ports/stm32/gccollect.h
+++ b/ports/stm32/gccollect.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_GCCOLLECT_H
-#define MICROPY_INCLUDED_STMHAL_GCCOLLECT_H
+#ifndef MICROPY_INCLUDED_STM32_GCCOLLECT_H
+#define MICROPY_INCLUDED_STM32_GCCOLLECT_H
 
 // variables defining memory layout
 // (these probably belong somewhere else...)
@@ -40,4 +40,4 @@ extern uint32_t _heap_end;
 extern uint32_t _estack;
 extern uint32_t _ram_end;
 
-#endif // MICROPY_INCLUDED_STMHAL_GCCOLLECT_H
+#endif // MICROPY_INCLUDED_STM32_GCCOLLECT_H
diff --git a/ports/stm32/i2c.h b/ports/stm32/i2c.h
index 6affe3973b..f416c791ee 100644
--- a/ports/stm32/i2c.h
+++ b/ports/stm32/i2c.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_I2C_H
-#define MICROPY_INCLUDED_STMHAL_I2C_H
+#ifndef MICROPY_INCLUDED_STM32_I2C_H
+#define MICROPY_INCLUDED_STM32_I2C_H
 
 #include "dma.h"
 
@@ -52,4 +52,4 @@ uint32_t i2c_get_baudrate(I2C_InitTypeDef *init);
 void i2c_ev_irq_handler(mp_uint_t i2c_id);
 void i2c_er_irq_handler(mp_uint_t i2c_id);
 
-#endif // MICROPY_INCLUDED_STMHAL_I2C_H
+#endif // MICROPY_INCLUDED_STM32_I2C_H
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index 2cf58639ea..d0bb49c525 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_IRQ_H
-#define MICROPY_INCLUDED_STMHAL_IRQ_H
+#ifndef MICROPY_INCLUDED_STM32_IRQ_H
+#define MICROPY_INCLUDED_STM32_IRQ_H
 
 // these states correspond to values from query_irq, enable_irq and disable_irq
 #define IRQ_STATE_DISABLED (0x00000001)
@@ -149,4 +149,4 @@ MP_DECLARE_CONST_FUN_OBJ_0(pyb_irq_stats_obj);
 #define IRQ_PRI_RTC_WKUP        15
 #define IRQ_SUBPRI_RTC_WKUP                 0
 
-#endif // MICROPY_INCLUDED_STMHAL_IRQ_H
+#endif // MICROPY_INCLUDED_STM32_IRQ_H
diff --git a/ports/stm32/lcd.h b/ports/stm32/lcd.h
index c0d9bd97da..98f904848f 100644
--- a/ports/stm32/lcd.h
+++ b/ports/stm32/lcd.h
@@ -23,9 +23,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_LCD_H
-#define MICROPY_INCLUDED_STMHAL_LCD_H
+#ifndef MICROPY_INCLUDED_STM32_LCD_H
+#define MICROPY_INCLUDED_STM32_LCD_H
 
 extern const mp_obj_type_t pyb_lcd_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_LCD_H
+#endif // MICROPY_INCLUDED_STM32_LCD_H
diff --git a/ports/stm32/led.h b/ports/stm32/led.h
index 2c872e9c5f..1cc96b75ab 100644
--- a/ports/stm32/led.h
+++ b/ports/stm32/led.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_LED_H
-#define MICROPY_INCLUDED_STMHAL_LED_H
+#ifndef MICROPY_INCLUDED_STM32_LED_H
+#define MICROPY_INCLUDED_STM32_LED_H
 
 typedef enum {
     PYB_LED_RED = 1,
@@ -40,4 +40,4 @@ void led_debug(int value, int delay);
 
 extern const mp_obj_type_t pyb_led_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_LED_H
+#endif // MICROPY_INCLUDED_STM32_LED_H
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 81c6375c7e..88fe236921 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_MODMACHINE_H
-#define MICROPY_INCLUDED_STMHAL_MODMACHINE_H
+#ifndef MICROPY_INCLUDED_STM32_MODMACHINE_H
+#define MICROPY_INCLUDED_STM32_MODMACHINE_H
 
 #include "py/obj.h"
 
@@ -39,4 +39,4 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_sleep_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_deepsleep_obj);
 
-#endif // MICROPY_INCLUDED_STMHAL_MODMACHINE_H
+#endif // MICROPY_INCLUDED_STM32_MODMACHINE_H
diff --git a/ports/stm32/modnetwork.h b/ports/stm32/modnetwork.h
index ecda94da41..6796b087a4 100644
--- a/ports/stm32/modnetwork.h
+++ b/ports/stm32/modnetwork.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_MODNETWORK_H
-#define MICROPY_INCLUDED_STMHAL_MODNETWORK_H
+#ifndef MICROPY_INCLUDED_STM32_MODNETWORK_H
+#define MICROPY_INCLUDED_STM32_MODNETWORK_H
 
 #define MOD_NETWORK_IPADDR_BUF_SIZE (4)
 
@@ -80,4 +80,4 @@ void mod_network_init(void);
 void mod_network_register_nic(mp_obj_t nic);
 mp_obj_t mod_network_find_nic(const uint8_t *ip);
 
-#endif // MICROPY_INCLUDED_STMHAL_MODNETWORK_H
+#endif // MICROPY_INCLUDED_STM32_MODNETWORK_H
diff --git a/ports/stm32/pendsv.h b/ports/stm32/pendsv.h
index 6a9eb0d794..0d9fde6878 100644
--- a/ports/stm32/pendsv.h
+++ b/ports/stm32/pendsv.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_PENDSV_H
-#define MICROPY_INCLUDED_STMHAL_PENDSV_H
+#ifndef MICROPY_INCLUDED_STM32_PENDSV_H
+#define MICROPY_INCLUDED_STM32_PENDSV_H
 
 void pendsv_init(void);
 void pendsv_kbd_intr(void);
@@ -33,4 +33,4 @@ void pendsv_kbd_intr(void);
 // prelude for this function
 void pendsv_isr_handler(void) __attribute__((naked));
 
-#endif // MICROPY_INCLUDED_STMHAL_PENDSV_H
+#endif // MICROPY_INCLUDED_STM32_PENDSV_H
diff --git a/ports/stm32/pin.h b/ports/stm32/pin.h
index 90de79e5ce..2439ebbbef 100644
--- a/ports/stm32/pin.h
+++ b/ports/stm32/pin.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_PIN_H
-#define MICROPY_INCLUDED_STMHAL_PIN_H
+#ifndef MICROPY_INCLUDED_STM32_PIN_H
+#define MICROPY_INCLUDED_STM32_PIN_H
 
 // This file requires pin_defs_xxx.h (which has port specific enums and
 // defines, so we include it here. It should never be included directly
@@ -97,4 +97,4 @@ const pin_af_obj_t *pin_find_af(const pin_obj_t *pin, uint8_t fn, uint8_t unit);
 const pin_af_obj_t *pin_find_af_by_index(const pin_obj_t *pin, mp_uint_t af_idx);
 const pin_af_obj_t *pin_find_af_by_name(const pin_obj_t *pin, const char *name);
 
-#endif // MICROPY_INCLUDED_STMHAL_PIN_H
+#endif // MICROPY_INCLUDED_STM32_PIN_H
diff --git a/ports/stm32/portmodules.h b/ports/stm32/portmodules.h
index b575109b89..81cb7fd04a 100644
--- a/ports/stm32/portmodules.h
+++ b/ports/stm32/portmodules.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_PORTMODULES_H
-#define MICROPY_INCLUDED_STMHAL_PORTMODULES_H
+#ifndef MICROPY_INCLUDED_STM32_PORTMODULES_H
+#define MICROPY_INCLUDED_STM32_PORTMODULES_H
 
 extern const mp_obj_module_t pyb_module;
 extern const mp_obj_module_t stm_module;
@@ -40,4 +40,4 @@ MP_DECLARE_CONST_FUN_OBJ_1(time_sleep_us_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(mod_os_sync_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_dupterm_obj);
 
-#endif // MICROPY_INCLUDED_STMHAL_PORTMODULES_H
+#endif // MICROPY_INCLUDED_STM32_PORTMODULES_H
diff --git a/ports/stm32/pybthread.h b/ports/stm32/pybthread.h
index f628f934bc..42300508c9 100644
--- a/ports/stm32/pybthread.h
+++ b/ports/stm32/pybthread.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_PYBTHREAD_H
-#define MICROPY_INCLUDED_STMHAL_PYBTHREAD_H
+#ifndef MICROPY_INCLUDED_STM32_PYBTHREAD_H
+#define MICROPY_INCLUDED_STM32_PYBTHREAD_H
 
 typedef struct _pyb_thread_t {
     void *sp;
@@ -74,4 +74,4 @@ void pyb_mutex_init(pyb_mutex_t *m);
 int pyb_mutex_lock(pyb_mutex_t *m, int wait);
 void pyb_mutex_unlock(pyb_mutex_t *m);
 
-#endif // MICROPY_INCLUDED_STMHAL_PYBTHREAD_H
+#endif // MICROPY_INCLUDED_STM32_PYBTHREAD_H
diff --git a/ports/stm32/rng.h b/ports/stm32/rng.h
index 1478b7d3f2..ed9cc80f2b 100644
--- a/ports/stm32/rng.h
+++ b/ports/stm32/rng.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_RNG_H
-#define MICROPY_INCLUDED_STMHAL_RNG_H
+#ifndef MICROPY_INCLUDED_STM32_RNG_H
+#define MICROPY_INCLUDED_STM32_RNG_H
 
 #include "py/obj.h"
 
@@ -32,4 +32,4 @@ uint32_t rng_get(void);
 
 MP_DECLARE_CONST_FUN_OBJ_0(pyb_rng_get_obj);
 
-#endif // MICROPY_INCLUDED_STMHAL_RNG_H
+#endif // MICROPY_INCLUDED_STM32_RNG_H
diff --git a/ports/stm32/rtc.h b/ports/stm32/rtc.h
index 09ab2aedff..307f8885e3 100644
--- a/ports/stm32/rtc.h
+++ b/ports/stm32/rtc.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_RTC_H
-#define MICROPY_INCLUDED_STMHAL_RTC_H
+#ifndef MICROPY_INCLUDED_STM32_RTC_H
+#define MICROPY_INCLUDED_STM32_RTC_H
 
 extern RTC_HandleTypeDef RTCHandle;
 extern const mp_obj_type_t pyb_rtc_type;
@@ -32,4 +32,4 @@ extern const mp_obj_type_t pyb_rtc_type;
 void rtc_init_start(bool force_init);
 void rtc_init_finalise(void);
 
-#endif // MICROPY_INCLUDED_STMHAL_RTC_H
+#endif // MICROPY_INCLUDED_STM32_RTC_H
diff --git a/ports/stm32/sdcard.h b/ports/stm32/sdcard.h
index 8c698fc2f7..4afc258aa1 100644
--- a/ports/stm32/sdcard.h
+++ b/ports/stm32/sdcard.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_SDCARD_H
-#define MICROPY_INCLUDED_STMHAL_SDCARD_H
+#ifndef MICROPY_INCLUDED_STM32_SDCARD_H
+#define MICROPY_INCLUDED_STM32_SDCARD_H
 
 // this is a fixed size and should not be changed
 #define SDCARD_BLOCK_SIZE (512)
@@ -45,4 +45,4 @@ extern const struct _mp_obj_base_t pyb_sdcard_obj;
 struct _fs_user_mount_t;
 void sdcard_init_vfs(struct _fs_user_mount_t *vfs, int part);
 
-#endif // MICROPY_INCLUDED_STMHAL_SDCARD_H
+#endif // MICROPY_INCLUDED_STM32_SDCARD_H
diff --git a/ports/stm32/servo.h b/ports/stm32/servo.h
index c602a07da5..0160568af1 100644
--- a/ports/stm32/servo.h
+++ b/ports/stm32/servo.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_SERVO_H
-#define MICROPY_INCLUDED_STMHAL_SERVO_H
+#ifndef MICROPY_INCLUDED_STM32_SERVO_H
+#define MICROPY_INCLUDED_STM32_SERVO_H
 
 void servo_init(void);
 void servo_timer_irq_callback(void);
@@ -34,4 +34,4 @@ extern const mp_obj_type_t pyb_servo_type;
 MP_DECLARE_CONST_FUN_OBJ_2(pyb_servo_set_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(pyb_pwm_set_obj);
 
-#endif // MICROPY_INCLUDED_STMHAL_SERVO_H
+#endif // MICROPY_INCLUDED_STM32_SERVO_H
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index fb05703bca..41f91b2896 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_SPI_H
-#define MICROPY_INCLUDED_STMHAL_SPI_H
+#ifndef MICROPY_INCLUDED_STM32_SPI_H
+#define MICROPY_INCLUDED_STM32_SPI_H
 
 #include "dma.h"
 
@@ -51,4 +51,4 @@ void spi_init0(void);
 void spi_init(const spi_t *spi, bool enable_nss_pin);
 const spi_t *spi_from_mp_obj(mp_obj_t o);
 
-#endif // MICROPY_INCLUDED_STMHAL_SPI_H
+#endif // MICROPY_INCLUDED_STM32_SPI_H
diff --git a/ports/stm32/stm32_it.h b/ports/stm32/stm32_it.h
index 0f200fb6fe..46523e5673 100644
--- a/ports/stm32/stm32_it.h
+++ b/ports/stm32/stm32_it.h
@@ -25,8 +25,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_STM32_IT_H
-#define MICROPY_INCLUDED_STMHAL_STM32_IT_H
+#ifndef MICROPY_INCLUDED_STM32_STM32_IT_H
+#define MICROPY_INCLUDED_STM32_STM32_IT_H
 
 /**
   ******************************************************************************
@@ -79,4 +79,4 @@ void SysTick_Handler(void);
 void OTG_FS_IRQHandler(void);
 void OTG_HS_IRQHandler(void);
 
-#endif // MICROPY_INCLUDED_STMHAL_STM32_IT_H
+#endif // MICROPY_INCLUDED_STM32_STM32_IT_H
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index 5533a2a930..37cacc1a68 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_STORAGE_H
-#define MICROPY_INCLUDED_STMHAL_STORAGE_H
+#ifndef MICROPY_INCLUDED_STM32_STORAGE_H
+#define MICROPY_INCLUDED_STM32_STORAGE_H
 
 #define FLASH_BLOCK_SIZE (512)
 
@@ -59,4 +59,4 @@ extern const struct _mp_obj_type_t pyb_flash_type;
 struct _fs_user_mount_t;
 void pyb_flash_init_vfs(struct _fs_user_mount_t *vfs);
 
-#endif // MICROPY_INCLUDED_STMHAL_STORAGE_H
+#endif // MICROPY_INCLUDED_STM32_STORAGE_H
diff --git a/ports/stm32/systick.h b/ports/stm32/systick.h
index c1def50c29..256a500c27 100644
--- a/ports/stm32/systick.h
+++ b/ports/stm32/systick.h
@@ -23,10 +23,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_SYSTICK_H
-#define MICROPY_INCLUDED_STMHAL_SYSTICK_H
+#ifndef MICROPY_INCLUDED_STM32_SYSTICK_H
+#define MICROPY_INCLUDED_STM32_SYSTICK_H
 
 void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms);
 bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms);
 
-#endif // MICROPY_INCLUDED_STMHAL_SYSTICK_H
+#endif // MICROPY_INCLUDED_STM32_SYSTICK_H
diff --git a/ports/stm32/timer.h b/ports/stm32/timer.h
index 775accc3d4..2ba91cf158 100644
--- a/ports/stm32/timer.h
+++ b/ports/stm32/timer.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_TIMER_H
-#define MICROPY_INCLUDED_STMHAL_TIMER_H
+#ifndef MICROPY_INCLUDED_STM32_TIMER_H
+#define MICROPY_INCLUDED_STM32_TIMER_H
 
 extern TIM_HandleTypeDef TIM5_Handle;
 
@@ -39,4 +39,4 @@ void timer_irq_handler(uint tim_id);
 
 TIM_HandleTypeDef *pyb_timer_get_handle(mp_obj_t timer);
 
-#endif // MICROPY_INCLUDED_STMHAL_TIMER_H
+#endif // MICROPY_INCLUDED_STM32_TIMER_H
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index d176520a1b..d06508e8ed 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_UART_H
-#define MICROPY_INCLUDED_STMHAL_UART_H
+#ifndef MICROPY_INCLUDED_STM32_UART_H
+#define MICROPY_INCLUDED_STM32_UART_H
 
 typedef enum {
     PYB_UART_NONE = 0,
@@ -49,4 +49,4 @@ mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
 int uart_rx_char(pyb_uart_obj_t *uart_obj);
 void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
 
-#endif // MICROPY_INCLUDED_STMHAL_UART_H
+#endif // MICROPY_INCLUDED_STM32_UART_H
diff --git a/ports/stm32/usb.h b/ports/stm32/usb.h
index c75d59e477..6b43af00fa 100644
--- a/ports/stm32/usb.h
+++ b/ports/stm32/usb.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USB_H
-#define MICROPY_INCLUDED_STMHAL_USB_H
+#ifndef MICROPY_INCLUDED_STM32_USB_H
+#define MICROPY_INCLUDED_STM32_USB_H
 
 #include "usbd_cdc_msc_hid0.h"
 
@@ -69,4 +69,4 @@ void pyb_usb_host_init(void);
 void pyb_usb_host_process(void);
 uint pyb_usb_host_get_keyboard(void);
 
-#endif // MICROPY_INCLUDED_STMHAL_USB_H
+#endif // MICROPY_INCLUDED_STM32_USB_H
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index 44926085a8..36a89e7dbc 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -1,8 +1,8 @@
 /*
  * This file is part of the MicroPython project, http://micropython.org/
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USBD_CDC_INTERFACE_H
-#define MICROPY_INCLUDED_STMHAL_USBD_CDC_INTERFACE_H
+#ifndef MICROPY_INCLUDED_STM32_USBD_CDC_INTERFACE_H
+#define MICROPY_INCLUDED_STM32_USBD_CDC_INTERFACE_H
 
 /**
   ******************************************************************************
@@ -63,4 +63,4 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len);
 int usbd_cdc_rx_num(usbd_cdc_itf_t *cdc);
 int usbd_cdc_rx(usbd_cdc_itf_t *cdc, uint8_t *buf, uint32_t len, uint32_t timeout);
 
-#endif // MICROPY_INCLUDED_STMHAL_USBD_CDC_INTERFACE_H
+#endif // MICROPY_INCLUDED_STM32_USBD_CDC_INTERFACE_H
diff --git a/ports/stm32/usbd_desc.h b/ports/stm32/usbd_desc.h
index a4de6c6819..0307defa5b 100644
--- a/ports/stm32/usbd_desc.h
+++ b/ports/stm32/usbd_desc.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USBD_DESC_H
-#define MICROPY_INCLUDED_STMHAL_USBD_DESC_H
+#ifndef MICROPY_INCLUDED_STM32_USBD_DESC_H
+#define MICROPY_INCLUDED_STM32_USBD_DESC_H
 
 #include "usbd_cdc_msc_hid.h"
 
@@ -32,4 +32,4 @@ extern const USBD_DescriptorsTypeDef USBD_Descriptors;
 
 void USBD_SetVIDPIDRelease(usbd_cdc_msc_hid_state_t *usbd, uint16_t vid, uint16_t pid, uint16_t device_release_num, int cdc_only);
 
-#endif // MICROPY_INCLUDED_STMHAL_USBD_DESC_H
+#endif // MICROPY_INCLUDED_STM32_USBD_DESC_H
diff --git a/ports/stm32/usbd_hid_interface.h b/ports/stm32/usbd_hid_interface.h
index 79040b57e9..d9adf8a5f3 100644
--- a/ports/stm32/usbd_hid_interface.h
+++ b/ports/stm32/usbd_hid_interface.h
@@ -1,8 +1,8 @@
 /*
  * This file is part of the MicroPython project, http://micropython.org/
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USBD_HID_INTERFACE_H
-#define MICROPY_INCLUDED_STMHAL_USBD_HID_INTERFACE_H
+#ifndef MICROPY_INCLUDED_STM32_USBD_HID_INTERFACE_H
+#define MICROPY_INCLUDED_STM32_USBD_HID_INTERFACE_H
 
 #include "usbd_cdc_msc_hid.h"
 
@@ -18,4 +18,4 @@ typedef struct _usbd_hid_itf_t {
 int usbd_hid_rx_num(usbd_hid_itf_t *hid);
 int usbd_hid_rx(usbd_hid_itf_t *hid, size_t len, uint8_t *buf, uint32_t timeout);
 
-#endif // MICROPY_INCLUDED_STMHAL_USBD_HID_INTERFACE_H
+#endif // MICROPY_INCLUDED_STM32_USBD_HID_INTERFACE_H
diff --git a/ports/stm32/usbd_msc_storage.h b/ports/stm32/usbd_msc_storage.h
index 6cc40d2d62..669f7df581 100644
--- a/ports/stm32/usbd_msc_storage.h
+++ b/ports/stm32/usbd_msc_storage.h
@@ -23,10 +23,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USBD_MSC_STORAGE_H
-#define MICROPY_INCLUDED_STMHAL_USBD_MSC_STORAGE_H
+#ifndef MICROPY_INCLUDED_STM32_USBD_MSC_STORAGE_H
+#define MICROPY_INCLUDED_STM32_USBD_MSC_STORAGE_H
 
 extern const USBD_StorageTypeDef USBD_FLASH_STORAGE_fops;
 extern const USBD_StorageTypeDef USBD_SDCARD_STORAGE_fops;
 
-#endif // MICROPY_INCLUDED_STMHAL_USBD_MSC_STORAGE_H
+#endif // MICROPY_INCLUDED_STM32_USBD_MSC_STORAGE_H
diff --git a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid0.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid0.h
index 3bf7bccfdd..95fc693a00 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid0.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid0.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
-#define MICROPY_INCLUDED_STMHAL_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
+#ifndef MICROPY_INCLUDED_STM32_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
+#define MICROPY_INCLUDED_STM32_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
 
 // these are exports for the CDC/MSC/HID interface that are independent
 // from any other definitions/declarations
@@ -49,4 +49,4 @@ typedef struct _USBD_HID_ModeInfoTypeDef {
     const uint8_t *report_desc;
 } USBD_HID_ModeInfoTypeDef;
 
-#endif // MICROPY_INCLUDED_STMHAL_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
+#endif // MICROPY_INCLUDED_STM32_USBDEV_CLASS_INC_USBD_CDC_MSC_HID0_H
diff --git a/ports/stm32/usrsw.h b/ports/stm32/usrsw.h
index d96e3c2813..a8a087db2f 100644
--- a/ports/stm32/usrsw.h
+++ b/ports/stm32/usrsw.h
@@ -23,12 +23,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_USRSW_H
-#define MICROPY_INCLUDED_STMHAL_USRSW_H
+#ifndef MICROPY_INCLUDED_STM32_USRSW_H
+#define MICROPY_INCLUDED_STM32_USRSW_H
 
 void switch_init0(void);
 int switch_get(void);
 
 extern const mp_obj_type_t pyb_switch_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_USRSW_H
+#endif // MICROPY_INCLUDED_STM32_USRSW_H
diff --git a/ports/stm32/wdt.h b/ports/stm32/wdt.h
index 0a486f704d..d60bb7e9e6 100644
--- a/ports/stm32/wdt.h
+++ b/ports/stm32/wdt.h
@@ -23,9 +23,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STMHAL_WDT_H
-#define MICROPY_INCLUDED_STMHAL_WDT_H
+#ifndef MICROPY_INCLUDED_STM32_WDT_H
+#define MICROPY_INCLUDED_STM32_WDT_H
 
 extern const mp_obj_type_t pyb_wdt_type;
 
-#endif // MICROPY_INCLUDED_STMHAL_WDT_H
+#endif // MICROPY_INCLUDED_STM32_WDT_H