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

micropython · Feb 15, 2018 · d966a33 · d966a33
1 parent e05fca4
commit d966a33
Show file tree

Hide file tree

Showing 38 changed files with 114 additions and 114 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,13 +23,13 @@
  * 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"
 
 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
@@ -23,13 +23,13 @@
  * 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;
 
 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
@@ -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
@@ -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